src/views/map/components/renyuan.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="renyuan">
-    <div class="block1">
+    <div v-if="false" class="block1">
       <layout-title title="定位基础信息"/>
       <div class="options">
         <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
@@ -10,6 +10,7 @@
           <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>
@@ -155,13 +156,7 @@ export default {
           facount: '-'
         }
       ],
-      block4List: [],
-      message: {
-        onlineDeviceNum: '',
-        UwbBQ: '',
-        UwbJiZhan: '',
-        tklyr: ''
-      }
+      block4List: []
     }
   },
   created() {
@@ -173,37 +168,10 @@ export default {
     },
     getData() {
       requestFN(
-        '/map/getAllDwMessage',
+        '/map/getAlarmList',
         { corpId: this.corpInfoId }
       ).then((data) => {
-        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
-          }
-        ]
+        this.block4List = data.list
       }).catch((e) => {
         this.$message.error(e)
       })

src/views/map/dialog/index.vue

@@ -274,7 +274,6 @@ export default {
   }
   .app-container {
     padding: 0px;
-    width: 100%;
   }
 }
 </style>

src/views/map/dialog/peoplePositionYGS.vue

@@ -3,7 +3,7 @@
     <div class="level-title">
       <h1>人员信息</h1>
     </div>
-    <table v-if="false" class="table-ui">
+    <table class="table-ui">
       <tr>
         <td class="bbg-transparent">照片</td>
         <td ><img src="../../../assets/map/index/touxiang.png" alt="" width="50" height="50"></td>
@@ -29,25 +29,6 @@
         <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>
 
@@ -88,18 +69,14 @@ export default {
   methods: {
     getData() {
       requestFN(
-        '/map/getLastProp',
+        '/map/getPersonByCardNo',
         {
           CARDNO: this.id,
           corpId: this.corpId
         }
       ).then((data) => {
-        if (data.code === 9999) {
-          this.$message.success(data.msg)
-        } else {
-          this.info = data.userInfo
-          this.otherInfo = data.statusInfo
-        }
+        this.info = data.info.required
+        this.otherInfo = data.otherInfo
       }).catch((e) => {
       })
     }

src/views/map/index.vue

@@ -652,16 +652,6 @@ export default {
               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,
@@ -1412,6 +1402,7 @@ export default {
       // eslint-disable-next-line no-unused-vars
       var _this = this
       const collection = new Cesium.CustomDataSource('clickEntityCollection')
+      console.info()
       poin.forEach(item => {
         if (!this.poinEntity.hasOwnProperty(item.id)) {
           const entity = drag.addEntity(item)