Merge remote-tracking branch 'origin/visu_traffic_01_siping_2.5d' into visu_traffic_01_siping_2.5d

src/api/components/supermap.js

@@ -51,6 +51,18 @@ export const iconList = {
   'sj-icon-map-banjie': require('@/assets/icons/sj-icon-map/sj-icon-map-banjie.png'),//办结
   'sj-icon-map-queren': require('@/assets/icons/sj-icon-map/sj-icon-map-queren.png'),//确认
 
+  // 数据中心传感器
+  'sj-icon-map-centerdata_water_quality_sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_quality_sensor.png'),//水质传感器
+  'sj-icon-map-centerdata_water_gauge': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_gauge.png'),//水尺
+  '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_hydrological_monitoring_equipment': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_hydrological_monitoring_equipment.png'),//水文监测设备
+  'sj-icon-map-centerdata_soil_monitoring_equipment': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_soil_monitoring_equipment.png'),//土壤监测设备
+  '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'),//水压传感器
+
   //交通资源图标
   'traffic-resources-warning_sign': require('@/assets/icons/sj-icon-map/traffic-resources-warning_sign.png'),//警示牌
   'traffic-resources-bridge': require('@/assets/icons/sj-icon-map/traffic-resources-bridge.png'),//桥梁

src/views/monitor.vue

@@ -569,7 +569,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>水中PH：" +
-                (item.data.waterPh ? item.data.waterPh+"pH" : "") +
+                (item.data.waterPh ? item.data.waterPh+"pH" : "0pH") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -596,7 +596,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>化学需氧量：" +
-                (item.data.cod ? item.data.cod+"mg/L" : "") +
+                (item.data.cod ? item.data.cod+"mg/L" : "0mg/L") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -605,7 +605,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>氨氮：" +
-                (item.data.ammoniaNitrogen ? item.data.ammoniaNitrogen+"mg/L" : "") +
+                (item.data.ammoniaNitrogen ? item.data.ammoniaNitrogen+"mg/L" : "0mg/L") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -614,7 +614,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>水温：" +
-                (item.data.waterTemperature ? item.data.waterTemperature+"°C" : "") +
+                (item.data.waterTemperature ? item.data.waterTemperature+"°C" : "0°C") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -642,7 +642,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>钾含量：" +
-                (item.data.potassium ? item.data.potassium+"mg/kg" : "") +
+                (item.data.potassium ? item.data.potassium+"mg/kg" : "0mg/kg") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -651,7 +651,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>导电率：" +
-                (item.data.conductivity ? item.data.conductivity+"us/cm" : "") +
+                (item.data.conductivity ? item.data.conductivity+"us/cm" : "0us/cm") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -660,7 +660,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>氮含量：" +
-                (item.data.nitrogen ? item.data.nitrogen+"mg/kg" : "") +
+                (item.data.nitrogen ? item.data.nitrogen+"mg/kg" : "0mg/kg") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -678,7 +678,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>温度：" +
-                (item.data.temperature ? item.data.temperature+"°C" : "") +
+                (item.data.temperature ? item.data.temperature+"°C" : "0°C") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -687,7 +687,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>ph值：" +
-                (item.data.ph ? item.data.ph+"PH" : "") +
+                (item.data.ph ? item.data.ph+"PH" : "0PH") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -696,7 +696,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>湿度：" +
-                (item.data.humidity ? item.data.humidity+"%RH" : "") +
+                (item.data.humidity ? item.data.humidity+"%RH" : "0%RH") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -723,7 +723,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>磷含量：" +
-                (item.data.phosphorus ? item.data.phosphorus+"mg/kg" : "") +
+                (item.data.phosphorus ? item.data.phosphorus+"mg/kg" : "0mg/kg") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -737,7 +737,6 @@
                 // "                </div>" +
                 // "                </div>" +
                 // "                </span>"
-                +
                 "</div>";
             } else if (item.deviceType == 4) { // 病虫害监测站
               markersMap.icon = "sj-icon-map-centerdata_pest_and_disease_monitoring_station";
@@ -757,7 +756,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>二氧化硫：" +
-                (item.data.sulfurDioxide ? item.data.sulfurDioxide+"ug/m3" : "") +
+                (item.data.sulfurDioxide ? item.data.sulfurDioxide+"ug/m³" : "0ug/m³") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -793,7 +792,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>一氧化碳：" +
-                (item.data.carbonMonoxide ? item.data.carbonMonoxide+"ug/m3" : "") +
+                (item.data.carbonMonoxide ? item.data.carbonMonoxide+"ug/m³" : "0ug/m³") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -820,7 +819,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>温度：" +
-                (item.data.temperature ? item.data.temperature+"°C" : "") +
+                (item.data.temperature ? item.data.temperature+"°C" : "0°C") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -847,7 +846,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>二氧化氮：" +
-                (item.data.nitrogenDioxide ? item.data.nitrogenDioxide+"ug/m3" : "") +
+                (item.data.nitrogenDioxide ? item.data.nitrogenDioxide+"ug/m³" : "0ug/m³") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -887,7 +886,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>下限警报使能：" +
-                (item.data.thresholdLowEnable ? item.data.thresholdLowEnable+"MPa" : "") +
+                (item.data.thresholdLowEnable ? item.data.thresholdLowEnable+"MPa" : "0MPa") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -896,7 +895,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>上限警报使能：" +
-                (item.data.thresholdHighEnable ? item.data.thresholdHighEnable+"MPa" : "") +
+                (item.data.thresholdHighEnable ? item.data.thresholdHighEnable+"MPa" : "0MPa") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -914,7 +913,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>水压力值：" +
-                (item.data.hydraulicValue ? item.data.hydraulicValue+"MPa" : "") +
+                (item.data.hydraulicValue ? item.data.hydraulicValue+"MPa" : "0MPa") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -923,7 +922,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>水压下限阈值：" +
-                (item.data.hydraulicThresholdMin ? item.data.hydraulicThresholdMin+"MPa" : "") +
+                (item.data.hydraulicThresholdMin ? item.data.hydraulicThresholdMin+"MPa" : "0MPa") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -933,7 +932,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>水压上限阈值：" +
-                (item.data.hydraulicThresholdMax ? item.data.hydraulicThresholdMax+"MPa" : "") +
+                (item.data.hydraulicThresholdMax ? item.data.hydraulicThresholdMax+"MPa" : "0MPa") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -947,33 +946,33 @@
                 // "                </div>" +
                 // "                </div>" +
                 // "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>心跳周期：" +
-                (item.data.heartbeatTime ? item.data.heartbeatTime : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>电池电压：" +
-                (item.data.batteryVoltage ? item.data.batteryVoltage : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>电池电量：" +
-                (item.data.batteryValue ? item.data.batteryValue : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>心跳周期：" +
+                // (item.data.heartbeatTime ? item.data.heartbeatTime : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>电池电压：" +
+                // (item.data.batteryVoltage ? item.data.batteryVoltage : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>电池电量：" +
+                // (item.data.batteryValue ? item.data.batteryValue : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
 
                 "</div>";
             } else if (item.deviceType == 7) //水流速传感器
@@ -1002,7 +1001,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>瞬时流速：" +
-                (item.data.Q2 ? item.data.Q2 : "") +
+                (item.data.Q2 ? item.data.Q2+"m/s" : "0m/s") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -1011,7 +1010,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>瞬时流量：" +
-                (item.data.CQ1 ? item.data.CQ1+"m3/s": "") +
+                (item.data.CQ1 ? item.data.CQ1+"m³/s": "0m³/s") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +