Browse Source

监控中心修改

王通 1 year ago
parent
commit
7be7992306

+ 1 - 1
src/api/components/supermap.js

@@ -14,7 +14,7 @@ export const iconList = {
   'camera-not': require('@/assets/images/cameraType/camera-not.png'),
   'camera-not': require('@/assets/images/cameraType/camera-not.png'),
   'not-online': require('@/assets/images/cameraType/not-online.png'),
   'not-online': require('@/assets/images/cameraType/not-online.png'),
   'sensor': require('@/assets/images/cameraType/sensor.png'),
   'sensor': require('@/assets/images/cameraType/sensor.png'),
-
+  'big-horn-emergency': require('@/assets/images/cameraType/big-horn-emergency.png'),
   //首页事件上报状态
   //首页事件上报状态
   'sj-icon-map-xinshangbao': require('@/assets/icons/sj-icon-map/sj-icon-map-xinshangbao.png'),//新上报
   'sj-icon-map-xinshangbao': require('@/assets/icons/sj-icon-map/sj-icon-map-xinshangbao.png'),//新上报
   'sj-icon-map-cuiban': require('@/assets/icons/sj-icon-map/sj-icon-map-cuiban.png'),//催办
   'sj-icon-map-cuiban': require('@/assets/icons/sj-icon-map/sj-icon-map-cuiban.png'),//催办

BIN
src/assets/images/cameraType/big-horn-emergency.png


+ 13 - 8
src/views/monitor.vue

@@ -50,8 +50,9 @@
                 <div
                 <div
                   class="icon-con w-33 m-btm-no"
                   class="icon-con w-33 m-btm-no"
                   :class="{ on: onLa }"
                   :class="{ on: onLa }"
+                                  @click="laClick"
                 >
                 >
-                  <!--                  @click="laClick"-->
+
                   <div class="icon icon-dot"></div>
                   <div class="icon icon-dot"></div>
                   <div class="icon-text">
                   <div class="icon-text">
                     <h6>{{ loudspeakerNum }}</h6>
                     <h6>{{ loudspeakerNum }}</h6>
@@ -175,7 +176,7 @@
                 class="d-l-con"
                 class="d-l-con"
                 v-for="(item, index) in keyAreaList"
                 v-for="(item, index) in keyAreaList"
                 :class="{ on: listCurrentIndex3 == index }"
                 :class="{ on: listCurrentIndex3 == index }"
-                @click="getRegionalFlag(item.id)"
+                @click="getRegionalFlag(item.id,index)"
               >
               >
                 <div class="d-l-l-text">
                 <div class="d-l-l-text">
                   <i class="i-small"></i>
                   <i class="i-small"></i>
@@ -270,7 +271,7 @@ export default {
       this.deptId = Cookies.get("deptId");
       this.deptId = Cookies.get("deptId");
       // this.getSensorListByDeptIds()
       // this.getSensorListByDeptIds()
       this.getMonitorDeviceAndDataLists(null);
       this.getMonitorDeviceAndDataLists(null);
-      // this.getDlblistBydeptIds(null);
+       this.getDlblistBydeptIds(null);
       // this.chuanSet();
       // this.chuanSet();
       this.selectDeviceType(-1);
       this.selectDeviceType(-1);
     }, 2000)
     }, 2000)
@@ -896,10 +897,10 @@ export default {
           });
           });
         });
         });
       } else if (that.localMark == "chuan") {
       } else if (that.localMark == "chuan") {
-        //that.getSensorListByDeptId()
+        that.getSensorListByDeptId()
         that.getMonitorDeviceAndDataList(data.id);
         that.getMonitorDeviceAndDataList(data.id);
       } else if (that.localMark == "la") {
       } else if (that.localMark == "la") {
-        // that.getDlblistBydeptId();
+         that.getDlblistBydeptId();
       }
       }
     },
     },
     sheClick() {
     sheClick() {
@@ -962,7 +963,7 @@ export default {
               let markersMap = {
               let markersMap = {
                 lng: 124.59,
                 lng: 124.59,
                 lat: 43.02,
                 lat: 43.02,
-                icon: "marker",
+                icon: "big-horn",
                 bindPopupHtml:
                 bindPopupHtml:
                   '<div class="map-tip">' +
                   '<div class="map-tip">' +
                   "<span>" +
                   "<span>" +
@@ -1011,7 +1012,11 @@ export default {
                 isAggregation: false,
                 isAggregation: false,
               };
               };
               markersMap.icon = "big-horn";
               markersMap.icon = "big-horn";
-
+              if (res.data[i].broadcastUse == '1') {
+                markersMap.icon = "big-horn-emergency";
+              } else if (res.data[i].broadcastUse == '2') {
+                markersMap.icon = "big-horn";
+              }
               markersMap.lng = res.data[i].longitude;
               markersMap.lng = res.data[i].longitude;
               markersMap.lat = res.data[i].latitude;
               markersMap.lat = res.data[i].latitude;
               markersList.push(markersMap);
               markersList.push(markersMap);
@@ -1133,7 +1138,7 @@ export default {
     },
     },
     getRegionalFlag(id) {
     getRegionalFlag(id) {
       //获取重点区域
       //获取重点区域
-      this.listCurrentIndex3 = id;
+      this.listCurrentIndex3 = index;
       let that = this;
       let that = this;
       getRegionalFlag(id).then((res) => {
       getRegionalFlag(id).then((res) => {
         that.graphicsList = [];
         that.graphicsList = [];