rtretret

ipp-ap/src/views/idp/data/windtowerstatusdata/index.vue

@@ -862,7 +862,7 @@ export default {
         option.series[0].data.push(wd)
         index++;
       }
-      console.log(option)
+
       this.chart.setOption(option, true)
       var _this = this
       window.addEventListener("resize", function () {
@@ -1006,7 +1006,6 @@ export default {
       // });
     },
     wsDraw(wsData) {
-
       this.wsChart = echarts.init(document.getElementById('wscharts'))
 
       var option = {
@@ -1104,6 +1103,7 @@ export default {
       }
       option.xAxis[0].data = wsData.times
       var index = 0;
+
       for (var key in wsData.wsCharts) {
         var keyName = '';
         for (let thFormatKey in this.thFormat) {
@@ -1112,7 +1112,7 @@ export default {
           }
         }
         option.legend.data.push(keyName)
-        if (index > 3) {
+        if (index > 4) {
           option.legend.selected[keyName] = false
         } else {
           option.legend.selected[keyName] = true
@@ -1156,7 +1156,6 @@ export default {
         return alert("请选择所属设备")
       }
       queryCharts(param).then((res) => {
-        console.log(res.data.data)
         this.drawData = res.data.data
         this.wsData.wsCharts = this.drawData.ws
         this.wsData.times = this.drawData.times

ipp-idp/src/main/java/com/jiayue/ipp/idp/service/impl/WindTowerStatusDataServiceImpl.java

@@ -150,6 +150,9 @@ public class WindTowerStatusDataServiceImpl extends ServiceImpl<WindTowerStatusD
         }
         Map<String, Object> wdFrequencyMap = new LinkedHashMap<>();
         for (String wdMapKey : wdMap.keySet()) {
+            if ("wdInstHubHeight".equals(wdMapKey)){
+                continue;
+            }
             int[] frequency16 = new int[16];
             Float[] frequency16Rate = new Float[16];
             for (BigDecimal b : wdMap.get(wdMapKey)) {