1、边界入侵界面更新

2、边界入侵摄像头标点不显示bug修复

src/views/map/components/zhongdian.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="renyuan">
     <div class="block1">
-      <layout-title title="重点工程统计"/>
+      <layout-title title="边界入侵统计"/>
       <div class="options">
         <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
           <div class="imger">
@@ -10,12 +10,11 @@
           <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>
     </div>
-    <div class="block2">
+    <div v-if="false" class="block2">
       <layout-title title="区域报警数"/>
       <div class="options">
         <div v-for="(item,index) in block2OptionsList" :key="index" class="option">
@@ -27,8 +26,7 @@
         </div>
       </div>
     </div>
-
-    <div class="block3">
+    <div v-if="false" class="block3">
       <layout-title title="安全管理记录"/>
       <div class="content">
         <div class="table">
@@ -47,6 +45,23 @@
         </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>
 
@@ -78,26 +93,15 @@ export default {
     return {
       block1OptionsList: [
         {
-          title: '开工数量',
+          title: '监控数量',
           img: require('../../../assets/map/zhongdian/ico1.png'),
           count: '-'
         },
         {
-          title: '视频数量',
+          title: '监控数量',
           img: require('../../../assets/map/zhongdian/ico2.png'),
           count: '-'
-        },
-        {
-          title: '检查次数',
-          img: require('../../../assets/map/zhongdian/ico3.png'),
-          count: '-'
-        },
-        {
-          title: '发现隐患数量',
-          img: require('../../../assets/map/zhongdian/ico4.png'),
-          count: '-'
         }
-
       ],
       block2OptionsList: [
         {
@@ -120,11 +124,12 @@ export default {
           CHECK_COUNT: '-',
           HIDDEN_COUNT: '-'
         }
-      ]
+      ],
+      block4List: []
     }
   },
   mounted() {
-    this.getCount()
+    this.initNum()
     this.initgetTable()
   },
   methods: {
@@ -147,6 +152,21 @@ export default {
         this.block2OptionsList[1].count = data.pd.AMOUT_SUM
       })
     },
+    initNum() {
+      requestFN('/map/getAllDwMessage', { corpId: this.corpInfoId }
+      ).then((data) => {
+        this.block1OptionsList[0].count = data.alarmList.total
+        requestFN('/map/mapPlatformelectronic/listAllLocatio', { corpId: this.corpInfoId, TYPE: 'bianjieruqin' }
+        ).then((data) => {
+          this.block4List = data.alarmList.list
+          this.block1OptionsList[0].count = data.alarmList.total
+        }).catch((e) => {
+          this.$message.error(e)
+        })
+      }).catch((e) => {
+        this.$message.error(e)
+      })
+    },
     initgetTable() {
       requestFN(
         '/map/keyProject/list?showCount=10&currentPage=1',
@@ -357,6 +377,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 {