diff --git a/src/views/keyprojects/platformelectronic/index.vue b/src/views/keyprojects/platformelectronic/index.vue index a7d2cf4..045c281 100644 --- a/src/views/keyprojects/platformelectronic/index.vue +++ b/src/views/keyprojects/platformelectronic/index.vue @@ -96,13 +96,13 @@ - - + + - + @@ -126,7 +126,7 @@ @@ -198,11 +198,7 @@ export default { }, quyuList: [], shexiangtouForm: {}, - statusList: [ - { id: '0', name: '请选择' }, - { id: '1', name: '油管区' }, - { id: '2', name: '码头区' } - ] + statusList: [] } }, async created() { @@ -266,7 +262,7 @@ export default { this.msg = 'add' this.resetForm() this.dialogForm = true - // this.$refs.platformvideo.init() + this.getDic() }, resetForm() { this.shexiangtouForm.LONGITUDE = '' @@ -312,6 +308,7 @@ export default { ).then(async(data) => { await this.getAllList() this.getList() + this.shexiangtouForm = {} }).catch((e) => { this.listLoading = false }) @@ -326,6 +323,7 @@ export default { goEdit(row) { this.dialogForm = true this.listLoading = true + this.getDic() return new Promise(resolve => { requestFN( '/platformelectronic/goEdit', @@ -334,11 +332,13 @@ export default { } ).then((data) => { this.shexiangtouForm = data.pd + this.form.SUOSHUQUYU = data.pd.SUOSHUQUYU + this.getSendDic() this.form.bianjiequyu = data.pd.FANGQU_IDS.split(',') this.form.CORPINFO_ID = data.pd.CORPINFO_ID this.form.VIDEONAME = data.pd.NAME this.form.CODE = data.pd.INDEXCODE - this.form.SUOSHUQUYU = data.pd.SUOSHUQUYU + this.form.LONGITUDEANDLATITUDE = data.pd.LONGITUDE + ',' + data.pd.LATITUDE this.listLoading = false resolve() @@ -381,8 +381,8 @@ export default { }, // 获取列表 setPosition() { + // eslint-disable-next-line no-empty if (this.shexiangtouForm.PLATFORMELECTRONIC_ID != null) { - } this.shexiangtouForm.LONGITUDE = this.form.LONGITUDE this.shexiangtouForm.LATITUDE = this.form.LATITUDE @@ -505,6 +505,57 @@ export default { handleBack() { this.player.dispose() this.dialogVideoHLS = false + }, + + getDic() { // 获取区域字典信息 + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + requestFN('/dictionaries/listSelectTree', { DICTIONARIES_ID: 'f0bae7becdee4d779a2cb82037948ab4' } + ).then((data) => { + this.statusList = JSON.parse(data.zTreeNodes) + loading.close() + }).catch((e) => { + loading.close() + }) + }, + getSendDic() { + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + this.form.quyuList = [] + requestFN('/dictionaries/listSelectTree', { DICTIONARIES_ID: this.form.SUOSHUQUYU } + ).then((data) => { + loading.close() + this.quyuList = JSON.parse(data.zTreeNodes) + }).catch((e) => { + loading.close() + }) + }, + closeDia() { + this.dialogForm = false + this.form = { + CORPINFO_ID: '', + bianjiequyu: [], + PLATFORMELECTRONIC_ID: '', + LONGITUDEANDLATITUDE: '', + VIDEOMANAGER_ID: '', + VIDEO_RESOURCES_ID: '', + VIDEO_TYPE: 1, + VIDEONAME: '', // + VIDEOURL: '', + CODE: '', + PLATFORMVIDEOMANAGEMENT_ID: '', + LATITUDE: '', + LONGITUDE: '', + SUOSHUQUYU: '' + } } } } diff --git a/src/views/map/components/zhongdian.vue b/src/views/map/components/zhongdian.vue index fc24fb8..6e1fb57 100644 --- a/src/views/map/components/zhongdian.vue +++ b/src/views/map/components/zhongdian.vue @@ -93,7 +93,7 @@ export default { return { block1OptionsList: [ { - title: '监控数量', + title: '报警数量', img: require('../../../assets/map/zhongdian/ico1.png'), count: '-' }, @@ -154,12 +154,12 @@ export default { }, initNum() { requestFN('/map/getAllDwMessage', { corpId: this.corpInfoId } - ).then((data) => { - this.block1OptionsList[0].count = data.alarmList.total - requestFN('/map/mapPlatformelectronic/listAllLocatio', { corpId: this.corpInfoId, TYPE: 'bianjieruqin' } - ).then((data) => { - this.block4List = data.alarmList.list - this.block1OptionsList[0].count = data.alarmList.total + ).then((data0) => { + this.block1OptionsList[0].count = data0.alarmList.total + requestFN('/map/mapPlatformelectronic/listAllLocation', { corpId: this.corpInfoId, TYPE: 'bianjieruqin' } + ).then((data1) => { + this.block4List = data0.alarmList.list + this.block1OptionsList[0].count = data1.varList.total }).catch((e) => { this.$message.error(e) })