diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue index 6b6097b..ab25a5c 100644 --- a/src/views/map/dialog/index.vue +++ b/src/views/map/dialog/index.vue @@ -55,7 +55,7 @@ - + diff --git a/src/views/map/index.vue b/src/views/map/index.vue index a4d488f..7c61220 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -1423,13 +1423,17 @@ export default { this.dialog.name = name this.dialog.infoname = infoname this.dialog.corpInfoId = corpInfoId - }else if (this.gangkouActive === '00005' && point_id.substring(0, 1) !== '1' && point_id !== '6aa255d41602497fa0f934a822820df4') { + } else if (this.gangkouActive === '00005' && point_id.substring(0, 1) !== '1' && point_id !== '6aa255d41602497fa0f934a822820df4') { console.log(point_type) console.log(point_id) - const { label, point_type, data_id, infoname, name, code } = pick.id._monitoItems.data + const { label, data_id, infoname, name, code } = pick.id._monitoItems.data this.dialog.visible = true this.dialog.title = label - this.dialog.type = point_type.substring(3) + this.gangkouActive + if (point_type === '标记点PROJECT' || point_type === '标记点VIDEO') { + this.dialog.type = point_type.substring(3) + } else { + this.dialog.type = point_type.substring(3) + this.gangkouActive + } this.dialog.id = data_id this.dialog.name = name this.dialog.id = point_type.substring(3) === 'CAMERA' ? code : point_type.substring(3) === 'platcamera' ? code : data_id @@ -3028,7 +3032,7 @@ export default { if (e.label === '消防救援队') { if (this.gangkouActive === '00005') { return true - }else { + } else { return !(this.CORP_INFO_ID && this.CORP_INFO_ID !== '') } }