Merge remote-tracking branch 'origin/master'

# Conflicts: # productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst # productionboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst # productionboard/target/productionboard-0.0.1-SNAPSHOT.jar # productionboard/target/productionboard-0.0.1-SNAPSHOT.jar.original
2 years ago · f1f1e1c815
parent ae07567a0f 915d3112aa
commit f1f1e1c815
27 changed files with 127 additions and 16 deletions
--- a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar
+++ b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar
--- a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original
+++ b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar.original
--- a/productionboard/src/main/resources/static/css/adsorptionTank/style.css
+++ b/productionboard/src/main/resources/static/css/adsorptionTank/style.css
@ -33,3 +33,7 @@ body {
    top: 23%;
    left: 3.5%;
 }
+.span_c{
+    margin-left: 5%;
+    margin-right: 10% !important;
+}
--- a/productionboard/src/main/resources/static/css/aluminumTank/style.css
+++ b/productionboard/src/main/resources/static/css/aluminumTank/style.css
@ -33,3 +33,7 @@ body {
    bottom: 4.5%;
    left: 3.5%;
 }
+.span_c{
+    margin-left: 5%;
+    margin-right: 10% !important;
+}
--- a/productionboard/src/main/resources/static/css/foamBox/style.css
+++ b/productionboard/src/main/resources/static/css/foamBox/style.css
@ -119,7 +119,7 @@ body {
    position: absolute;
    width: 23%;
    height: 19%;
-    top: 46%;
+    top: 47%;
    left: 73%;
 }

--- a/productionboard/src/main/resources/static/css/preassemble/style.css
+++ b/productionboard/src/main/resources/static/css/preassemble/style.css
@ -33,3 +33,7 @@ body {
    top: 23%;
    left: 3.5%;
 }
+.span_c{
+    margin-left: 5%;
+    margin-right: 10% !important;
+}
--- a/productionboard/src/main/resources/static/css/tankShell/style.css
+++ b/productionboard/src/main/resources/static/css/tankShell/style.css
@ -33,3 +33,8 @@ body {
    bottom: 4.5%;
    left: 3.5%;
 }
