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] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E5=8A=9F=E8=83=BD=E6=96=B0?=
 =?UTF-8?q?=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) => {
       })
     }