From 8ea1cb9a2c7b41ebc9492200c1dacdd0042a8dbd Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 23 Apr 2024 14:36:31 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/index.vue | 1 +
 src/views/map/index.vue        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index 12c8e6d..d45d0f6 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -274,6 +274,7 @@ export default {
   }
   .app-container {
     padding: 0px;
+    width: 100%;
   }
 }
 </style>
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index ebaae81..c3e181f 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -1401,7 +1401,7 @@ export default {
       // eslint-disable-next-line no-unused-vars
       var _this = this
       const collection = new Cesium.CustomDataSource('clickEntityCollection')
-
+      debugger
       poin.forEach(item => {
         if (!this.poinEntity.hasOwnProperty(item.id)) {
           const entity = drag.addEntity(item)

From b937d07355e2068aa0b50231bdf6abf8e779e028 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Tue, 23 Apr 2024 14:49:47 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=E3=80=81=E6=91=84=E5=83=8F?=
 =?UTF-8?q?=E5=A4=B4=E7=82=B9=E4=BD=8D=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=81=E6=B0=94=E8=B1=A1=E7=AB=99=E5=AE=9A=E6=97=B6=E5=99=A8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA90=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/qixiang.vue             | 2 +-
 src/views/map/dialog/mkGateMachine.vue           | 2 +-
 src/views/map/dialog/video_play_bianjieruqin.vue | 2 +-
 src/views/map/dialog/video_play_plat.vue         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/map/components/qixiang.vue b/src/views/map/components/qixiang.vue
index c6d5695..8a46da6 100644
--- a/src/views/map/components/qixiang.vue
+++ b/src/views/map/components/qixiang.vue
@@ -150,7 +150,7 @@ export default {
     // 定时器
     start() {
       console.log('定时器开启')
-      this.timer = setInterval(this.getMeteorologicalinfo, 10000) // 注意: 第一个参数为方法名的时候不要加括号;
+      this.timer = setInterval(this.getMeteorologicalinfo, 90000) // 注意: 第一个参数为方法名的时候不要加括号;
     },
     over() {
       clearInterval(this.timer)
diff --git a/src/views/map/dialog/mkGateMachine.vue b/src/views/map/dialog/mkGateMachine.vue
index e52d422..16ccf6c 100644
--- a/src/views/map/dialog/mkGateMachine.vue
+++ b/src/views/map/dialog/mkGateMachine.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container print-work">
+  <div class="app-container print-work" style="width: 100%">
     <div v-if= "type !== 'CAMERA'" class="level-title">
       <h1>区域名称：{{ info.GATE_AREA_NAME }}</h1>
     </div>
diff --git a/src/views/map/dialog/video_play_bianjieruqin.vue b/src/views/map/dialog/video_play_bianjieruqin.vue
index fe3b71f..939b853 100644
--- a/src/views/map/dialog/video_play_bianjieruqin.vue
+++ b/src/views/map/dialog/video_play_bianjieruqin.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="width: 100%">
     <div class="level-title">
       <h1>摄像头名称：{{ info.NAME }}</h1>
     </div>
diff --git a/src/views/map/dialog/video_play_plat.vue b/src/views/map/dialog/video_play_plat.vue
index ebd1673..08a9137 100644
--- a/src/views/map/dialog/video_play_plat.vue
+++ b/src/views/map/dialog/video_play_plat.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="width: 100%">
     <div class="level-title">
       <h1>摄像头名称：{{ info.NAME }}</h1>
     </div>

From 153e4a996b6b36bb2b22a883643da032cdde4a4a Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Tue, 23 Apr 2024 15:58:34 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E5=8D=B1?=
 =?UTF-8?q?=E9=99=A9=E4=BD=9C=E4=B8=9A=E7=82=B9=E4=BD=8D=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/blindboard.vue    | 2 +-
 src/views/map/dialog/confinedspace.vue | 2 +-
 src/views/map/dialog/electricity.vue   | 2 +-
 src/views/map/dialog/highwork.vue      | 2 +-
 src/views/map/dialog/hoisting.vue      | 2 +-
 src/views/map/dialog/hotworkFirst.vue  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/map/dialog/blindboard.vue b/src/views/map/dialog/blindboard.vue
index b4e960f..43e3fe6 100644
--- a/src/views/map/dialog/blindboard.vue
+++ b/src/views/map/dialog/blindboard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container print-work">
+  <div class="app-container print-work" style="width: 100%">
     <div class="level-title">
       <h1>盲板抽堵作业许可证</h1>
       <div class="level-btns">编号:{{ info.CHECK_NO }}</div>
diff --git a/src/views/map/dialog/confinedspace.vue b/src/views/map/dialog/confinedspace.vue
index 5ee33d6..914e171 100644
--- a/src/views/map/dialog/confinedspace.vue
+++ b/src/views/map/dialog/confinedspace.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container print-work">
+  <div class="app-container print-work" style="width: 100%">
     <div class="level-title">
       <h1>有限空间作业许可证</h1>
       <div class="level-btns">编号:{{ info.CHECK_NO }}</div>
diff --git a/src/views/map/dialog/electricity.vue b/src/views/map/dialog/electricity.vue
index f9e6641..b1e8bcc 100644
--- a/src/views/map/dialog/electricity.vue
+++ b/src/views/map/dialog/electricity.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="width: 100%">
     <div class="level-title">
       <h1>临时用电作业许可证</h1>
     </div>
diff --git a/src/views/map/dialog/highwork.vue b/src/views/map/dialog/highwork.vue
index 0526e95..f29c57c 100644
--- a/src/views/map/dialog/highwork.vue
+++ b/src/views/map/dialog/highwork.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container print-work">
+  <div class="app-container print-work" style="width: 100%">
     <div class="level-title">
       <h1>高处作业许可证</h1>
       <div class="level-btns">编号:{{ info.CHECK_NO }}</div>
diff --git a/src/views/map/dialog/hoisting.vue b/src/views/map/dialog/hoisting.vue
index a5b6609..dbf887b 100644
--- a/src/views/map/dialog/hoisting.vue
+++ b/src/views/map/dialog/hoisting.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container print-work">
+  <div class="app-container print-work" style="width: 100%">
     <div class="level-title">
       <h1>吊装安全作业证</h1>
       <div class="level-btns">编号:{{ info.NUMBERING }}</div>
diff --git a/src/views/map/dialog/hotworkFirst.vue b/src/views/map/dialog/hotworkFirst.vue
index 96da917..350edd1 100644
--- a/src/views/map/dialog/hotworkFirst.vue
+++ b/src/views/map/dialog/hotworkFirst.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container print-work">
+  <div class="app-container print-work" style="width: 100%">
     <div class="level-title">
       <h1>动火安全作业票</h1>
       <div class="level-btns">编号:{{ pd.CHECK_NO }}</div>

From 8455ef8231f44baf4cbf9a653205d1a7e106ed0b Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 23 Apr 2024 18:53:02 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/renyuan.vue | 42 ++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/views/map/components/renyuan.vue b/src/views/map/components/renyuan.vue
index c66875b..8377c16 100644
--- a/src/views/map/components/renyuan.vue
+++ b/src/views/map/components/renyuan.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="renyuan">
-    <div v-if="false" class="block1">
+    <div class="block1">
       <layout-title title="定位基础信息"/>
       <div class="options">
         <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
@@ -10,7 +10,6 @@
           <div class="info">
             <div class="label">{{ item.title }}</div>
             <div class="text">{{ item.count }}</div>
-            <!--            <div class="text"><count-to :start-val="0" :end-val="item.count" :duration="3600"/></div>-->
           </div>
         </div>
       </div>
@@ -156,7 +155,13 @@ export default {
           facount: '-'
         }
       ],
-      block4List: []
+      block4List: [],
+      message: {
+        onlineDeviceNum: '',
+        UwbBQ: '',
+        UwbJiZhan: '',
+        tklyr: ''
+      }
     }
   },
   created() {
@@ -168,10 +173,37 @@ export default {
     },
     getData() {
       requestFN(
-        '/map/getAlarmList',
+        '/map/getAllDwMessage',
         { corpId: this.corpInfoId }
       ).then((data) => {
-        this.block4List = data.list
+        this.block4List = data.alarmList.list
+        this.block1OptionsList = [
+          {
+            title: '在线设备数',
+            img: require('../../../assets/map/renyuan/img1ico1.png'),
+            count: data.orthermessage.onlineDeviceNum
+          },
+          {
+            title: '在线人员',
+            img: require('../../../assets/map/renyuan/img1ico2.png'),
+            count: data.orthermessage.infoList.UwbBQ.num
+          },
+          {
+            title: '在线基站数',
+            img: require('../../../assets/map/renyuan/img1ico3.png'),
+            count: data.orthermessage.infoList.UwbJiZhan.num
+          },
+          {
+            title: '在线摄像头数',
+            img: require('../../../assets/map/renyuan/img1ico4.png'),
+            count: data.orthermessage.infoList.HKcamera.num
+          },
+          {
+            title: '在线报警设备数',
+            img: require('../../../assets/map/renyuan/img1ico5.png'),
+            count: data.orthermessage.infoList.tklyr.num
+          }
+        ]
       }).catch((e) => {
         this.$message.error(e)
       })

From 6b3fa0a96d964d861bf92d3b388eb4e9aba1a7f2 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 23 Apr 2024 19:24:32 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/renyuan.vue       | 10 ++++----
 src/views/map/dialog/peoplePositionYGS.vue | 27 ++++++++++++++++++----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/views/map/components/renyuan.vue b/src/views/map/components/renyuan.vue
index 8377c16..f959a57 100644
--- a/src/views/map/components/renyuan.vue
+++ b/src/views/map/components/renyuan.vue
@@ -180,27 +180,27 @@ export default {
         this.block1OptionsList = [
           {
             title: '在线设备数',
-            img: require('../../../assets/map/renyuan/img1ico1.png'),
+            img: require('../../../assets/map/renyuan/img1ico2.png'),
             count: data.orthermessage.onlineDeviceNum
           },
           {
             title: '在线人员',
-            img: require('../../../assets/map/renyuan/img1ico2.png'),
+            img: require('../../../assets/map/renyuan/img1ico1.png'),
             count: data.orthermessage.infoList.UwbBQ.num
           },
           {
             title: '在线基站数',
-            img: require('../../../assets/map/renyuan/img1ico3.png'),
+            img: require('../../../assets/map/renyuan/img1ico2.png'),
             count: data.orthermessage.infoList.UwbJiZhan.num
           },
           {
             title: '在线摄像头数',
-            img: require('../../../assets/map/renyuan/img1ico4.png'),
+            img: require('../../../assets/map/renyuan/img1ico2.png'),
             count: data.orthermessage.infoList.HKcamera.num
           },
           {
             title: '在线报警设备数',
-            img: require('../../../assets/map/renyuan/img1ico5.png'),
+            img: require('../../../assets/map/renyuan/img1ico2.png'),
             count: data.orthermessage.infoList.tklyr.num
           }
         ]
diff --git a/src/views/map/dialog/peoplePositionYGS.vue b/src/views/map/dialog/peoplePositionYGS.vue
index e1b2313..71c5673 100644
--- a/src/views/map/dialog/peoplePositionYGS.vue
+++ b/src/views/map/dialog/peoplePositionYGS.vue
@@ -3,7 +3,7 @@
     <div class="level-title">
       <h1>人员信息</h1>
     </div>
-    <table class="table-ui">
+    <table v-if="false" class="table-ui">
       <tr>
         <td class="bbg-transparent">照片</td>
         <td ><img src="../../../assets/map/index/touxiang.png" alt="" width="50" height="50"></td>
@@ -29,6 +29,25 @@
         <td>{{ otherInfo?otherInfo.postName:'' }}</td>
       </tr>
     </table>
+    <table class="table-ui">
+      <tr>
+        <td class="bbg-transparent">姓名</td>
+        <td >{{ info?info.userName:'' }}</td>
+      </tr>
+
+      <tr>
+        <td class="bbg-transparent">定位卡号:</td>
+        <td >{{ info?info.id:'' }}</td>
+      </tr>
+      <tr>
+        <td class="bbg-transparent">定位卡电量</td>
+        <td >{{ info?otherInfo.data[3].currentValBody.val:'' }}</td>
+      </tr>
+      <tr>
+        <td class="bbg-transparent">部门</td>
+        <td>{{ info?info.departmentName:'' }}</td>
+      </tr>
+    </table>
   </div>
 </template>
 
@@ -69,14 +88,14 @@ export default {
   methods: {
     getData() {
       requestFN(
-        '/map/getPersonByCardNo',
+        '/map/getLastProp',
         {
           CARDNO: this.id,
           corpId: this.corpId
         }
       ).then((data) => {
-        this.info = data.info.required
-        this.otherInfo = data.otherInfo
+        this.info = data.userInfo
+        this.otherInfo = data.statusInfo
       }).catch((e) => {
       })
     }

From 1862bc1eeaa14510aa2b3b28028cd8db99e31227 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 24 Apr 2024 14:02:36 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=97=B6=E6=9C=AA?=
 =?UTF-8?q?=E5=BC=82=E6=AD=A5bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/index.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index c3e181f..70c4043 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -650,6 +650,16 @@ export default {
               checkImg: require('../../assets/map/gangkou_index/buttom/ico21_on.png'),
               containAuthorization: [],
               eliminateAuthorization: []
+            },
+            {
+              label: '摄像头',
+              dialog_width: '1200px',
+              check: false,
+              type: 'platcamera',
+              img: require('../../assets/map/gangkou_index/buttom/ico26.png'),
+              checkImg: require('../../assets/map/gangkou_index/buttom/ico26_on.png'),
+              containAuthorization: [],
+              eliminateAuthorization: []
             }
             // {
             //   label: '车辆定位',
@@ -1401,7 +1411,6 @@ export default {
       // eslint-disable-next-line no-unused-vars
       var _this = this
       const collection = new Cesium.CustomDataSource('clickEntityCollection')
-      debugger
       poin.forEach(item => {
         if (!this.poinEntity.hasOwnProperty(item.id)) {
           const entity = drag.addEntity(item)
@@ -1752,7 +1761,7 @@ export default {
           this.cfdBottomOptionsList[pindex].list[index].check = true
           this.bottomOptionsList[pindex].list[index].check = false
         }
-
+        console.log('~~~~~~~~~' + urlType, pointUrl)
         if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
           !this.connecting ? this.createConnection(this.CORP_INFO_ID) : this.doSubscribe()
         } else {

From 0fba5ebca51aaf8272a059d19015a93cb52aad49 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 24 Apr 2024 14:23:07 +0800
Subject: [PATCH 7/8] =?UTF-8?q?1=E3=80=81=E6=9B=B4=E6=8D=A2=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/map/renyuan/ico1.png      | Bin 0 -> 1483 bytes
 src/assets/map/renyuan/ico2.png      | Bin 0 -> 1527 bytes
 src/assets/map/renyuan/ico3.png      | Bin 0 -> 1845 bytes
 src/assets/map/renyuan/ico4.png      | Bin 0 -> 1575 bytes
 src/assets/map/renyuan/ico5.png      | Bin 0 -> 1553 bytes
 src/views/map/components/renyuan.vue |   8 ++++----
 src/views/map/index.vue              |  20 ++++++++++----------
 7 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 src/assets/map/renyuan/ico1.png
 create mode 100644 src/assets/map/renyuan/ico2.png
 create mode 100644 src/assets/map/renyuan/ico3.png
 create mode 100644 src/assets/map/renyuan/ico4.png
 create mode 100644 src/assets/map/renyuan/ico5.png

diff --git a/src/assets/map/renyuan/ico1.png b/src/assets/map/renyuan/ico1.png
new file mode 100644
index 0000000000000000000000000000000000000000..191835eec83470e4c690efa33d31205fe6e4d7d7
GIT binary patch
literal 1483
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#8koDQqR!L
z*u>ION5ROz&_dt9Lf_C>*U-$$#K6kPNC66zfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9
zlv<o$T9gcok2GbNW?<Oiw+N&V=o%}R{N&Qy)VvZ;7h5Huh+ax&ij}34larZ|p^1T^
zi?gAjtDBRln}M^lo4K=@o3pu*iwjJzXI^nhVqS78Om8MauQ6V|R?bDKi6!|(A^G_^
zu-FU8$S=t+&d4uNaCQd8mZgG5cxGNoetEGbD0rc+O)bhSOHFYr%Fk5*hmTbz7B@JV
zJ3AS<7@3$Fm>UA!?`mmi>gwd`Wa4aL;pS*+ZlMI#n}WsfP`#!&_38s1qYsK)q{xN|
z0aFl&2~WB}4m|Ov<^fZD5in^RwmvRqU|_QLba4!+xb@_^uSZCr$bpaM#xvCfEqpmA
zw+W~yrE)ag7Et_iKy2$o4d&)ME!_nd&-qG=3tv3sQE*+!lqXBEPA4aIVynnQB`%gi
zg|0=1R#txhy1(R@+~>mQwxw0we19rFm%cANH>di&@e_+aQJ0pr4N4o1R2%U-Z4T=>
zZCj$esoS#dq2RB%Wv{*Sl8)~@{WOPjUyS5AMb~NEmYs*azE;d|`F~V-hKo>pp`5ct
zKuS*k?g{n#HwGO&^_%bQiUSO<KFTewXt0zq?YaNnPv(@)@=wP#FYmhae(M6M%R&2m
zYTRYBK02L`%$O7sUa7JD$~L3g+m(Bc3I8ckz1DlV+d1MO&$%D3UTw&oZMVH8&E;al
z>m6U7mv1)P(7|W(eSU<bu=P4VUk~TI(>`){oU9hzXFh>rshLHmXpO76T7dv}$3x?3
z7n5ckmyJFvy7&LZD>1uddNYnzgfYLA)K3yU?{oI+O7m&AV<v9dc%@3#X94f>Leb+X
zmUkyE-In3C>+Z8lg-q)WdJaB$TCu6B=5NQFvdNofR`jh6I)40`SDoFu@7JG2AAgzP
zr(XAXRf5p%vitTY%C+N*Rhc|xH1Azqs#$tX@naYt^ZJGSojYvqO*!jw+)n2E=059t
zcQXDxFwK5^_Nn8|!=-DCzD?P)ZoPhak;e@4KTOHK#bR2ezL!5tnjd|2#p{=G$F7}x
zUC4iYk=O2d_IDlco1BoFCwreub>6hy2ZN4={QI4?blr)@`<<s^eSR?W7wW!O{CNKl
d_vh#aMuwL7i}M3xrb~c|S5H?zmvv4FO#nq<H%9;f

literal 0
HcmV?d00001

diff --git a/src/assets/map/renyuan/ico2.png b/src/assets/map/renyuan/ico2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f28bbec48ac3d86c082976630d44755ebac794e
GIT binary patch
literal 1527
zcmaJ>c~BE~6kcRhz@{EmxfGZ63O30mVRJ1+C)rIPQ({AiO7UDbOW29YuE|Ei;V6pN
zIEph$X+^CCk9MX}tU69DmR7V3Vzr&N7;hqiwjk0vMMhig20{CW^*6J><IVTI_q}6w
zi)C(xASNLO004n06SwkbQuvD+!S89(BQ^XH&lz&L944PDBs>(Lvop&n(BvW<l$9dv
zMJt=BbO4B)LECb<TyqvmGA;=b#z_1wmS+P%`W!z?kWPvNms1Yft%V+b-2j2KT?;Kx
zn5AYGqYCKEVh@#5Jl94RJ4uZlnll?r_oKW67sU~v-?hT+Mg3Z6z%R<*!)6!)2OykN
z3%wAPYqo$G<Do!>L@6d^hyqk;Br;_xqS1&zxm2cxrD|A~DwZixM2gDg;NXJzXdZh$
zYQ>F%vG|u3D&RO4h2g@&LP=q&gz-3FnMR|5rE*v<7xM_Qx5&*AezDs-b;tuwc}Wk=
zax~)x!ybv{jE~boywVpbxLC9KrDL~uuuy!-U_ZgaGKmy+xx#r3puL=xdL`qvXs@k^
zrC=-NWqclz???XBAu?aPHwOv>c{M1`kUkgX=1jO2;w=(8ZAbN(T4hurxKxH?GMT}s
zlOvd3YDCmJxf0i7*bvv`_Hu-qq=vZkD=zj%E{b_5f@3^3hFLMxJxc+@G2Q}(1u-n#
zEe$AKK)dZsp*JO5-a)mLhh9b5jUL7Y4%7#wU#CHZ>E*Z_QAkxXUcW&jQyBCHJ%Xv#
zMx8>Xh6cIz*X90#tN33o%!`4;&HYcahfMqgg|9D1mw&t*e#*^HyoVp{u7hU@02t;l
z;X0fD+TAL1rY(DX)9Ux127`7wK3HX+0tI$~$zOssa%lLri7DA#^6Ai`lTqv9Q)|uo
z>T46mMwV5!));JCCl23ot)>n>Xs(X(J=u$nPHMdIxM%XnMO<6c#rl$a&+hFh>G{f0
zpEV=r#F)-l@s3J=MPSXc$u?aq^4+xbweR*e&kH`<*m<Y3yL@5YRq3<HzO#v{ihIz8
z#89+o+egQT^%US=ymRQBYE%iEYDDVt1kW>*%TF~bH{G9{vWwkIe)CJ(gJW}?<Ck;_
z>wn7jw<7b~g(B1Z=%r%JHGX!7us&|P?sh3AZYbSZ+pp@f#8zY4ZlTE0|3Pw}I(lz{
zK5^&oeOGU_$Jh48?O7kO)n^Q4-G2m`FIAqV+ON(NUm%Zl)g|UZoqums_J98I%~3P=
zix7wP%ITPfXCIzFshY83d-KT5xbLUWN)cC&CRU%zJK6?hH5E;|G5hhSQ=5Wme?dg@
ztXAOhfg>4|FL+3B`FxJ1B36t?ULXEInbfkbNzgPiVAf|`OgI`U5=Nxe#%#9VrPWMu
zY0AVLi(tao8kqP*Ij)SwR(-ZLw4<1{RBUKI^j4KA@8KWUd&l-QqCb><J1&%W^X)2P
zeaDhOOl50b<=HXa*`Zly4!1ORsH1$=YIW>FfwOH?{ieW^MVJ0rT(Ci`!O!n|f(#4%
zI9;GiI&t5*ru9*NTv>)?Uwg@w(%om=bpM}sMWQlY+@%C(`GrZhe_J1WXXWaBw_<)}
zqx0K@2guID`!jC6S5l(89xM$QpB_KO#_bMG>t5T@yZC5Jg!c0Dyx{YmhM%WIi~!ni
V8*T>4l`Y|4vB@wOKcZi@?q3)sK}!Gt

literal 0
HcmV?d00001

diff --git a/src/assets/map/renyuan/ico3.png b/src/assets/map/renyuan/ico3.png
new file mode 100644
index 0000000000000000000000000000000000000000..9370a0e59901eab30dc1552a04fa75c6b5df8dde
GIT binary patch
literal 1845
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

literal 0
HcmV?d00001

diff --git a/src/assets/map/renyuan/ico4.png b/src/assets/map/renyuan/ico4.png
new file mode 100644
index 0000000000000000000000000000000000000000..42475ba89abf22f78e31f65714b37ffdd4fed8f4
GIT binary patch
literal 1575
zcmaJ>eM}Q~7{2z(myE4OzIA#W5plG=UTL9MTIeTGwG2yz&TT?JuC&_TwY`HDLKJj?
z3Y%_b45Ql=T^MXmMm7~kf=h(>H5c~>bAChxjfqBPbh@FS?24fK!+FWw?<3FizR&x-
zZ*FU8Nm1Oq)Oi2^#OaH*MrK_cexoCqZ=UerK4wXwb!NJZbkG5d9|u%+(uzZRkEI$n
z;ud?I?-VWv05HR4GSg<mDw&P+2rOZYAn5TjYyglK1icp92Aqbhc(sdAz;_3Z!H~<Y
zfGZ>hp~0)covz|~KVDW}VzSk5uwiz%ARm$kWlR7MPFtX$$4yYOpaPzWD`WQIYXpX7
zAoK<W{7jVDPzq^CKMqL*IeZ%`mO#0f0L{r3V;Bz-2~jB`lp<(0AI*`8g))%{ntfm<
zo8Rt`8MTG8xtNmzcG9$0h9H4JKoH0lkp5}}#V`yJiV%^A&mj0z9YI@ye1b}!i=f3R
zo8RT7T_gd8BU-Fv4XuC~rO!(6cnyZ<feC8XD8@1*Xz?PbK!|ue;kstf6m7&`$apE5
zGSzu;#E4U5jo-%f!;wBmX1sfKqA-wABh!+$8V^p;daVLxZUlChT_)5P<_d*k#xkuI
zMRkQLO`%SjEzxLHBB@lIE1Ki#35vE5Hhhljdcj3s$(3pRxP>PDCX#f|b+6P((j?_1
zy^ux|?iL1RR=5Z|8K9Pj?VVMN`(3rTz0gm3pc#K;u9s*~=W5g<tw<~p=Aw*#9fnGD
zYMolFkxC0yl3Xb~%eB9x_F1mvf4K-F1_?L!Kh2)IVkRiOeLlL(;ra061T*n|X0)#j
zuDAsN><+zFWeQ%jPEAi299IGv%`7(PKx2Obt`pyzmvg^n^|84H5n~C;%ad2zN3laZ
zhjyE->x=2+&d)xute#vDN&<YB3Ibh4rb9dN$vwgD(TSfcp>^z`?>5QbA<Eq7rQa*}
zDQ`z|W9RoIedSBw9+|rD7*HP`UbK4<i7>9V*H@)yayCx*zRWmf{qtd^yz$PssW>}N
z_4-8WNor?i+oSSLoZ<F)3Dg-?DLfT_`dDo5FgxqY6R^+q@%wMHeR*8+F*ohOlH=CV
zrM(W|!Ywfm5dgkrndsn0^Cw$&^baM<kFbmh$~y*4)O%55zf{ERh)Ve_E2anAeyGWW
zaf_^37rKFU@|B;oa~AUQuIFdo^>1lCQJvCS(L^sQJrG%(1o}j#ZELS#^6rGL%aI8!
zZsk;RXne_y?kg=l?9(w|Pnq(7cJt^PjZ!egZ|Vm^k2=Tpx)WLA>6HFj>(j}OxRB~c
z9(R8{tkjWB);)Xg4_%8>x;aDtG)+jkXFwmu?O^w%pEUMwAF1z!iXN;il|%OinkJ&S
zy_}=-Lz_U~QtrDfA7sqoZ0%s(6KBS?zEukizBY9BNNY{G&A#mHuWb{%(kdIJKx)Hd
zWy8(-qxt={?Av86<((Pl*2jOk<|eC8uqy>>`3rpbMBQf|7+-{r@3AQxVpGqz^p>ZL
z?9Bppfh*EQ<_9IfH^`7Px^b*Ix+-EAs;sFh1H>oT#S)eeHpVwZv|ly1t=iJO;AH;B
z=(ut>aASX6QY!E7>r~n~xx#tT3$|ZSJ{&Rc&R;eCG_B20aNa(mU;XHhDql?T(S;*#
zg2PYNeC`o+9h<%aE@wGA2OHNejW`EZht@y-@bI@q{KbihASW4ElaW031Ii=Aziz#*
KM0-$OwfSEHTQK_o

literal 0
HcmV?d00001

diff --git a/src/assets/map/renyuan/ico5.png b/src/assets/map/renyuan/ico5.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffe9c41e3d585cc7f4aa92dcacc213fe22d0b466
GIT binary patch
literal 1553
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#8koDQqR!L
z*u>ION5ROz&_dt9Lf_C>*U-$$#K6kPNC66zfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9
zlv<o$T9gcok2GbNW?<Oiw+N&V=o%}R{N&Qy)VvZ;7h5Huh+ax&ij}d6iIJs~qnm-D
zi;JP5tDB{>xuvU<sez@Vi<zULn<Y%IXI^nhVqS78Om8MauPa`?R?bDKi6!|(A^G_^
zu-FU8$S=t+&d4uNaCQd8mZgG5cxGNoetEGbD0rc+O)bhSOHFYr%Fk5*hmTbz7B@JV
zJ3AS<7@3$Fm>UA!?`mmi>gwd`Wa4aL;pS*+ZlMI#n}WsfP`#!&_38s1qYsK)q{xN|
z0aFl&2~WB}4m|Ov<^fZD5in`HZi!vOz`)e#>EaktaqGzR_>8_lnd9@HS00b}d09-i
zIygqd>(C{$`cLUzorO=?mWl<<vM*Hh_KFNj6Zbkbb<$Fv!i9#eQ+5<8ivN3)wA)cp
z>e6RByY%0CKU=)FJiovE?0UQE`{yd>f3B^oKlgsl&U1SYoJ^?wz-_jq)*!<EQ{+Ro
znJwan#nmV8REp8Cc$~fS;r@By95TI!KZs@V7JII2E-&zyuPwDu?_-70nbyl2PJg;p
znE0x}GOITGfOh`B3&&SIFny9JX=83v&QxQOIwQMb`2~LN2l9>cXRG&CyqWr}f}`(H
z=!+(`!;jRJwU&GDlfUSCxNSqe)PA<#36?(BwIV`~`)oCS&@A>%DuRpuVO5Bpmd*Vc
zdRt$pt>Es=YrVTcOzqT+Tc`IHFupsa9>LLExHb24#Le)9QA!tbe)y{9h`c*cRxvdt
zShGL=6w_X(_!FlyKS(@NkMQoaZx9Vq@7wc5s`6!;WW36uf7O*4^PYqrt<#Tb>gIGk
zEW0*1Xp?);gOhjiUvO66IrLm4LO1^^$NYtI+m3F%cTw)g^{9t))_i1|=b;jMuvT95
z+|R?7|Jb&-E-F3NQP+|#q+9F#wjud~?8M~kLerxh+ULJTKMPaU&|6(#_h{$o0`7AW
z&$5$Si_0Ero!*hv%Kqec&h1^C-wIbH2Z~<yTiMAu$z8S1;O#>R(X7dHTiqAFEtGqg
zZaFnq_i~zcYV?}Pmsk2qxl}!jvFew8lJH^a#*&o1?Mu#X+{AeDy=dlE$=1u2F(P^G
zs!#9i*%b3FO>)=O9WA@+bl%MhJd}5{{07J8n00fcj2EyklX^C3QoD4(;`6St`TfqP
xC0vTR_e}JT&$MXH`G06i?!3?Q-}EyuGXyN<Ei*S|I{+%AJzf1=);T3K0RT#<QE~tP

literal 0
HcmV?d00001

diff --git a/src/views/map/components/renyuan.vue b/src/views/map/components/renyuan.vue
index f959a57..3a1e6e9 100644
--- a/src/views/map/components/renyuan.vue
+++ b/src/views/map/components/renyuan.vue
@@ -180,7 +180,7 @@ export default {
         this.block1OptionsList = [
           {
             title: '在线设备数',
-            img: require('../../../assets/map/renyuan/img1ico2.png'),
+            img: require('../../../assets/map/renyuan/ico1.png'),
             count: data.orthermessage.onlineDeviceNum
           },
           {
@@ -190,17 +190,17 @@ export default {
           },
           {
             title: '在线基站数',
-            img: require('../../../assets/map/renyuan/img1ico2.png'),
+            img: require('../../../assets/map/renyuan/ico3.png'),
             count: data.orthermessage.infoList.UwbJiZhan.num
           },
           {
             title: '在线摄像头数',
-            img: require('../../../assets/map/renyuan/img1ico2.png'),
+            img: require('../../../assets/map/renyuan/ico4.png'),
             count: data.orthermessage.infoList.HKcamera.num
           },
           {
             title: '在线报警设备数',
-            img: require('../../../assets/map/renyuan/img1ico2.png'),
+            img: require('../../../assets/map/renyuan/ico5.png'),
             count: data.orthermessage.infoList.tklyr.num
           }
         ]
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 70c4043..d72748b 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -650,18 +650,18 @@ export default {
               checkImg: require('../../assets/map/gangkou_index/buttom/ico21_on.png'),
               containAuthorization: [],
               eliminateAuthorization: []
-            },
-            {
-              label: '摄像头',
-              dialog_width: '1200px',
-              check: false,
-              type: 'platcamera',
-              img: require('../../assets/map/gangkou_index/buttom/ico26.png'),
-              checkImg: require('../../assets/map/gangkou_index/buttom/ico26_on.png'),
-              containAuthorization: [],
-              eliminateAuthorization: []
             }
             // {
+            //   label: '摄像头',
+            //   dialog_width: '1200px',
+            //   check: false,
+            //   type: 'platcamera',
+            //   img: require('../../assets/map/gangkou_index/buttom/ico26.png'),
+            //   checkImg: require('../../assets/map/gangkou_index/buttom/ico26_on.png'),
+            //   containAuthorization: [],
+            //   eliminateAuthorization: []
+            // }
+            // {
             //   label: '车辆定位',
             //   dialog_width: '1200px',
             //   check: false,

From dccc44e64430b1a7f24123eb9fc491da59a39d99 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 24 Apr 2024 17:20:05 +0800
Subject: [PATCH 8/8] =?UTF-8?q?1=E3=80=81=E7=9B=91=E7=AE=A1=E7=AB=AF?=
 =?UTF-8?q?=E3=80=81=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=9C=B0=E5=9B=BE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/peoplePositionYGS.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/map/dialog/peoplePositionYGS.vue b/src/views/map/dialog/peoplePositionYGS.vue
index 71c5673..503776f 100644
--- a/src/views/map/dialog/peoplePositionYGS.vue
+++ b/src/views/map/dialog/peoplePositionYGS.vue
@@ -94,8 +94,12 @@ export default {
           corpId: this.corpId
         }
       ).then((data) => {
-        this.info = data.userInfo
-        this.otherInfo = data.statusInfo
+        if (data.code === 9999) {
+          this.$message.success(data.msg)
+        } else {
+          this.info = data.userInfo
+          this.otherInfo = data.statusInfo
+        }
       }).catch((e) => {
       })
     }