+
+.span_c{
+    margin-left: 5%;
+    margin-right: 10% !important;
+}
--- a/productionboard/src/main/resources/static/js/common/echarts.common.js
+++ b/productionboard/src/main/resources/static/js/common/echarts.common.js
@ -565,6 +565,7 @@ const threeDimensionalCylindrical = (res, ids) => {
 //多个折线面积图
 const multipleBrokenLineAreaDiagram = (res, ids) => {
    let mycharts = echarts.init(ids);
+    console.log(res);

    let option = {
        tooltip: {
--- a/productionboard/src/main/resources/static/js/common/ondutyplan.js
+++ b/productionboard/src/main/resources/static/js/common/ondutyplan.js
@ -3,7 +3,7 @@ $(() =>{
    let html = `<div id="theCurrentTeam" class="onDutyPlan display-blocks theCurrentTeam">
                    <span>-</span>
                    <span>-</span>
-                    <span style='margin-left: 5%;margin-right: 10%;'>-</span>
+                    <span class="span_c" >-</span>
                    <span>-</span>
                </div>
                
--- a/productionboard/src/main/resources/static/js/foamBox/index.js
+++ b/productionboard/src/main/resources/static/js/foamBox/index.js
@ -1,4 +1,5 @@
 $(() => {
+
    //班组计划统计
    // onDutyPlan(1234, 1202, 33);
    $.getJSON('/foamBox/getTeamStatisticsJson', function (result) {
@ -6,11 +7,13 @@ $(() => {
    });

    //设备运行状态
-    let statusArray = [0, 0, 0, 0, 1, 0];
-    deviceStatus(statusArray);
+    $.getJSON(`/foamBox/getRunStatusJson?ids=${ids}`, function (result) {
+        deviceStatus(result);
+    });
+   

    //库存统计
-    $.getJSON('/foamBox/getMaterialStoreJson', function (result) {
+    $.getJSON(`/foamBox/getMaterialStoreJson`, function (result) {
        threeDimensionalCylindrical(result, document.getElementById("inventoryStatistics"));
    });

@ -25,7 +28,9 @@ $(() => {
    });

    //发泡参数
-    multipleBrokenLineAreaDiagram(null, document.getElementById("foamingParameters"));
+    $.getJSON(`/foamBox/getParamTemperature?ids=${ids}`, function (result) {
+        multipleBrokenLineAreaDiagram(result, document.getElementById("foamingParameters"));
+    });

    // 模具温度1

@ -142,3 +147,4 @@ const deviceStatus = (statusArray) => {
    $(".foamingLineRunStatus table tr").append(info);

 }
+
--- a/productionboard/src/main/resources/templates/foamBox/index.html
+++ b/productionboard/src/main/resources/templates/foamBox/index.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">

 <head>
    <meta charset="UTF-8">
@ -68,6 +68,8 @@
        },
    });
    
+    const ids = [[${positionId}]];
+
    // let info = `
    //             <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
    //             <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
--- a/productionboard/target/classes/com/productionboard/entity/FoamBoxDevice/FoamBoxLineRunStatus.class
+++ b/productionboard/target/classes/com/productionboard/entity/FoamBoxDevice/FoamBoxLineRunStatus.class
--- a/productionboard/target/classes/com/productionboard/entity/FoamBoxDevice/FoamBoxMachineRunStatus.class
+++ b/productionboard/target/classes/com/productionboard/entity/FoamBoxDevice/FoamBoxMachineRunStatus.class
--- a/productionboard/target/classes/com/productionboard/mapper/FoamBoxLineRunStatusMapper.class
+++ b/productionboard/target/classes/com/productionboard/mapper/FoamBoxLineRunStatusMapper.class
--- a/productionboard/target/classes/com/productionboard/mapper/FoamBoxMachineRunStatusMapper.class
+++ b/productionboard/target/classes/com/productionboard/mapper/FoamBoxMachineRunStatusMapper.class
--- a/productionboard/target/classes/com/productionboard/service/IFoamBoxDeviceInfoService.class
+++ b/productionboard/target/classes/com/productionboard/service/IFoamBoxDeviceInfoService.class
--- a/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl.class
+++ b/productionboard/target/classes/com/productionboard/service/impl/FoamBoxDeviceInfoServiceImpl.class
--- a/productionboard/target/classes/static/css/adsorptionTank/style.css
+++ b/productionboard/target/classes/static/css/adsorptionTank/style.css
@ -33,3 +33,7 @@ body {
    top: 23%;
    left: 3.5%;
 }
+.span_c{
+    margin-left: 5%;
+    margin-right: 10% !important;
+}
--- a/productionboard/target/classes/static/css/aluminumTank/style.css
+++ b/productionboard/target/classes/static/css/aluminumTank/style.css
@ -33,3 +33,7 @@ body {
    bottom: 4.5%;
    left: 3.5%;
 }
+.span_c{
+    margin-left: 5%;
+    margin-right: 10% !important;
+}
--- a/productionboard/target/classes/static/css/foamBox/style.css
+++ b/productionboard/target/classes/static/css/foamBox/style.css
@ -119,7 +119,7 @@ body {
    position: absolute;
    width: 23%;
    height: 19%;
-    top: 46%;
+    top: 47%;
    left: 73%;
 }

--- a/productionboard/target/classes/static/css/preassemble/style.css
+++ b/productionboard/target/classes/static/css/preassemble/style.css
@ -33,3 +33,7 @@ body {
    top: 23%;
    left: 3.5%;
 }
+.span_c{
+    margin-left: 5%;
+    margin-right: 10% !important;
+}
--- a/productionboard/target/classes/static/css/tankShell/style.css
+++ b/productionboard/target/classes/static/css/tankShell/style.css
@ -33,3 +33,8 @@ body {
    bottom: 4.5%;
    left: 3.5%;
 }
+
+.span_c{
+    margin-left: 5%;
+    margin-right: 10% !important;
+}
--- a/productionboard/target/classes/static/js/common/echarts.common.js
+++ b/productionboard/target/classes/static/js/common/echarts.common.js
@ -565,6 +565,7 @@ const threeDimensionalCylindrical = (res, ids) => {
 //多个折线面积图
 const multipleBrokenLineAreaDiagram = (res, ids) => {
    let mycharts = echarts.init(ids);
+    console.log(res);

    let option = {
        tooltip: {
--- a/productionboard/target/classes/static/js/common/ondutyplan.js
+++ b/productionboard/target/classes/static/js/common/ondutyplan.js
@ -3,7 +3,7 @@ $(() =>{
    let html = `<div id="theCurrentTeam" class="onDutyPlan display-blocks theCurrentTeam">
                    <span>-</span>
                    <span>-</span>
-                    <span style='margin-left: 5%;margin-right: 10%;'>-</span>
+                    <span class="span_c" >-</span>
                    <span>-</span>
                </div>
                
--- a/productionboard/target/classes/static/js/foamBox/index.js
+++ b/productionboard/target/classes/static/js/foamBox/index.js
@ -1,4 +1,5 @@
 $(() => {
+
    //班组计划统计
    // onDutyPlan(1234, 1202, 33);
    $.getJSON('/foamBox/getTeamStatisticsJson', function (result) {
@ -6,11 +7,13 @@ $(() => {
    });

    //设备运行状态
-    let statusArray = [0, 0, 0, 0, 1, 0];
-    deviceStatus(statusArray);
+    $.getJSON(`/foamBox/getRunStatusJson?ids=${ids}`, function (result) {
+        deviceStatus(result);
+    });
+   

    //库存统计
-    $.getJSON('/foamBox/getMaterialStoreJson', function (result) {
+    $.getJSON(`/foamBox/getMaterialStoreJson`, function (result) {
        threeDimensionalCylindrical(result, document.getElementById("inventoryStatistics"));
    });

@ -25,7 +28,9 @@ $(() => {
    });

    //发泡参数
-    multipleBrokenLineAreaDiagram(null, document.getElementById("foamingParameters"));
+    $.getJSON(`/foamBox/getParamTemperature?ids=${ids}`, function (result) {
+        multipleBrokenLineAreaDiagram(result, document.getElementById("foamingParameters"));
+    });

    // 模具温度1

@ -142,3 +147,4 @@ const deviceStatus = (statusArray) => {
    $(".foamingLineRunStatus table tr").append(info);

 }
+
--- a/productionboard/target/classes/templates/foamBox/index.html
+++ b/productionboard/target/classes/templates/foamBox/index.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">

 <head>
    <meta charset="UTF-8">
@ -68,6 +68,8 @@
        },
    });
    
+    const ids = [[${positionId}]];
+
    // let info = `
    //             <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
    //             <td style="border:0px solid red;text-align:center;"><img src="${true ? '../../img/foamBox/deviceopen.png' :'../../img/foamBox/deviceopen.png'}" style="width: 30px;height: 30px;"/></td>
--- 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
@ -0,0 +1,59 @@
+com\productionboard\common\CodeGenerator.class
+com\productionboard\entity\MesProduction\MesMaterialStoreStatistics.class
+com\productionboard\mapper\MesHourProdutionStatisticsMapper.class
+com\productionboard\common\CodeGenerator$1.class
+com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.class
+com\productionboard\controller\FoamBoxController.class
+com\productionboard\mapper\TankShellDeviceDataInformationMapper.class
+com\productionboard\service\IAluminumDeviceInfoService.class
+com\productionboard\service\IMesProductionDataService.class
+com\productionboard\entity\TankShellDevice\TankShellEnergyConsumption.class
+com\productionboard\mapper\BasicScadaDeviceinfoMapper.class
+com\productionboard\controller\TankShellDeviceController.class
+com\productionboard\service\ITankShellDeviceInfoService.class
+com\productionboard\config\MybatisPlusConfig.class
+com\productionboard\mapper\FoamBoxLineRunStatusMapper.class
+com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.class
+com\productionboard\service\IFoamBoxDeviceInfoService.class
+com\productionboard\mapper\FoamBoxMachineRunStatusMapper.class
+com\productionboard\controller\AluminumLinerkController.class
+com\productionboard\controller\PreassembleController.class
+com\productionboard\entity\FoamBoxDevice\FoamBoxMachineRunStatus.class
+com\productionboard\entity\TankShellDevice\TankShellLossStatistics.class
+com\productionboard\ProductionBoardApplication.class
+com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.class
+com\productionboard\mapper\AluminumThisMonthEnergyMapper.class
+com\productionboard\mapper\MesMaterialProductionStatisticsMapper.class
+com\productionboard\mapper\AluminumOeeStatisticsMapper.class
+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
+com\productionboard\entity\BasicScadaDeviceinfo.class
+com\productionboard\entity\MesProduction\MesHourProdutionStatistics.class
+com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.class
+com\productionboard\controller\StorageController.class
+com\productionboard\mapper\AluminumYesterdayEnergyMapper.class
+com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.class
+com\productionboard\common\CodeGenerator$2.class
+com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.class
+com\productionboard\entity\FoamBoxDevice\FoamBoxLineRunStatus.class
+com\productionboard\entity\TankShellDevice\TankShellDevicePrameterValue.class
+com\productionboard\mapper\MesTeamStatisticsMapper.class
+com\productionboard\mapper\TankShellOeeStatisticsMapper.class
+com\productionboard\entity\MesProduction\MesMaterialProductionStatistics.class
+com\productionboard\entity\MesProduction\MesTeamStatistics.class
+com\productionboard\mapper\TankShellEnergyConsumptionMapper.class
+com\productionboard\service\BasicScadaDeviceinfoService.class
+com\productionboard\entity\TankShellDevice\TankShellDeviceDataInformation.class
+com\productionboard\mapper\AluminumDeviceDataInformationMapper.class
+com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.class
+com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.class
+com\productionboard\service\impl\FoamBoxDeviceInfoServiceImpl.class
+com\productionboard\controller\TankShellController.class
+com\productionboard\entity\AluminumDevice\AluminumLossStatistics.class
+com\productionboard\controller\AdsorptionTankController.class