JX.LI %!s(int64=2) %!d(string=hai) anos
pai
achega
88633164d6

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

@@ -62,6 +62,7 @@ export const iconList = {
   'sj-icon-map-centerdata_pest_and_disease_monitoring_station': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_pest_and_disease_monitoring_station.png'),//病虫害监测站
   'sj-icon-map-centerdata_atmospheric_sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_atmospheric_sensor.png'),//大气传感器
   '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'), //水流速
 
   //交通资源图标
   'traffic-resources-warning_sign': require('@/assets/icons/sj-icon-map/traffic-resources-warning_sign.png'),//警示牌
@@ -81,6 +82,5 @@ export const iconList = {
   'sj-icon-map-centerdata-t-firecontrol-other-linkage-force': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-other-linkage-force.png'),//其他消防力量
   'sj-icon-map-centerdata-t-firecontrol-foam-liquid': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-foam-liquid.png'),//泡沫液
   'sj-icon-map-centerdata-t-firecontrol-fulltime-station': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fulltime-station.png'),//专职站
-  'sj-icon-map-centerdata_water_pressure_sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_pressure_sensor.png')
 
 }

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


+ 1 - 1
src/views/monitor.vue

@@ -977,7 +977,7 @@
                 "</div>";
             } else if (item.deviceType == 7) //水流速传感器
             {
-              markersMap.icon = "sj-icon-map-centerdata_water_pressure_sensor";
+              markersMap.icon = "sj-icon-map-centerdata_water_flow_rate";
               markersMap.bindPopupHtml += '<div class="map-tip">' +
                 // "<span>" +
                 // '                  <div class="d-l-con">' +