Skip to content

Y
yangpu
Commit 13d8d775 authored by 郭铭瑶's avatar 郭铭瑶 🤘
Browse files
Options

调整

parent 8f723928
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 57 deletions
src/store/actions.js
View file @ 13d8d775
...@@ -18,7 +18,7 @@ export default { ...@@ -18,7 +18,7 @@ export default {
dispatch('getCheckSum') dispatch('getCheckSum')
dispatch('getGridSum') dispatch('getGridSum')
dispatch('getPopulationInfo') dispatch('getPopulationInfo')
// dispatch('getPatrolList') dispatch('getPatrolList')
dispatch('getCameraList') dispatch('getCameraList')
dispatch('getDiscoverInfo') dispatch('getDiscoverInfo')
dispatch('getRepairInfo') dispatch('getRepairInfo')
...@@ -104,19 +104,19 @@ export default { ...@@ -104,19 +104,19 @@ export default {
commit('SET_LAND_POPULATION_INFO', result) commit('SET_LAND_POPULATION_INFO', result)
} }
}, },
// getPatrolList({commit}) { getPatrolList({commit}) {
// ajax.get({ ajax.get({
// url: api.GET_CHECK_LIST, url: api.GET_CHECK_LIST,
// params: { params: {
// hoId_eq, hoId_eq,
// pageSize: 10000, pageSize: 10000,
// nearlyMonth: 12, nearlyMonth: 12,
// orderType_in: '0,1,2,3', orderType_in: '0,1,2,3',
// } }
// }).then(res => { }).then(res => {
// commit('SET_PATROL_LIST', com.confirm(res, 'data.content', [])) commit('SET_PATROL_LIST', com.confirm(res, 'data.content', []))
// }) })
// }, },
getCameraList({commit}) { getCameraList({commit}) {
ajax.get({ ajax.get({
url: api.GET_CAMERA_LIST, url: api.GET_CAMERA_LIST,
...@@ -173,20 +173,20 @@ export default { ...@@ -173,20 +173,20 @@ export default {
commit('SET_HEALTH_INFO', com.confirm(res, 'data.content', {})) commit('SET_HEALTH_INFO', com.confirm(res, 'data.content', {}))
}) })
}, },
getInspection({commit}) { // 专项检查 // getInspection({commit}) { // 专项检查
ajax.post({ // ajax.post({
url: api.GET_INSPECTION_LIST, // url: api.GET_INSPECTION_LIST,
params: { // params: {
pageNo: 1, // pageNo: 1,
pageSize: 10000, // pageSize: 10000,
flag: 0, // flag: 0,
someday: moment().format('YYYYMMDD'), // someday: moment().format('YYYYMMDD'),
hpb_id: 310110000000, // hpb_id: 310110000000,
} // }
}).then(res => { // }).then(res => {
console.log('res --', res) // console.log('res --', res)
}) // })
} // }
// getStreetBasic({commit}) { // 街道基数 // getStreetBasic({commit}) { // 街道基数
// ajax.get({url: api.DATA_URL + api.GET_STREET_BASIC, params: {street: '五角场街道', gridId: 10027}}).then(res => { // ajax.get({url: api.DATA_URL + api.GET_STREET_BASIC, params: {street: '五角场街道', gridId: 10027}}).then(res => {
// console.log('basic', com.confirm(res, 'data.content', {})) // console.log('basic', com.confirm(res, 'data.content', {}))
......
src/store/mutations.js
View file @ 13d8d775
export default { export default {
SET_CURRENT_STREET(state, name) { SET_CURRENT_STREET(state, name) {
if (!name) return if (!name) return
state.currentStreetInfo = state.streets.find(street => street.name.indexOf(name) >= 0) state.currentStreetInfo = state.streets.find(street => {
return street.name.indexOf(name) >= 0 || street.en.indexOf(name) >= 0
})
}, },
SET_LOADING(state, val) { SET_LOADING(state, val) {
state.showLoading = val state.showLoading = val
......
src/store/state.js
View file @ 13d8d775
...@@ -64,18 +64,18 @@ const commandLayout2 = [ ...@@ -64,18 +64,18 @@ const commandLayout2 = [
] ]
export default { export default {
streets: [ streets: [
{id: 310110020000, name: '新江湾城街道', houseId: 310110000168, center: [3635.8506067447124, 10472.688944671301], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=-i6_oyv1Vf-BgqEojN0pPQ8bHK5LfXy6'}, {id: 310110020000, name: '新江湾城街道', en: '', houseId: 310110000168, center: [3635.8506067447124, 10472.688944671301], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=-i6_oyv1Vf-BgqEojN0pPQ8bHK5LfXy6'},
{id: 310110001000, name: '定海路街道', houseId: 310110000169, center: [8140.864167601668, 5079.364284699033], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=ftoVMdCb29K2O7W5Ki-rke8vOFA_GsKM'}, {id: 310110001000, name: '定海路街道', en: '', houseId: 310110000169, center: [8140.864167601668, 5079.364284699033], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=ftoVMdCb29K2O7W5Ki-rke8vOFA_GsKM'},
{id: 310110006000, name: '平凉路街道', houseId: 310110000167, center: [5107.94932750342, 2423.6864417613733], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=D_ssgjWDvxbcMcS_eVuPC5_5imPY_YW1'}, {id: 310110006000, name: '平凉路街道', en: '', houseId: 310110000167, center: [5107.94932750342, 2423.6864417613733], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=D_ssgjWDvxbcMcS_eVuPC5_5imPY_YW1'},
{id: 310110008000, name: '江浦路街道', houseId: 310110000177, center: [4211.45116637842, 3786.741592954671], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=LjBjfj4BrtnsBbPzsUuSo4IR27brzOkO'}, {id: 310110008000, name: '江浦路街道', en: '', houseId: 310110000177, center: [4211.45116637842, 3786.741592954671], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=LjBjfj4BrtnsBbPzsUuSo4IR27brzOkO'},
{id: 310110009000, name: '四平路街道', houseId: 310110000170, center: [3293.5942071892155, 5147.717485190097], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=YAZ9Q4o9hgi_cw9QB3Zx2fYklef5Dtmz'}, {id: 310110009000, name: '四平路街道', en: '', houseId: 310110000170, center: [3293.5942071892155, 5147.717485190097], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=YAZ9Q4o9hgi_cw9QB3Zx2fYklef5Dtmz'},
{id: 310110012000, name: '控江路街道', houseId: 310110000171, center: [5008.673834530317, 5227.606100514474], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=tsM-JsYK7pgCRb2FMmwtGWuoR0TwCkkD'}, {id: 310110012000, name: '控江路街道', en: '', houseId: 310110000171, center: [5008.673834530317, 5227.606100514474], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=tsM-JsYK7pgCRb2FMmwtGWuoR0TwCkkD'},
{id: 310110013000, name: '长白新村街道', houseId: 310110000173, center: [7430.66083957447, 6663.5712796890675], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=J9lTtuTBWjinCpGaX-1kH0ssBamIoSmY'}, {id: 310110013000, name: '长白新村街道', en: '', houseId: 310110000173, center: [7430.66083957447, 6663.5712796890675], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=J9lTtuTBWjinCpGaX-1kH0ssBamIoSmY'},
{id: 310110015000, name: '延吉新村街道', houseId: 310110000172, center: [6246.9579368837085, 5745.491634168607], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=8zDuAqseqAD5EYvYclnY5jpQw_-TzblE'}, {id: 310110015000, name: '延吉新村街道', en: '', houseId: 310110000172, center: [6246.9579368837085, 5745.491634168607], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=8zDuAqseqAD5EYvYclnY5jpQw_-TzblE'},
{id: 310110016000, name: '殷行街道', houseId: 310110000176, center: [6688.878806764382, 10366.540369915294], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=B3_40kuhej63_QyN0LlDOeuOD1HqL5_F'}, {id: 310110016000, name: '殷行街道', en: '', houseId: 310110000176, center: [6688.878806764382, 10366.540369915294], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=B3_40kuhej63_QyN0LlDOeuOD1HqL5_F'},
{id: 310110018000, name: '大桥街道', houseId: 310110000166, center: [6374.902499188995, 3511.8719065605596], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=0Sn0K5LW4p7cc6rbCfY8mRqJ2uMS_Bvc'}, {id: 310110018000, name: '大桥街道', en: '', houseId: 310110000166, center: [6374.902499188995, 3511.8719065605596], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=0Sn0K5LW4p7cc6rbCfY8mRqJ2uMS_Bvc'},
{id: 310110019000, name: '五角场街道', houseId: 310110000174, center: [3296.4282528002864, 7281.637272274846], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=aYOvtgp4LdE37YvY4twwbP-bAKl9gXKx'}, {id: 310110019000, name: '五角场街道', en: '', houseId: 310110000174, center: [3296.4282528002864, 7281.637272274846], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=aYOvtgp4LdE37YvY4twwbP-bAKl9gXKx'},
{id: 310110101000, name: '长海路街道', houseId: 310110000175, center: [6016.66261261553, 8153.563542586172], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=cRV65vfRR-i9IHhK7TwAKte57x7W9iHC'}, {id: 310110101000, name: '长海路街道', en: '', houseId: 310110000175, center: [6016.66261261553, 8153.563542586172], url: 'http://10.81.71.38/chengyun/chengyun_town/page1.html#/?code=cRV65vfRR-i9IHhK7TwAKte57x7W9iHC'},
], ],
healthInfo: { healthInfo: {
creditScore: {}, creditScore: {},
......
src/views/components/patrol.vue
View file @ 13d8d775
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</div> </div>
</div> </div>
<div class="detail"> <div class="detail">
<m-scroll v-if="$store.state.patrolList.length > 0" :length="$store.state.patrolList.length" mode="2" :limit="2" :step="0.75"> <m-scroll v-if="$store.state.patrolList.length > 0" :length="$store.state.patrolList.length" mode="2" :limit="$store.state.currentStreetInfo.name === '新江湾城街道' ? 1 : 2" :step="0.75">
<div @click="$emit('select', {...item, key: 'patrol'})" class="info" v-for="(item, i) in $store.state.patrolList" :key="item.communityName+i" :class="{over: item.checkStateName === '逾期' || item.checkStateName.indexOf('未完结') >= 0}"> <div @click="$emit('select', {...item, key: 'patrol'})" class="info" v-for="(item, i) in $store.state.patrolList" :key="item.communityName+i" :class="{over: item.checkStateName === '逾期' || item.checkStateName.indexOf('未完结') >= 0}">
<h5>{{item.communityName}}</h5> <h5>{{item.communityName}}</h5>
<div> <div>
......
src/views/components/right-component.vue
View file @ 13d8d775
...@@ -7,15 +7,15 @@ ...@@ -7,15 +7,15 @@
</div> </div>
<div class="right"> <div class="right">
<m-card title="投诉报修"><ComplaintRepair /></m-card> <m-card title="投诉报修"><ComplaintRepair /></m-card>
<m-card title="专项/专题检查"><SpecialInspection /></m-card> <!-- <m-card title="专项/专题检查"><SpecialInspection /></m-card> -->
<!-- <m-card title="主动巡检"><Patrol @select="$emit('patrol', $event)" /></m-card> --> <m-card title="主动巡检"><Patrol @select="$emit('patrol', $event)" /></m-card>
<!-- <m-card title="鹰眼监控" v-if="$store.state.currentStreetInfo.name === '新江湾城街道'"> <m-card title="鹰眼监控" v-if="$store.state.currentStreetInfo.name === '新江湾城街道'">
<div class="monitor-video"> <div class="monitor-video">
<div v-for="(img, i) in imgs" @click="handleClick(i)" :key="img" :style="`background-image: url(${require(`@/assets/images/${img}`)})`"> <div v-for="(img, i) in imgs" @click="handleClick(i)" :key="img" :style="`background-image: url(${require(`@/assets/images/${img}`)})`">
<div><img src="@/assets/images/play.png"/></div> <div><img src="@/assets/images/play.png"/></div>
</div> </div>
</div> </div>
</m-card> --> </m-card>
</div> </div>
<div class="bottom"> <div class="bottom">
<m-card title="专项应用"><Application /></m-card> <m-card title="专项应用"><Application /></m-card>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
import GridManagement from './grid-management' import GridManagement from './grid-management'
import SmartDiscover from './smart-discover' import SmartDiscover from './smart-discover'
import ComplaintRepair from './complaint-repair' import ComplaintRepair from './complaint-repair'
// import Patrol from './patrol' import Patrol from './patrol'
import Combine from './combine' import Combine from './combine'
import Application from './application' import Application from './application'
import SpecialInspection from './special-inspection' import SpecialInspection from './special-inspection'
...@@ -37,7 +37,7 @@ export default { ...@@ -37,7 +37,7 @@ export default {
GridManagement, GridManagement,
SmartDiscover, SmartDiscover,
ComplaintRepair, ComplaintRepair,
// Patrol, Patrol,
Combine, Combine,
Application, Application,
SpecialInspection SpecialInspection
...@@ -49,12 +49,12 @@ export default { ...@@ -49,12 +49,12 @@ export default {
}, },
methods: { methods: {
handleClick(i) { handleClick(i) {
const {id} = this.$store.state.videoInfo[i] const {id, location} = this.$store.state.videoInfo[i]
this.$ajax.get({ this.$ajax.get({
url: this.$api.GET_VIDEO_URL + id, url: this.$api.GET_VIDEO_URL + id,
showLoading: true, showLoading: true,
}).then(res => { }).then(res => {
this.$emit('video', this.$com.confirm(res, 'payload.url')) this.$emit('video', this.$com.confirm(res, 'payload.url'), location)
}) })
// this.$emit('video', 'http://10.216.71.20:83/openUrl/TMIXpTy/live.m3u8') // this.$emit('video', 'http://10.216.71.20:83/openUrl/TMIXpTy/live.m3u8')
} }
...@@ -88,7 +88,9 @@ export default { ...@@ -88,7 +88,9 @@ export default {
&:nth-child(1) &:nth-child(1)
height 37% height 37%
&:nth-child(2) &:nth-child(2)
height 63% flex 1
&:nth-child(3)
height 26%
&.bottom &.bottom
width 100% width 100%
height 20% height 20%
......
src/views/components/smart-discover.vue
View file @ 13d8d775
...@@ -186,10 +186,10 @@ export default { ...@@ -186,10 +186,10 @@ export default {
top 0 top 0
right 0 right 0
&:nth-of-type(3) &:nth-of-type(3)
bottom 0 bottom .05rem
left 0 left 0
&:nth-of-type(4) &:nth-of-type(4)
bottom 0 bottom .05rem
right 0 right 0
.count .count
font-size .12rem font-size .12rem
......
src/views/main.vue
View file @ 13d8d775
...@@ -33,7 +33,10 @@ ...@@ -33,7 +33,10 @@
<m-modal title="指挥体系" :value="showCommandModal" @close="$store.commit('SET_COMMAND_MODAL', false)"> <m-modal title="指挥体系" :value="showCommandModal" @close="$store.commit('SET_COMMAND_MODAL', false)">
<m-form :label-width=".7" :model="streetInfo[currentStreetInfo.id]" :layout="streetInfo[currentStreetInfo.id].layout" /> <m-form :label-width=".7" :model="streetInfo[currentStreetInfo.id]" :layout="streetInfo[currentStreetInfo.id].layout" />
</m-modal> </m-modal>
<m-modal :title="`鹰眼监控：${cameraName}`" v-model="videoModal"> <m-modal v-model="patrolModal" title="主动巡检">
<m-form :label-width=".6" :model="patrolData" :layout="patrolLayout" />
</m-modal>
<m-modal :title="`鹰眼监控：${cameraName || ''}`" v-model="videoModal">
<VideoComponent v-if="videoModal" :videoSrc="videoSrc" /> <VideoComponent v-if="videoModal" :videoSrc="videoSrc" />
</m-modal> </m-modal>
</m-grid> </m-grid>
...@@ -98,6 +101,46 @@ export default { ...@@ -98,6 +101,46 @@ export default {
}, },
}, },
], ],
patrolModal: false,
patrolData: null,
patrolLayout: [
{
communityName: {
label: '小区名称',
width: 12,
},
orderTypeName: {
label: '整改事项',
width: 12,
},
},
{
checkTime: {
label: '发现时间',
width: 12,
},
checkStateName: {
label: '整改状态',
width: 12,
},
},
{
checkPersonName: {
label: '上报人',
width: 12,
},
hoName: {
label: '房办名称',
width: 12,
},
},
{
tcName: {
label: '检查主题',
width: 24,
},
},
],
doneModal: false, doneModal: false,
doneData: {}, doneData: {},
} }
...@@ -109,6 +152,7 @@ export default { ...@@ -109,6 +152,7 @@ export default {
'curSmartType', 'curSmartType',
'showCommandModal', 'showCommandModal',
'cameraList', 'cameraList',
'patrolList',
'handleList', 'handleList',
'handleCurTab', 'handleCurTab',
]) ])
...@@ -130,8 +174,10 @@ export default { ...@@ -130,8 +174,10 @@ export default {
'getDiscoverInfo', 'getDiscoverInfo',
'getRepairInfo', 'getRepairInfo',
'getHandleList', 'getHandleList',
'getPatrolList',
'getDoneList', 'getDoneList',
'getGridSum', 'getGridSum',
'getCheckSum',
]), ]),
mapComplete() { mapComplete() {
this.init() this.init()
...@@ -142,7 +188,9 @@ export default { ...@@ -142,7 +188,9 @@ export default {
this.getDiscoverInfo() this.getDiscoverInfo()
this.getRepairInfo() this.getRepairInfo()
this.getHandleList() this.getHandleList()
this.getPatrolList()
this.getDoneList() this.getDoneList()
this.getCheckSum()
}, 1000 * 60 * 1) }, 1000 * 60 * 1)
this.timer2 = setInterval(() => { this.timer2 = setInterval(() => {
this.getGridSum() this.getGridSum()
...@@ -163,13 +211,15 @@ export default { ...@@ -163,13 +211,15 @@ export default {
handleMapClick(data) { handleMapClick(data) {
if (data.key === 'camera') { if (data.key === 'camera') {
const {deviceGbcode, deviceName} = data const {deviceGbcode, deviceName} = data
this.cameraName = deviceName
this.$ajax.get({ this.$ajax.get({
url: this.$api.GET_VIDEO_URL + deviceGbcode, url: this.$api.GET_VIDEO_URL + deviceGbcode,
showLoading: true, showLoading: true,
}).then(res => { }).then(res => {
this.handleViewVideo(this.$com.confirm(res, 'payload.url', '')) this.handleViewVideo(this.$com.confirm(res, 'payload.url', ''), deviceName)
}) })
} else if (data.key === 'patrol') {
this.patrolData = data
this.patrolModal = true
} else { } else {
this.detailData = data this.detailData = data
this.detailModal = true this.detailModal = true
...@@ -199,9 +249,10 @@ export default { ...@@ -199,9 +249,10 @@ export default {
}), }),
}) })
}, },
handleViewVideo(src) { handleViewVideo(src, name) {
this.videoSrc = src this.videoSrc = src
this.videoModal = true this.videoModal = true
this.cameraName = name
}, },
zoom(type) { zoom(type) {
if (type === 'in') this.$refs.map.zoomIn() if (type === 'in') this.$refs.map.zoomIn()
...@@ -219,6 +270,16 @@ export default { ...@@ -219,6 +270,16 @@ export default {
data: cur, data: cur,
}) })
}, },
patrolList(cur) {
const {addPoint, removePoint} = this.$refs.map
removePoint(this.patrolPoints)
this.patrolPoints = addPoint({
key: 'patrol',
size: 14,
icon: 'red.png',
data: cur,
})
},
curSmartType(cur) { curSmartType(cur) {
let data = this.handleList let data = this.handleList
if (cur) { if (cur) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment