diff --git a/productionboard/src/main/java/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.java index 2f57b0a..906819e 100644 --- a/productionboard/src/main/java/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.java +++ b/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(); diff --git a/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java index c213e89..b974e2c 100644 --- a/productionboard/src/main/java/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.java +++ b/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(); diff --git a/productionboard/src/main/resources/static/js/common/echarts.common.js b/productionboard/src/main/resources/static/js/common/echarts.common.js index 91c8a58..21ffae5 100644 --- a/productionboard/src/main/resources/static/js/common/echarts.common.js +++ b/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, diff --git a/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class index dcb02fb..58d0f8d 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/AluminumDeviceInfoServiceImpl.class differ diff --git a/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class index 99a4f72..438b829 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/TankShellDeviceInfoServiceImpl.class differ diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js index 91c8a58..21ffae5 100644 --- a/productionboard/target/classes/static/js/common/echarts.common.js +++ b/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, diff --git a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar index 56236fc..ab042af 100644 Binary files a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar and b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar differ diff --git a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original index 70bb51a..4d887fb 100644 Binary files a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original and b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original differ