diff --git a/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar b/deviceboard/target/deviceboard-0.0.1-SNAPSHOT.jar
index 3f2e5c4..aafddd0 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 7c50e2b..b0e2ef8 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/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index e69de29..47c90f8 100644
--- a/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,2 @@
+com\deviceboard\DeviceBoardApplication.class
+com\deviceboard\controller\TestController.class
diff --git a/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index e482c70..9778fcf 100644
--- a/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/deviceboard/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,2 +1,2 @@
-E:\桌面\scada-visual-board\deviceboard\src\main\java\com\deviceboard\DeviceBoardApplication.java
-E:\桌面\scada-visual-board\deviceboard\src\main\java\com\deviceboard\controller\TestController.java
+C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\deviceboard\src\main\java\com\deviceboard\DeviceBoardApplication.java
+C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\deviceboard\src\main\java\com\deviceboard\controller\TestController.java
diff --git a/productionboard/src/main/resources/static/js/common/ondutyplan.js b/productionboard/src/main/resources/static/js/common/ondutyplan.js
index 6631a43..4bab15c 100644
--- 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>-</span>
+                    <span style='margin-left: 5%;margin-right: 10%;'>-</span>
                     <span>-</span>
                 </div>
                 
diff --git a/productionboard/src/main/resources/templates/foamBox/index.html b/productionboard/src/main/resources/templates/foamBox/index.html
index cdb8983..505ddb4 100644
--- a/productionboard/src/main/resources/templates/foamBox/index.html
+++ b/productionboard/src/main/resources/templates/foamBox/index.html
@@ -33,12 +33,12 @@
     <div class="foamingLineRunStatus">
         <table style="width: 100%;height:100%;">
             <tr style="width: 100%;">
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:right;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:right;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
             </tr>
         </table>
     </div>
diff --git a/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumDeviceDataInformation.class b/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumDeviceDataInformation.class
index e361920..a9a06ba 100644
Binary files a/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumDeviceDataInformation.class and b/productionboard/target/classes/com/productionboard/entity/AluminumDevice/AluminumDeviceDataInformation.class differ
diff --git a/productionboard/target/classes/static/js/common/ondutyplan.js b/productionboard/target/classes/static/js/common/ondutyplan.js
index 6631a43..4bab15c 100644
--- 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>-</span>
+                    <span style='margin-left: 5%;margin-right: 10%;'>-</span>
                     <span>-</span>
                 </div>
                 
diff --git a/productionboard/target/classes/templates/foamBox/index.html b/productionboard/target/classes/templates/foamBox/index.html
index cdb8983..505ddb4 100644
--- a/productionboard/target/classes/templates/foamBox/index.html
+++ b/productionboard/target/classes/templates/foamBox/index.html
@@ -33,12 +33,12 @@
     <div class="foamingLineRunStatus">
         <table style="width: 100%;height:100%;">
             <tr style="width: 100%;">
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
-                <td style="border:0px solid red;text-align:right;"><img src="../../img/foamBox/deviceopen.png" width="40%" height="50%"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:center;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:right;padding-right: 12px;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
+                <td style="border:0px solid red;text-align:right;"><img src="../../img/foamBox/deviceopen.png" style="width: 30px;height: 30px;"/></td>
             </tr>
         </table>
     </div>
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 71a1419..a9e68ce 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
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java
 C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java
 C:\Users\ADMIN\Desktop\新建文件夹 (4)\scada-visual-board\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java
@@ -48,54 +47,3 @@ C:\Users\ADMIN\Desktop\
 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\TankShellDevicePrameterValue.java
-=======
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellThisMonthEnergy.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellThisMonthEnergyMapper.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\BasicScadaDeviceinfo.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\FoamBoxController.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\common\CodeGenerator.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumYesterdayEnergyMapper.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellDevicePrameterValueMapper.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\ProductionBoardApplication.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AdsorptionTankController.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\config\MybatisPlusConfig.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellDeviceDataInformationMapper.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellOeeStatisticsMapper.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDeviceDataInformation.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumOeeStatisticsMapper.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumThisMonthEnergy.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\BasicScadaDeviceinfoServiceImpl.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\TankShellDeviceInfoServiceImpl.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\AluminumDeviceInfoServiceImpl.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumYesterdayEnergy.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\StorageController.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesHourProdutionStatisticsMapper.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\PreassembleController.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesTeamStatistics.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellDevicePrameterValue.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesMaterialStoreStatisticsMapper.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumOeeStatistics.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumLinerkController.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\BasicScadaDeviceinfoMapper.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesMaterialProductionStatistics.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesTeamStatisticsMapper.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\service\ITankShellDeviceInfoService.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\TankShellEnergyConsumptionMapper.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumDeviceDataInformationMapper.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesMaterialStoreStatistics.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellDeviceController.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\MesProduction\MesHourProdutionStatistics.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IAluminumDeviceInfoService.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\service\impl\MesProductionDataServiceImpl.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumThisMonthEnergyMapper.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\service\IMesProductionDataService.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\AluminumTtankController.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumLossStatistics.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellOeeStatistics.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\TankShellDevice\TankShellEnergyConsumption.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\controller\TankShellController.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\AluminumLossStatisticsMapper.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\mapper\MesMaterialProductionStatisticsMapper.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\entity\AluminumDevice\AluminumDeviceDataInformation.java
-E:\妗岄潰\scada-visual-board\productionboard\src\main\java\com\productionboard\service\BasicScadaDeviceinfoService.java
->>>>>>> 2bb997d92805e65fc0012bfff017d7bab3d3b3fa
diff --git a/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar b/productionboard/target/productionboard-0.0.1-SNAPSHOT.jar
index 28d92b3..c52e079 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 5e9c62b..4d5d945 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