change - 箱壳成型数据监控平台、铝内胆数据监控平台设备OEE改为百分比

productionboard/src/main/java/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.java

@@ -73,7 +73,7 @@ public class AluminumDeviceInfoServiceImpl implements IAluminumDeviceInfoService
                 if(aluminumDeviceDataInformation != null){
                     result[4] = aluminumDeviceDataInformation.getRunTime();
                     result[5] = aluminumDeviceDataInformation.getStopTime();
-                    result[6] = aluminumDeviceDataInformation.getDeviceOee();
+                    result[6] = aluminumDeviceDataInformation.getDeviceOee() + "%";
                     result[7] = aluminumDeviceDataInformation.getCount()+"";
                     result[8] = aluminumDeviceDataInformation.getLossTime();
                     result[9] = aluminumDeviceDataInformation.getDeviceTakt();

productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java

@@ -127,7 +127,7 @@ public class TankShellDeviceInfoServiceImpl implements ITankShellDeviceInfoServi
                 if(tankShellDeviceDataInformation != null){
                     result[4] = tankShellDeviceDataInformation.getRunTime();
                     result[5] = tankShellDeviceDataInformation.getStopTime();
-                    result[6] = tankShellDeviceDataInformation.getDeviceOee();
+                    result[6] = tankShellDeviceDataInformation.getDeviceOee() + "%";
                     result[7] = tankShellDeviceDataInformation.getCount()+"";
                     result[8] = tankShellDeviceDataInformation.getLossTime();
                     result[9] = tankShellDeviceDataInformation.getDeviceTakt();

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

@@ -1564,6 +1564,11 @@ const OEEStatistics = (res, ids) => {
                     textStyle: {
                         color: "rgb(47,224,8)",
                     },
+                    formatter:(params) => {
+
+                        return (params.value)+"%";
+
+                    }
                 },
                 itemStyle: {
                     normal: {
@@ -2218,7 +2223,7 @@ const energyConsumption = (res, ids) => {
         yAxis: [
             {
                 type: 'value',
-                name: '产量(t)',
+                name: '产量',
                 min: 0,
                 // max: 40,
                 // interval: 10,
@@ -2281,7 +2286,7 @@ const energyConsumption = (res, ids) => {
                 },
                 tooltip: {
                     valueFormatter: function (value) {
-                        return value + ' t';
+                        return value;
                     }
                 },
                 barWidth: 20,

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

@@ -1564,6 +1564,11 @@ const OEEStatistics = (res, ids) => {
                     textStyle: {
                         color: "rgb(47,224,8)",
                     },
+                    formatter:(params) => {
+
+                        return (params.value)+"%";
+
+                    }
                 },
                 itemStyle: {
                     normal: {
@@ -2218,7 +2223,7 @@ const energyConsumption = (res, ids) => {
         yAxis: [
             {
                 type: 'value',
-                name: '产量(t)',
+                name: '产量',
                 min: 0,
                 // max: 40,
                 // interval: 10,
@@ -2281,7 +2286,7 @@ const energyConsumption = (res, ids) => {
                 },
                 tooltip: {
                     valueFormatter: function (value) {
-                        return value + ' t';
+                        return value;
                     }
                 },
                 barWidth: 20,