Merge branch 'master' of https://gitee.com/wen-gitee/scada-visual-board

productionboard/src/main/resources/static/js/common/echarts.common.js

@@ -1531,12 +1531,8 @@ const multipleThreeDimensionalCylindrical = (res, ids) => {
 const OEEStatistics = (res, ids) => {
     console.log(res);
     let mycharts = echarts.init(ids);
-    let xAxisData = []
-    let yAxisData = []
-    res.forEach((item) => {
-        xAxisData.push(item.yValue);
-        yAxisData.push(item.xValue);
-    });
+    let xAxisData = res.map(val => val.yValue);
+    let yAxisData = res.map(val => val.xValue);
     console.log(xAxisData);
     console.log(yAxisData);
 

productionboard/target/classes/static/js/common/echarts.common.js

@@ -1531,12 +1531,8 @@ const multipleThreeDimensionalCylindrical = (res, ids) => {
 const OEEStatistics = (res, ids) => {
     console.log(res);
     let mycharts = echarts.init(ids);
-    let xAxisData = []
-    let yAxisData = []
-    res.forEach((item) => {
-        xAxisData.push(item.yValue);
-        yAxisData.push(item.xValue);
-    });
+    let xAxisData = res.map(val => val.yValue);
+    let yAxisData = res.map(val => val.xValue);
     console.log(xAxisData);
     console.log(yAxisData);