From ffbcda0ed83559f6ea16f768591a71d52d0f2ef0 Mon Sep 17 00:00:00 2001
From: songwenxuan <1924103812@qq.com>
Date: Wed, 13 Mar 2024 20:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=B9=E7=85=A4=E7=82=AD?=
=?UTF-8?q?=E6=B8=AF=E5=9C=B0=E5=9B=BE=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=87=8D?=
=?UTF-8?q?=E7=82=B9=E5=B7=A5=E7=A8=8B=E8=AF=A6=E6=83=85=E9=A1=B5=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/map/dialog/index.vue | 2 +-
src/views/map/index.vue | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
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 !== '')
}
}