传感器

src/api/components/supermap.js

@@ -69,4 +69,6 @@ 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')
+
 }

src/views/monitor.vue

@@ -433,6 +433,9 @@
         this.getDlblistBydeptId()
       },
       chuanClick() {
+        this.onLa = false
+        this.onShe = false
+        this.onChuan = true
         this.localMark = 'chuan'
         this.placeholderMsg = "请输入传感器名称"
         this.deptId = Cookies.get("deptId")
@@ -566,34 +569,34 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>水中PH：" +
-                (item.data.waterPh ? item.data.waterPh : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>生化需氧量：" +
-                (item.data.bod ? item.data.bod : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>信号强度：" +
-                (item.data.signalStrength ? item.data.signalStrength : "") +
+                (item.data.waterPh ? item.data.waterPh+"pH" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
                 "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>生化需氧量：" +
+                // (item.data.bod ? item.data.bod+"mg/L" : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>信号强度：" +
+                // (item.data.signalStrength ? item.data.signalStrength+"" : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
                 "<span>" +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>化学需氧量：" +
-                (item.data.cod ? item.data.cod : "") +
+                (item.data.cod ? item.data.cod+"mg/L" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -602,7 +605,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>氨氮：" +
-                (item.data.ammoniaNitrogen ? item.data.ammoniaNitrogen : "") +
+                (item.data.ammoniaNitrogen ? item.data.ammoniaNitrogen+"mg/L" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -611,29 +614,20 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>水温：" +
-                (item.data.waterTemperature ? item.data.waterTemperature : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>版本号：" +
-                (item.data.version ? item.data.version : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>水质悬浮物：" +
-                (item.data.waterQualitySuspension ? item.data.waterQualitySuspension : "") +
+                (item.data.waterTemperature ? item.data.waterTemperature+"°C" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
                 "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>水质悬浮物：" +
+                // (item.data.waterQualitySuspension ? item.data.waterQualitySuspension : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
 
                 "</div>";
 
@@ -648,7 +642,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>钾含量：" +
-                (item.data.potassium ? item.data.potassium : "") +
+                (item.data.potassium ? item.data.potassium+"mg/kg" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -657,7 +651,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>导电率：" +
-                (item.data.conductivity ? item.data.conductivity : "") +
+                (item.data.conductivity ? item.data.conductivity+"us/cm" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -666,25 +660,25 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>氮含量：" +
-                (item.data.nitrogen ? item.data.nitrogen : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>信号强度：" +
-                (item.data.signalStrength ? item.data.signalStrength : "") +
+                (item.data.nitrogen ? item.data.nitrogen+"mg/kg" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
                 "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>信号强度：" +
+                // (item.data.signalStrength ? item.data.signalStrength : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
                 "<span>" +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>温度：" +
-                (item.data.temperature ? item.data.temperature : "") +
+                (item.data.temperature ? item.data.temperature+"°C" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -693,7 +687,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>ph值：" +
-                (item.data.ph ? item.data.ph : "") +
+                (item.data.ph ? item.data.ph+"PH" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -702,197 +696,198 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>湿度：" +
-                (item.data.humidity ? item.data.humidity : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>错误码：" +
-                (item.data.errorCode ? item.data.errorCode : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>版本号：" +
-                (item.data.version ? item.data.version : "") +
+                (item.data.humidity ? item.data.humidity+"%RH" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
                 "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>错误码：" +
+                // (item.data.errorCode ? item.data.errorCode : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>版本号：" +
+                // (item.data.version ? item.data.version : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
                 "<span>" +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>磷含量：" +
-                (item.data.phosphorus ? item.data.phosphorus : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>电压：" +
-                (item.data.voltage ? item.data.voltage : "") +
+                (item.data.phosphorus ? item.data.phosphorus+"mg/kg" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
                 "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>电压：" +
+                // (item.data.voltage ? item.data.voltage : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>"
+                +
                 "</div>";
             } else if (item.deviceType == 4) { // 病虫害监测站
               markersMap.icon = "sj-icon-map-centerdata_pest_and_disease_monitoring_station";
             } else if (item.deviceType == 5) { // 大气传感器
               markersMap.icon = "sj-icon-map-centerdata_atmospheric_sensor";
               markersMap.bindPopupHtml += '<div class="map-tip">' +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>总挥发性有机物：" +
-                (item.data.tvoc ? item.data.tvoc : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>总挥发性有机物：" +
+                // (item.data.tvoc ? item.data.tvoc : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
                 "<span>" +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>二氧化硫：" +
-                (item.data.sulfurDioxide ? item.data.sulfurDioxide : "") +
-                "</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.signalStrength ? item.data.signalStrength : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>可吸入颗粒物：" +
-                (item.data.suctionParticle ? item.data.suctionParticle : "") +
+                (item.data.sulfurDioxide ? item.data.sulfurDioxide+"ug/m3" : "") +
                 "</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.signalStrength ? item.data.signalStrength : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>可吸入颗粒物：" +
+                // (item.data.suctionParticle ? item.data.suctionParticle : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
                 "<span>" +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>一氧化碳：" +
-                (item.data.carbonMonoxide ? item.data.carbonMonoxide : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>臭氧：" +
-                (item.data.ozone ? item.data.ozone : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>总悬浮颗粒物：" +
-                (item.data.tsp ? item.data.tsp : "") +
+                (item.data.carbonMonoxide ? item.data.carbonMonoxide+"ug/m3" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
                 "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>臭氧：" +
+                // (item.data.ozone ? item.data.ozone : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>总悬浮颗粒物：" +
+                // (item.data.tsp ? item.data.tsp : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
                 "<span>" +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>温度：" +
-                (item.data.temperature ? item.data.temperature : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>湿度：" +
-                (item.data.humidity ? item.data.humidity : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>细颗粒：" +
-                (item.data.fineParticle ? item.data.fineParticle : "") +
+                (item.data.temperature ? item.data.temperature+"°C" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
                 "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>湿度：" +
+                // (item.data.humidity ? item.data.humidity : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>细颗粒：" +
+                // (item.data.fineParticle ? item.data.fineParticle+"ug/m3" : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
                 "<span>" +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>二氧化氮：" +
-                (item.data.nitrogenDioxide ? item.data.nitrogenDioxide : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>风向：" +
-                (item.data.windDirection ? item.data.windDirection : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>风速：" +
-                (item.data.windSpeed ? item.data.windSpeed : "") +
+                (item.data.nitrogenDioxide ? item.data.nitrogenDioxide+"ug/m3" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
                 "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>风向：" +
+                // (item.data.windDirection ? item.data.windDirection : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>风速：" +
+                // (item.data.windSpeed ? item.data.windSpeed : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
                 "</div>";
             } else if (item.deviceType == 6) { // 水压传感器
               markersMap.icon = "sj-icon-map-centerdata_water_pressure_sensor";
               markersMap.bindPopupHtml += '<div class="map-tip">' +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>设备编码：" +
-                (item.data.IMEI ? item.data.IMEI : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>设备编码：" +
+                // (item.data.IMEI ? item.data.IMEI : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
                 "<span>" +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>下限警报使能：" +
-                (item.data.thresholdLowEnable ? item.data.thresholdLowEnable : "") +
+                (item.data.thresholdLowEnable ? item.data.thresholdLowEnable+"MPa" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -901,25 +896,25 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>上限警报使能：" +
-                (item.data.thresholdHighEnable ? item.data.thresholdHighEnable : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>信号强度：" +
-                (item.data.signalPower ? item.data.signalPower : "") +
+                (item.data.thresholdHighEnable ? item.data.thresholdHighEnable+"MPa" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
                 "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>信号强度：" +
+                // (item.data.signalPower ? item.data.signalPower : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
                 "<span>" +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>水压力值：" +
-                (item.data.hydraulicValue ? item.data.hydraulicValue : "") +
+                (item.data.hydraulicValue ? item.data.hydraulicValue+"MPa" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -928,7 +923,7 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>水压下限阈值：" +
-                (item.data.hydraulicThresholdMin ? item.data.hydraulicThresholdMin : "") +
+                (item.data.hydraulicThresholdMin ? item.data.hydraulicThresholdMin+"MPa" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
@@ -938,20 +933,20 @@
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
                 "                  <h4>水压上限阈值：" +
-                (item.data.hydraulicThresholdMax ? item.data.hydraulicThresholdMax : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>水压力值：" +
-                (item.data.hydraulicValue ? item.data.hydraulicValue : "") +
+                (item.data.hydraulicThresholdMax ? item.data.hydraulicThresholdMax+"MPa" : "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +
                 "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>水压力值：" +
+                // (item.data.hydraulicValue ? item.data.hydraulicValue : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
                 "<span>" +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
@@ -985,28 +980,28 @@
             {
               markersMap.icon = "sj-icon-map-centerdata_water_pressure_sensor";
               markersMap.bindPopupHtml += '<div class="map-tip">' +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>两流量累计之和：" +
+                // (item.data.Q ? item.data.Q : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
+                // "<span>" +
+                // '                  <div class="d-l-con">' +
+                // '                  <div class="d-l-l-text">' +
+                // "                  <h4>瞬时流量：" +
+                // (item.data.Q1 ? item.data.Q1+"m3/s" : "") +
+                // "</h4>" +
+                // "                </div>" +
+                // "                </div>" +
+                // "                </span>" +
                 "<span>" +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                "                  <h4>两流量累计之和：" +
-                (item.data.Q ? item.data.Q : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>流量Q1：" +
-                (item.data.Q1 ? item.data.Q1 : "") +
-                "</h4>" +
-                "                </div>" +
-                "                </div>" +
-                "                </span>" +
-                "<span>" +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                "                  <h4>流量Q2：" +
+                "                  <h4>瞬时流速：" +
                 (item.data.Q2 ? item.data.Q2 : "") +
                 "</h4>" +
                 "                </div>" +
@@ -1015,8 +1010,8 @@
                 "<span>" +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                "                  <h4>Q1累计流量：" +
-                (item.data.CQ1 ? item.data.CQ1 : "") +
+                "                  <h4>瞬时流量：" +
+                (item.data.CQ1 ? item.data.CQ1+"m3/s": "") +
                 "</h4>" +
                 "                </div>" +
                 "                </div>" +