diff --git a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar index aafddd0..c16cd1c 100644 Binary files a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar and b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar differ diff --git a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original index b0e2ef8..84d8082 100644 Binary files a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original and b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original differ 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 fb6f6c6..42384bc 100644 --- a/productionboard/src/main/resources/static/js/common/echarts.common.js +++ b/productionboard/src/main/resources/static/js/common/echarts.common.js @@ -1191,7 +1191,6 @@ const bluePolygonHistogram = (res, ids) => { //多个立体柱状图 const multipleThreeDimensionalCylindrical = (res, ids) => { let mycharts = echarts.init(ids); - console.log(res); const xValue = res.map(val => val.materialName) const lineStoreAmount = res.map(val => val.lineStoreAmount) const hullStoreAmount = res.map(val => val.hullStoreAmount) @@ -1980,10 +1979,8 @@ const inventory = (res, ids) => { //loss const loss = (res, ids) => { let mycharts = echarts.init(ids); - - let xAxisData = []; - let seriesData1 = []; - let sum = 0; + const xValue = res.map(val => val.name) + const yValue = res.map(val => val.value) let barTopColor = [ "#55F675", @@ -1991,29 +1988,7 @@ const loss = (res, ids) => { let barBottomColor = [ "#55F675", ]; - let Res = - { - datas:res.length > 0 ? res : [ - { - name: '>30分钟', - value: 2 - }, - { - name: '3-10分钟', - value: 6 - }, - { - name: '0-3分钟', - value: 9 - }, - ], - } - Res.datas.forEach((item) => { - xAxisData.push(item.name); - seriesData1.push(item.value); - sum += item.value; - }); let option = { grid: { @@ -2025,7 +2000,7 @@ const loss = (res, ids) => { axisTick: { show: false, }, - data: xAxisData, + data: xValue, axisLine: { show: true, }, @@ -2103,7 +2078,7 @@ const loss = (res, ids) => { }, }, symbolPosition: "end", - data: seriesData1, + data: yValue, }, { @@ -2129,7 +2104,7 @@ const loss = (res, ids) => { silent: true, barWidth: 35, barGap: "-100%", // Make series be overlap - data: seriesData1, + data: yValue, }, ], }; diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js index 9986c2a..f526865 100644 --- a/productionboard/src/main/resources/static/js/tankShell/device.js +++ b/productionboard/src/main/resources/static/js/tankShell/device.js @@ -14,7 +14,7 @@ $(() => { }); //loss - $.getJSON('/tankShell/getInventoryStatistics', function (result) { + $.getJSON('/tankShellDevice/getLossStatistics', function (result) { loss(result, document.getElementById("loss")); }); diff --git a/productionboard/src/main/resources/templates/foamBox/index.html b/productionboard/src/main/resources/templates/foamBox/index.html index 505ddb4..402322e 100644 --- a/productionboard/src/main/resources/templates/foamBox/index.html +++ b/productionboard/src/main/resources/templates/foamBox/index.html @@ -33,12 +33,6 @@
- - - - - -
@@ -59,8 +53,8 @@
+ - \ No newline at end of file diff --git a/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class b/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class index f263ecc..0ce04e5 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class and b/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellLossStatistics.class b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellLossStatistics.class new file mode 100644 index 0000000..3ff2b6e Binary files /dev/null and b/productionboard/target/classes/com/productionboard/entity/TankShellDevice/TankShellLossStatistics.class differ diff --git a/productionboard/target/classes/com/productionboard/mapper/TankShellLossStatisticsMapper.class b/productionboard/target/classes/com/productionboard/mapper/TankShellLossStatisticsMapper.class new file mode 100644 index 0000000..dd74f49 Binary files /dev/null and b/productionboard/target/classes/com/productionboard/mapper/TankShellLossStatisticsMapper.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 fb6f6c6..42384bc 100644 --- a/productionboard/target/classes/static/js/common/echarts.common.js +++ b/productionboard/target/classes/static/js/common/echarts.common.js @@ -1191,7 +1191,6 @@ const bluePolygonHistogram = (res, ids) => { //多个立体柱状图 const multipleThreeDimensionalCylindrical = (res, ids) => { let mycharts = echarts.init(ids); - console.log(res); const xValue = res.map(val => val.materialName) const lineStoreAmount = res.map(val => val.lineStoreAmount) const hullStoreAmount = res.map(val => val.hullStoreAmount) @@ -1980,10 +1979,8 @@ const inventory = (res, ids) => { //loss const loss = (res, ids) => { let mycharts = echarts.init(ids); - - let xAxisData = []; - let seriesData1 = []; - let sum = 0; + const xValue = res.map(val => val.name) + const yValue = res.map(val => val.value) let barTopColor = [ "#55F675", @@ -1991,29 +1988,7 @@ const loss = (res, ids) => { let barBottomColor = [ "#55F675", ]; - let Res = - { - datas:res.length > 0 ? res : [ - { - name: '>30分钟', - value: 2 - }, - { - name: '3-10分钟', - value: 6 - }, - { - name: '0-3分钟', - value: 9 - }, - ], - } - Res.datas.forEach((item) => { - xAxisData.push(item.name); - seriesData1.push(item.value); - sum += item.value; - }); let option = { grid: { @@ -2025,7 +2000,7 @@ const loss = (res, ids) => { axisTick: { show: false, }, - data: xAxisData, + data: xValue, axisLine: { show: true, }, @@ -2103,7 +2078,7 @@ const loss = (res, ids) => { }, }, symbolPosition: "end", - data: seriesData1, + data: yValue, }, { @@ -2129,7 +2104,7 @@ const loss = (res, ids) => { silent: true, barWidth: 35, barGap: "-100%", // Make series be overlap - data: seriesData1, + data: yValue, }, ], }; diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js index 9986c2a..f526865 100644 --- a/productionboard/target/classes/static/js/tankShell/device.js +++ b/productionboard/target/classes/static/js/tankShell/device.js @@ -14,7 +14,7 @@ $(() => { }); //loss - $.getJSON('/tankShell/getInventoryStatistics', function (result) { + $.getJSON('/tankShellDevice/getLossStatistics', function (result) { loss(result, document.getElementById("loss")); }); diff --git a/productionboard/target/classes/templates/foamBox/index.html b/productionboard/target/classes/templates/foamBox/index.html index 505ddb4..402322e 100644 --- a/productionboard/target/classes/templates/foamBox/index.html +++ b/productionboard/target/classes/templates/foamBox/index.html @@ -33,12 +33,6 @@
- - - - - -
@@ -59,8 +53,8 @@
+ - \ No newline at end of file diff --git a/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 18c3a13..a26ce6a 100644 --- a/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -15,6 +15,7 @@ com\productionboard\config\MybatisPlusConfig.class com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.class com\productionboard\controller\AluminumLinerkController.class com\productionboard\controller\PreassembleController.class +com\productionboard\entity\TankShellDevice\TankShellLossStatistics.class com\productionboard\ProductionBoardApplication.class com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.class com\productionboard\mapper\AluminumThisMonthEnergyMapper.class @@ -24,6 +25,7 @@ com\productionboard\mapper\TankShellDevicePrameterValueMapper.class com\productionboard\mapper\TankShellThisMonthEnergyMapper.class com\productionboard\entity\TankShellDevice\TankShellThisMonthEnergy.class com\productionboard\service\impl\MesProductionDataServiceImpl.class +com\productionboard\mapper\TankShellLossStatisticsMapper.class com\productionboard\controller\AluminumTtankController.class com\productionboard\mapper\AluminumLossStatisticsMapper.class com\productionboard\mapper\MesMaterialStoreStatisticsMapper.class diff --git a/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index a9e68ce..5a6cf5f 100644 --- a/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -44,6 +44,8 @@ C:\Users\ADMIN\Desktop\ C:\Users\ADMIN\Desktop\н¨Îļþ¼Ð (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesTeamStatistics.java C:\Users\ADMIN\Desktop\н¨Îļþ¼Ð (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.java C:\Users\ADMIN\Desktop\н¨Îļþ¼Ð (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.java +C:\Users\ADMIN\Desktop\н¨Îļþ¼Ð (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellLossStatisticsMapper.java C:\Users\ADMIN\Desktop\н¨Îļþ¼Ð (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesHourProdutionStatisticsMapper.java C:\Users\ADMIN\Desktop\н¨Îļþ¼Ð (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellController.java +C:\Users\ADMIN\Desktop\н¨Îļþ¼Ð (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellLossStatistics.java C:\Users\ADMIN\Desktop\н¨Îļþ¼Ð (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDevicePrameterValue.java diff --git a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar index c52e079..12284a6 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 4d5d945..751a43a 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