测风塔风速图

cpp-admin/src/main/java/com/cpp/web/controller/stationDataQuery/WindTowerStatusDataController.java

@@ -77,7 +77,7 @@ public class WindTowerStatusDataController {
         List<BigDecimal> ws80List = new ArrayList<>();
         List<BigDecimal> ws90List = new ArrayList<>();
         List<BigDecimal> ws100List = new ArrayList<>();
-        Map<String, List> wsMap = new HashMap<>();
+        LinkedHashMap<String, List> wsMap = new LinkedHashMap<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         for (int i = 0; i < talbeList.size(); i++) {
             WindTowerStatusData windTowerStatusData = talbeList.get(i);
@@ -110,23 +110,21 @@ public class WindTowerStatusDataController {
             BigDecimal ws100 = windTowerStatusData.getWs100();
             ws100List.add(ws100);
         }
-        wsMap.put("timeList",timeList);
-        wsMap.put("wsHubHeightList", wsHubHeightList);
-        wsMap.put("ws10List", ws10List);
-        wsMap.put("ws30List", ws30List);
-        wsMap.put("ws50List", ws50List);
-        wsMap.put("ws60List", ws60List);
-        wsMap.put("ws70List", ws70List);
-        wsMap.put("ws80List", ws80List);
-        wsMap.put("ws90List", ws90List);
-        wsMap.put("ws100List", ws100List);
 
+        wsMap.put("轮毂风速", wsHubHeightList);
+        wsMap.put("10米风速", ws10List);
+        wsMap.put("30米风速", ws30List);
+        wsMap.put("50米风速", ws50List);
+        wsMap.put("60米风速", ws60List);
+        wsMap.put("70米风速", ws70List);
+        wsMap.put("80米风速", ws80List);
+        wsMap.put("90米风速", ws90List);
+        wsMap.put("100米风速", ws100List);
 
         Map<String, Object> returnMap = new HashMap<>();
         returnMap.put("tableList", talbeList);
+        returnMap.put("wsTime", timeList);
         returnMap.put("wsMap", wsMap);
         return R.ok(returnMap);
-
-
     }
 }

cpp-ui/src/views/stationDataQuery/windtowerstatusdata/index.vue

@@ -742,7 +742,8 @@ export default {
         this.total = response.data.tableList.length
 
         let wsMap = response.data.wsMap
-        this.wsDraw(wsMap)
+        let wsTime = response.data.wsTime
+        this.wsDraw(wsTime,wsMap)
 
 
         this.loading = false
@@ -762,7 +763,7 @@ export default {
 
 
 
-    wsDraw(wsMap) {
+    wsDraw(wsTime,wsMap) {
       this.wsChart = echarts.init(document.getElementById('wscharts'))
       var option = {
         backgroundColor: 'transparent',
@@ -857,69 +858,44 @@ export default {
         }],
         series: []
       }
-      option.xAxis[0].data = wsMap.timeList
+      option.xAxis[0].data = wsTime
       var index = 0;
 
-      // for (var key in wsMap.wsCharts) {
-      //   var keyName = '';
-      //   for (let thFormatKey in this.thFormat) {
-      //     if (key == thFormatKey) {
-      //       keyName = this.thFormat[thFormatKey];
-      //     }
-      //   }
-      //   option.legend.data.push(keyName)
-      //   if (index > 4) {
-      //     option.legend.selected[keyName] = false
-      //   } else {
-      //     option.legend.selected[keyName] = true
-      //   }
-      //   var sValue = {
-      //     name: '',
-      //     type: 'line',
-      //     smooth: false,
-      //     symbol: 'circle',
-      //     symbolSize: 5,
-      //     showSymbol: false,
-      //     lineStyle: {
-      //       normal: {
-      //         width: 2
-      //       }
-      //     },
-      //     itemStyle: {},
-      //     data: []
-      //   }
-      //   sValue.name = keyName
-      //   sValue.data = wsData.wsCharts[key]
-      //   sValue.itemStyle = this.lineStyle[index].itemStyle
-      //   sValue.connectNulls = true
-      //   option.series.push(sValue)
-      //   index++;
-      // }
-
-
-      var sValue = {
-        name: '',
-        type: 'line',
-        smooth: false,
-        symbol: 'circle',
-        symbolSize: 5,
-        showSymbol: false,
-        lineStyle: {
-          normal: {
-            width: 2
-          }
-        },
-        itemStyle: {},
-        data: []
+      for (var key in wsMap) {
+        // var keyName = '';
+        // for (let thFormatKey in this.thFormat) {
+        //   if (key == thFormatKey) {
+        //     keyName = this.thFormat[thFormatKey];
+        //   }
+        // }
+        option.legend.data.push(key)
+        if (key=='轮毂风速') {
+          option.legend.selected[key] = true
+        } else {
+          option.legend.selected[key] = false
+        }
+        var sValue = {
+          name: '',
+          type: 'line',
+          smooth: false,
+          symbol: 'circle',
+          symbolSize: 5,
+          showSymbol: false,
+          lineStyle: {
+            normal: {
+              width: 2
+            }
+          },
+          itemStyle: {},
+          data: []
+        }
+        sValue.name = key
+        sValue.data = wsMap[key]
+        sValue.itemStyle = this.lineStyle[index].itemStyle
+        sValue.connectNulls = true
+        option.series.push(sValue)
+        index++;
       }
-      sValue.name = '10米风速'
-      sValue.data = wsMap.ws10List
-      sValue.itemStyle = this.lineStyle[index].itemStyle
-      sValue.connectNulls = true
-      option.series.push(sValue)
-      option.legend.data.push('10米风速')
-
-
       this.wsChart.setOption(option, true)
       var _this = this
       window.addEventListener("resize", function () {