src/views/map/components/renyuan.vue

@@ -55,7 +55,7 @@
         </div>
       </div>
     </div>
-    <div v-if="corpInfoId !== '21590a00ea5e462e9ee44dd332dddc26'" class="block4">
+    <div class="block4">
       <layout-title title="报警列表"/>
       <div class="content">
         <div class="table">
@@ -72,25 +72,6 @@
         </div>
       </div>
     </div>
-    <div v-if="corpInfoId === '21590a00ea5e462e9ee44dd332dddc26'" class="block4">
-      <layout-title title="报警列表"/>
-      <div class="content">
-        <div class="table">
-          <div class="tr">
-            <div class="td">报警类型</div>
-            <div class="td">报警时间</div>
-            <div class="td">触发人</div>
-            <div class="td">报警地点</div>
-          </div>
-          <div v-for="(item,index) in block4List" :key="index" class="tr">
-            <div class="td">{{ item.alarmName }}</div>
-            <div class="td">{{ item.alarmTime }}</div>
-            <div class="td">{{ item.foulUserName }}</div>
-            <div class="td">{{ item.place }}</div>
-          </div>
-        </div>
-      </div>
-    </div>
   </div>
 </template>
 
@@ -192,10 +173,9 @@ export default {
     },
     getData() {
       requestFN(
-        '/map/getAllDwMessage', { corpId: this.corpInfoId }
+        '/map/getAllDwMessage',
+        { corpId: this.corpInfoId }
       ).then((data) => {
-        // 一公司人员定位系统（我知道这里写的拉但是没办法，一天要把功能改完，后续有缘人在重构吧）
-        if (this.corpInfoId === '035958e685cf4850bc40151c5e0617a6') {
         this.block4List = data.alarmList.list
         this.block1OptionsList = [
           {
@@ -224,27 +204,6 @@ export default {
             count: data.orthermessage.infoList.tklyr.num
           }
         ]
-        }
-        if (this.corpInfoId === '21590a00ea5e462e9ee44dd332dddc26') {
-          this.block1OptionsList = [
-            {
-              title: '总设备数',
-              img: require('../../../assets/map/renyuan/img1ico1.png'),
-              count: data.orthermessage.onlineDeviceNum
-            },
-            {
-              title: '在线人员数',
-              img: require('../../../assets/map/renyuan/img1ico1.png'),
-              count: data.orthermessage.lockNum
-            },
-            {
-              title: '离线人数',
-              img: require('../../../assets/map/renyuan/img1ico1.png'),
-              count: data.orthermessage.unLockNum
-            }
-          ]
-          this.block4List = data.orthermessage.alarmList
-        }
       }).catch((e) => {
         this.$message.error(e)
       })

src/views/map/dialog/peoplePositionYGS.vue

@@ -29,12 +29,12 @@
         <td>{{ otherInfo?otherInfo.postName:'' }}</td>
       </tr>
     </table>
-    <!-- 一公司人员定位页面 -->
+    <table class="table-ui">
-    <table v-if="corpId === '035958e685cf4850bc40151c5e0617a6'" 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>
@@ -48,25 +48,6 @@
         <td>{{ info?info.departmentName:'' }}</td>
       </tr>
     </table>
-    <!-- 九公司人员定位页面 -->
-    <table v-if="corpId === '21590a00ea5e462e9ee44dd332dddc26'" class="table-ui">
-      <tr>
-        <td class="bbg-transparent">姓名</td>
-        <td >{{ (info && info.name) ? info.name : '未绑定人员' }}</td>
-      </tr>
-      <tr>
-        <td class="bbg-transparent">定位卡号:</td>
-        <td >{{ info?info.id:'' }}</td>
-      </tr>
-      <tr>
-        <td class="bbg-transparent">定位卡电量</td>
-        <td >{{ info?info.battery:'' }}</td>
-      </tr>
-      <tr>
-        <td class="bbg-transparent">公司</td>
-        <td>{{ info?info.corpName:'' }}</td>
-      </tr>
-    </table>
   </div>
 </template>
 
@@ -113,12 +94,8 @@ export default {
           corpId: this.corpId
         }
       ).then((data) => {
-        if (data.code === 9999) {
-          this.$message.success(data.msg)
-        } else {
         this.info = data.userInfo
         this.otherInfo = data.statusInfo
-        }
       }).catch((e) => {
       })
     }

src/views/map/index.vue

@@ -2679,6 +2679,7 @@ export default {
                   data_id: item.cardId + '',
                   point_type: 'peoplePositionCzks',
                   label: item.realName
+
                 }
                 czksPerLoc.push(perLoc)
                 ry_drag.addEntity(perLoc)
@@ -2967,14 +2968,14 @@ export default {
         _this.fwebsocket = new WebSocket(encodeURI(wsUrl))
         _this.fwebsocket.onmessage = function(message) {
           console.info('接收消息')
-          const peopleList = JSON.parse(message.data)
+          const peopleList = JSON.parse(message.data).data.data
           console.log(peopleList)
           for (let i = 0; i < peopleList.length; i++) {
             const item = peopleList[i]
             if ((!item)) continue
             // 将地图上剩余的点与最新的定位人员点进行对比   更新地图上已存在的点    新增地图上之前没有的点
             const index = _this.onePerLocArr.findIndex(item1 => {
-              return item1.id === item.id
+              return item1.id.toString() === item.id.toString()
             })
             const x = item.lon
             const y = item.lat
@@ -2987,7 +2988,6 @@ export default {
             } else {
               const perLoc = {
                 id: item.id,
-                name: item.name,
                 x: x,
                 y: y,
                 icon_type: 'img4_0' + pointColor,

src/views/map/js/ry_dragentity.js

@@ -31,7 +31,7 @@ export default class DragEntity {
         disableDepthTestDistance: Number.POSITIVE_INFINITY
       },
       label: {
-        text: point.name ? point.name : point.id,
+        text: point.id,
         font: '13px sans-serif',
         pixelOffset: new Cesium.Cartesian2(0, -55),
         showBackground: true,