详情页面bug修复

src/api/components/supermap.js

@@ -61,4 +61,5 @@ export const iconList = {
   'sj-icon-map-centerdata-t-forest-firehydrant@1': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-firehydrant@1.png'),//地上消防栓
   'sj-icon-map-centerdata-t-forest-firehydrant@2': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-firehydrant@2.png'),//地下消防栓
   'sj-icon-map-centerdata-t-forest-firehydrant@3': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-firehydrant@3.png'),//室内消防栓
+  'sj-icon-map-centerdata-slmonitor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-slmonitor.png'),//水利摄像头
 }

src/views/eventdetailsdialog.vue

@@ -1731,15 +1731,18 @@ export default {
               } else if (type == 'zdqy') {
                 markersMap.icon = 'sj-icon-keyAreas'
               } else if (type == 'sxt') {
-                markersMap.icon = 'camera'
+                if(res.data[i].cameraUse==1)
+                {
+                  markersMap.icon='sj-icon-map-centerdata-slmonitor'
+                } else if(res.data[i].cameraUse==2){
+
+                  markersMap.icon='camera'
+                }
                 if (res.data[i].cameraCode != null) {
                   markersMap.click = 'preview'
                   // markersMap.parameter = res.data[i].cameraCode
-                  markersMap.parameter = {
-                    code: res.data[i].cameraCode,
-                    type: res.data[i].cameraFactory ? res.data[i].cameraFactory : 1,
-                    name: res.data[i].name
-                  }
+                  markersMap.parameter = {code:res.data[i].cameraCode,
+                    type:res.data[i].cameraFactory?res.data[i].cameraFactory:1,name:res.data[i].cameraName}
                 }
               }
               markersMap.lng = res.data[i].longitude
@@ -1748,7 +1751,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>资源名称：' + res.data[i].name + '</h4>' +
+                '                  <h4>资源名称：' + res.data[i].cameraName + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +

src/views/firespread.vue

@@ -2383,16 +2383,20 @@ export default {
               } else if (type == 'zdqy') {
                 markersMap.icon = 'sj-icon-keyAreas'
               } else if (type == 'sxt') {
-                markersMap.icon = 'camera'
+                if(res.data[i].cameraUse==1)
+                {
+                  markersMap.icon='sj-icon-map-centerdata-slmonitor'
+                } else {
+
+                  markersMap.icon='camera'
+                }
                 if (res.data[i].cameraCode != null) {
                   markersMap.click = 'preview'
                   // markersMap.parameter = res.data[i].cameraCode
-                  markersMap.parameter = {
-                    code: res.data.data[i].cameraCode,
-                    type: res.data.data[i].cameraFactory,
-                    name: res.data[i].name
-                  }
+                  markersMap.parameter = {code:res.data[i].cameraCode,
+                    type:res.data[i].cameraFactory?res.data[i].cameraFactory:1,name:res.data[i].cameraName}
                 }
+
               }
               markersMap.lng = res.data[i].longitude
               markersMap.lat = res.data[i].latitude
@@ -2400,7 +2404,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>资源名称：' + res.data[i].name + '</h4>' +
+                '                  <h4>资源名称：' + res.data[i].cameraName + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
@@ -3052,6 +3056,13 @@ export default {
             isAggregation: true,
             radius: 0
           }
+          if(res.data.centermonitorTCamera.cameraUse==1)
+          {
+            markersMap.icon='sj-icon-map-centerdata-slmonitor'
+          } else {
+
+            markersMap.icon='camera'
+          }
           markersMap.bindPopupHtml = '<div class="map-tip">' +
             '<span>' +
             '                  <div class="d-l-con">' +