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

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

diff --git a/src/views/map/components/renyuan.vue b/src/views/map/components/renyuan.vue
index c66875b..3a1e6e9 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/ico1.png'),
+            count: data.orthermessage.onlineDeviceNum
+          },
+          {
+            title: '在线人员',
+            img: require('../../../assets/map/renyuan/img1ico1.png'),
+            count: data.orthermessage.infoList.UwbBQ.num
+          },
+          {
+            title: '在线基站数',
+            img: require('../../../assets/map/renyuan/ico3.png'),
+            count: data.orthermessage.infoList.UwbJiZhan.num
+          },
+          {
+            title: '在线摄像头数',
+            img: require('../../../assets/map/renyuan/ico4.png'),
+            count: data.orthermessage.infoList.HKcamera.num
+          },
+          {
+            title: '在线报警设备数',
+            img: require('../../../assets/map/renyuan/ico5.png'),
+            count: data.orthermessage.infoList.tklyr.num
+          }
+        ]
       }).catch((e) => {
         this.$message.error(e)
       })
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) => {
       })
     }