王通 2 лет назад
Родитель
Сommit
80e08029b3

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

@@ -52,7 +52,8 @@ export const iconList = {
   'sj-icon-map-centerdata_water_pressure_sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_pressure_sensor.png'),//水压传感器
   'sj-icon-map-centerdata_water_flow_rate': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_flow_rate.png'), //水流速传感器
 
-
+  'sj-icon-map-centerdata-sand-quarry-camera':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-sand-quarry-camera.png'),//矿坑摄像头
+  'sj-icon-map-centerdata-t-hydraulic-reservoir-camera':require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-hydraulic-reservoir.png'),//水库摄像头
   //云图图标
   'sj-icon-map-centerdata-slmonitor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-slmonitor.png'),//水利摄像头
 }

BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-river_camera.png


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-sand-quarry-camera.png


+ 10 - 1
src/views/eventdetailsdialog.vue

@@ -2850,7 +2850,16 @@ export default {
                 if (res.data[i].cameraUse == 1) {
                   markersMap.icon = "sj-icon-map-centerdata-slmonitor";
                 } else if (res.data[i].cameraUse == 2) {
-                  markersMap.icon = "camera";
+
+                  markersMap.icon='camera'
+                } else if (res.data[i].cameraUse == 3) {
+                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+                }
+                else if (res.data[i].cameraUse == 4) {
+                  markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+                }
+                else if (res.data[i].cameraUse == 5) {
+                  markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
                 }
                 if (res.data[i].cameraCode != null) {
                   markersMap.click = "preview";

+ 10 - 2
src/views/firespread.vue

@@ -2424,10 +2424,18 @@ export default {
                 if(res.data[i].cameraUse==1)
                 {
                   markersMap.icon='sj-icon-map-centerdata-slmonitor'
-                } else {
+                } else if (res.data[i].cameraUse == 2) {
 
                   markersMap.icon='camera'
-                }
+                } else if (res.data[i].cameraUse == 3) {
+                markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+              }
+              else if (res.data[i].cameraUse == 4) {
+                markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+              }
+              else if (res.data[i].cameraUse == 5) {
+                markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
+              }
                 if (res.data[i].cameraCode != null) {
                   markersMap.click = 'preview'
                   // markersMap.parameter = res.data[i].cameraCode

+ 7 - 1
src/views/monitor.vue

@@ -1232,7 +1232,13 @@ export default {
             } else if (res.data.visuForestCloudCameraBOList[i].cameraUse == 2) {
               markersMap.icon = "camera";
             }else if (res.data.visuForestCloudCameraBOList[i].cameraUse == 3) {
-              markersMap.icon = "sj-icon-map-centerdata-slmonitor-traffic";
+              markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+            }
+            else if (res.data.visuForestCloudCameraBOList[i].cameraUse == 4) {
+              markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+            }
+            else if (res.data.visuForestCloudCameraBOList[i].cameraUse == 5) {
+              markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
             }
             markersMap.bindPopupHtml =
               '<div class="map-tip">' +