一公司企业端地图功能同步

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">
@@ -15,7 +15,7 @@
         </div>
       </div>
     </div>
-    <div class="block2">
+    <div v-if="false" class="block2">
       <layout-title title="定位状态数据"/>
       <div class="options">
         <div class="bg"/>
@@ -29,7 +29,7 @@
         </div>
       </div>
     </div>
-    <div class="block3">
+    <div v-if="false" class="block3">
       <layout-title title="定位标签状态"/>
       <div class="content">
         <div class="options">
@@ -56,18 +56,42 @@
         </div>
       </div>
     </div>
+    <div 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>
+          <div v-for="(item,index) in block4List" :key="index" class="tr">
+            <div class="td">{{ item.alarmName }}</div>
+            <div class="td">{{ item.equipmentName }}</div>
+            <div class="td">{{ item.statusName }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
 import layoutTitle from './title.vue'
 import CountTo from 'vue-count-to'
+import { requestFN } from '../../../utils/request'
 
 export default {
   components: {
     CountTo,
     layoutTitle
   },
+  props: {
+    corpInfoId: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
       block1OptionsList: [
@@ -131,12 +155,26 @@ export default {
           count: '-',
           facount: '-'
         }
-      ]
+      ],
+      block4List: []
     }
   },
+  created() {
+    this.getData()
+  },
   methods: {
     block3OptionsClick(index) {
       this.block3OptionsIndex = index
+    },
+    getData() {
+      requestFN(
+        '/map/getAlarmList',
+        { corpId: this.corpInfoId }
+      ).then((data) => {
+        this.block4List = data.list
+      }).catch((e) => {
+        this.$message.error(e)
+      })
     }
   }
 }
@@ -321,6 +359,48 @@ export default {
       }
     }
   }
+
+  .block4 {
+    margin-top: 10px;
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+
+    .content {
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+      padding: 10px;
+
+      .options {
+        display: flex;
+        justify-content: flex-end;
+
+        .title {
+          cursor: pointer;
+        }
+      }
+
+      .table {
+        margin-top: 5px;
+
+        .tr {
+          display: flex;
+
+          &:nth-child(odd) {
+            background-color: rgba(42, 86, 158, 0.53);
+          }
+
+          .td {
+            flex: 1;
+            text-align: center;
+            font-size: 12px;
+            color: #fff;
+            padding: 5px;
+          }
+        }
+      }
+    }
+  }
 }
 
 @keyframes scale {

src/views/map/dialog/peoplePositionYGS.vue

@@ -8,19 +8,25 @@
         <td class="bbg-transparent">照片</td>
         <td ><img src="../../../assets/map/index/touxiang.png" alt="" width="50" height="50"></td>
         <td class="bbg-transparent">姓名</td>
-        <td >{{ info?info.NAME:'' }}</td>
+        <td >{{ info?info.userName:'' }}</td>
       </tr>
       <tr>
+        <td class="bbg-transparent">公司</td>
+        <td >{{ info?info.corpName:'' }}</td>
         <td class="bbg-transparent">部门</td>
-        <td >{{ info?info.DEPARTMENT_NAME:'' }}</td>
-        <td class="bbg-transparent">岗位</td>
-        <td >{{ info?info.POST_NAME:'' }}</td>
+        <td >{{ info?info.departmentName:'' }}</td>
+      </tr>
+      <tr>
+        <td class="bbg-transparent">设备id</td>
+        <td >{{ info?info.deviceId:'' }}</td>
+        <td class="bbg-transparent">设备名称</td>
+        <td >{{ info?info.deviceName:'' }}</td>
       </tr>
       <tr>
         <td class="bbg-transparent">人员类型</td>
-        <td >{{ info?info.PERSON_TYPE:'' }}</td>
-        <td class="bbg-transparent">是否为隐患确认人</td>
-        <td >{{ info.IS_HAZARDCONFIRMER == 0 ?'否':'是' }}</td>
+        <td>{{ otherInfo?otherInfo.personType:'' }}</td>
+        <td class="bbg-transparent">岗位</td>
+        <td>{{ otherInfo?otherInfo.postName:'' }}</td>
       </tr>
     </table>
   </div>
@@ -42,12 +48,19 @@ export default {
       default() {
         return ''
       }
+    },
+    corpId: {
+      type: String,
+      default() {
+        return ''
+      }
     }
   },
   data() {
     return {
       config: config,
-      info: {}
+      info: {},
+      otherInfo: {}
     }
   },
   created() {
@@ -58,10 +71,12 @@ export default {
       requestFN(
         '/map/getPersonByCardNo',
         {
-          CARDNO: this.id
+          CARDNO: this.id,
+          corpId: this.corpId
         }
       ).then((data) => {
-        this.info = data.pd
+        this.info = data.info.required
+        this.otherInfo = data.otherInfo
       }).catch((e) => {
       })
     }