From 6d4d7ce75b5d4e3118148321928e47b65e33b9ce Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 25 Nov 2024 09:09:41 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E8=B0=83=E6=95=B4=E5=8F=8A=E6=9C=AA?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA=E4=BA=BA=E5=91=98=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AFbug=E4=BF=AE=E5=A4=8D=202=E3=80=81?=
 =?UTF-8?q?=E5=B0=869=E5=85=AC=E5=8F=B8=E4=BA=BA=E5=91=98=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E7=B3=BB=E7=BB=9F=E8=B0=83=E6=95=B4=E6=88=90=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=BA=BA=E5=91=98=E5=AE=9A=E4=BD=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/renyuan.vue       | 14 ++++++++------
 src/views/map/dialog/index.vue             |  4 ++--
 src/views/map/dialog/peoplePositionYGS.vue |  2 +-
 src/views/map/index.vue                    |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/map/components/renyuan.vue b/src/views/map/components/renyuan.vue
index 0038468..65f8cae 100644
--- a/src/views/map/components/renyuan.vue
+++ b/src/views/map/components/renyuan.vue
@@ -55,7 +55,7 @@
         </div>
       </div>
     </div>
-    <div v-if="!(corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId === '033549ed3bd648e49c8a65eb4993ec2f')" class="block4">
+    <div v-if="corpInfoId === '035958e685cf4850bc40151c5e0617a6'" class="block4">
       <layout-title title="报警列表"/>
       <div class="content">
         <div class="table">
@@ -72,7 +72,7 @@
         </div>
       </div>
     </div>
-    <div v-if="corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId === '033549ed3bd648e49c8a65eb4993ec2f'" class="block4">
+    <div v-if="corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" class="block4">
       <layout-title title="报警列表"/>
       <div class="content">
         <div class="table">
@@ -195,8 +195,8 @@ export default {
         '/map/getAllDwMessage', { corpId: this.corpInfoId }
       ).then((data) => {
         // 一公司人员定位系统（我知道这里写的拉但是没办法，一天要把功能改完，后续有缘人在重构吧）
+        console.log(this.corpInfoId)
         if (this.corpInfoId === '035958e685cf4850bc40151c5e0617a6') {
-          this.block4List = data.alarmList.list
           this.block1OptionsList = [
             {
               title: '在线设备数',
@@ -216,16 +216,17 @@ export default {
             {
               title: '在线摄像头数',
               img: require('../../../assets/map/renyuan/ico4.png'),
-              count: data.orthermessage.infoList.HKcamera.num
+              count: data.orthermessage.infoList.HKcamera ? data.orthermessage.infoList.HKcamera.num : 0
             },
             {
               title: '在线报警设备数',
               img: require('../../../assets/map/renyuan/ico5.png'),
-              count: data.orthermessage.infoList.tklyr.num
+              count: data.orthermessage.infoList.tklyr ? data.orthermessage.infoList.tklyr.num : 0
             }
           ]
+          this.block4List = data.alarmList.list
         }
-        if (this.corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || this.corpInfoId === '033549ed3bd648e49c8a65eb4993ec2f' ) {
+        if (this.corpInfoId !== '035958e685cf4850bc40151c5e0617a6') {
           this.block1OptionsList = [
             {
               title: '总设备数',
@@ -246,6 +247,7 @@ export default {
           this.block4List = data.orthermessage.alarmList
         }
       }).catch((e) => {
+        console.log(e)
         this.$message.error(e)
       })
     }
diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index f5519d2..11687b4 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -62,8 +62,8 @@
       <carPositionCfdD v-if="type === 'carPosition'" :id="id" :type="type" :infoname="infoname"/>
       <!--曹妃甸东 八项作业 曹实业详细页面 end-->
       <peoplePositionNine v-if="type === 'peoplePositionNine'" :id="id" :type="type" :infoname="infoname"/>
-      <peoplePositionOne v-if="type === 'peoplePositionOne' && !(corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId ==='033549ed3bd648e49c8a65eb4993ec2f')" :id="id" :type="type" />
-      <peoplePositionYGS v-if="type === 'peoplePositionOne' && (corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId ==='033549ed3bd648e49c8a65eb4993ec2f')" :id="id" :type="type" :corp-id="corpInfoId" />
+      <peoplePositionOne v-if="type === 'peoplePositionOne' && !(corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId ==='033549ed3bd648e49c8a65eb4993ec2f' || !corpInfoId)" :id="id" :type="type" />
+      <peoplePositionYGS v-if="type === 'peoplePositionOne' && (corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId ==='033549ed3bd648e49c8a65eb4993ec2f' || !corpInfoId)" :id="id" :type="type" :corp-id="corpInfoId" />
       <!-- 重点工程 start -->
       <outSourceInfo v-if="type === 'PROJECT'" :id="id" :type="type" />
       <outSourceVideoInfo v-if="type === 'VIDEO'" :id="id" :type="type" />
diff --git a/src/views/map/dialog/peoplePositionYGS.vue b/src/views/map/dialog/peoplePositionYGS.vue
index 157e4e2..c5bf0bd 100644
--- a/src/views/map/dialog/peoplePositionYGS.vue
+++ b/src/views/map/dialog/peoplePositionYGS.vue
@@ -49,7 +49,7 @@
       </tr>
     </table>
     <!-- 九公司人员定位页面 -->
-    <table v-if="corpId === '21590a00ea5e462e9ee44dd332dddc26' || corpId === '033549ed3bd648e49c8a65eb4993ec2f'" class="table-ui">
+    <table v-if="corpId !== '035958e685cf4850bc40151c5e0617a6'" class="table-ui">
       <tr>
         <td class="bbg-transparent">姓名</td>
         <td >{{ (info && info.name) ? info.name : '未绑定人员' }}</td>
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 9e90004..d30f9f2 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -2198,7 +2198,7 @@ export default {
             }
           }
         }
-        if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' || this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f') && urlType === 'peoplePosition') {
+        if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' || this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f' || this.CORP_INFO_ID === '') && urlType === 'peoplePosition') {
           this.clearRYDWPoint('+/UwbBQ/')
           this.removeTrajectory()
         }
@@ -2247,7 +2247,7 @@ export default {
         }
         if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
           !this.connecting ? this.createConnection(this.CORP_INFO_ID) : this.doSubscribe()
-        } else if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' || this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f') && urlType === 'peoplePosition') {
+        } else if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' || this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f' || this.CORP_INFO_ID === '') && urlType === 'peoplePosition') {
           // websocket实时获取人员定位
           this.initRYDWWebsocket(this.CORP_INFO_ID)
         } else {