1

3 years ago · 5cbf5e2707
parent b7ef93ab23
commit 5cbf5e2707
33 changed files with 345 additions and 10 deletions
--- a/deviceboard/target/classes/com/deviceboard/DeviceBoardApplication.class
+++ b/deviceboard/target/classes/com/deviceboard/DeviceBoardApplication.class
--- a/deviceboard/target/classes/com/deviceboard/controller/TestController.class
+++ b/deviceboard/target/classes/com/deviceboard/controller/TestController.class
--- a/productionboard/src/main/resources/application.yml
+++ b/productionboard/src/main/resources/application.yml
@ -12,4 +12,4 @@ mybatis-plus:
  mapper-locations: classpath*:/mapper/**Mapper.xml

 server:
-  port: 6066
+  port: 6069
--- a/productionboard/src/main/resources/static/css/aluminumLiner/style.css
+++ b/productionboard/src/main/resources/static/css/aluminumLiner/style.css
@ -7,6 +7,16 @@ body {
    background-size: 100% 100%;
 }

+
+.dataInformation{
+    border: 1px solid red;
+    position: absolute;
+    width: 24%;
+    height: 22%;
+    top: 14%;
+    left: 3.3%;
+}
+
 .OEEStatistics {
    border: 0px solid red;
    position: absolute;
--- a/productionboard/src/main/resources/static/js/aluminumLiner/index.js
+++ b/productionboard/src/main/resources/static/js/aluminumLiner/index.js
@ -1,5 +1,10 @@
 $(() => {
-    // onDutyPlan(1234, 1202, 33);
+
+    const statusArray = [0, 0, 0, 0, 0];
+    const syntheticDate = [0, 0, 0, 0, 0];
+    dataInformationFunction(statusArray);
+    synthetic(syntheticDate)
+
    //设备OEE统计
    OEEStatistics(null, document.getElementById("OEEStatistics"));

--- a/productionboard/src/main/resources/static/js/common/synthetic.js
+++ b/productionboard/src/main/resources/static/js/common/synthetic.js
@ -0,0 +1,45 @@
+
+const dataInformationFunction = (statusArray) => {
+    let info = `<table style="position: absolute;top: 8%;width: 100%;height:100%;">
+            <tr style="width: 100%; height: 50%;">
+                <td style="border:0px solid red;text-align:center;width: 50%;"><img src="../../img/foamBox/${statusArray[0] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="20%" height="40%"/>${statusArray[0] == 0 ? `<span style="color:green;margin-left: 10px">运行正常</span>` : `<span style="color:red;margin-left: 10px">运行异常</span>`}</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;color: #E6ECBE;">389kW</td>
+            </tr>
+            <tr style="width: 100%; height: 50%;">
+            
+                <td style="border:0px solid red;text-align:center;width: 50%;color: white;">4563kW·h</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;color: #D18DA2;">2</td>
+            </tr>
+        </table>`;
+
+    $("#dataInformation").append(info);
+}
+const synthetic = (statusArray) => {
+    let info = `<table style="position: absolute;top: 9%;left: 30%;width: 40%;height:7%;">
+    <tr style="width: 100%; height: 50%;">
+        <td style="border:0px solid red;text-align:center;width: 23%;color: #99C4EF;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 27%;color: #7CED92;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 27%;color: #99C4EF;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 19%;color: #7CED92;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 15%;"></td>
+    </tr>
+        </table>
+        <table style="position: absolute;top: 24%;left: 30%;width: 42%;height:10%;">
+    <tr style="width: 100%; height: 50%;">
+        <td style="border:0px solid red;text-align:center;width: 7%;"></td>
+        <td style="border:0px solid red;text-align:center;width: 13%;color: #70C0EC;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 13%;"></td>
+        <td style="border:0px solid red;text-align:center;width: 14%;color: #DB718D;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 12%;"></td>
+        <td style="border:0px solid red;text-align:center;width: 13%;color: #8CEF92;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 13%;"></td>
+        <td style="border:0px solid red;text-align:center;width: 14%;color: #ECE790;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 0%;"></td>
+    </tr>
+        </table>
+        <span style="position: absolute;top: 13%;left: 85%;width: 9%;height:4%;text-align:center;background: linear-gradient(to bottom, #D2E5F7, #8CBAE4);color: transparent;display:inline-block;-webkit-background-clip: text;">123213</span>
+        <span style="position: absolute;top: 28%;left: 85%;width: 9%;height:4%;text-align:center;background: linear-gradient(to bottom, #F1FFFF, #7FE782);color: transparent;display:inline-block;-webkit-background-clip: text;">123213</span>
+        `;
+
+    $("#synthetic").append(info);
+}
--- a/productionboard/src/main/resources/templates/aluminumLiner/index.html
+++ b/productionboard/src/main/resources/templates/aluminumLiner/index.html
@ -5,17 +5,18 @@
    <meta charset="UTF-8">
    <title>铝内胆数据监控平台</title>
    <link rel="stylesheet" href="../../../css/aluminumLiner/style.css">
-    <link rel="stylesheet" href="../../../css/common/ondutyplan.css">
    <script src="../../../js/common/jquery.min.js"></script>
    <script src="../../../js/common/echarts.min.js"></script>
-    <script src="../../../js/common/date-time-common.js"></script>
    <script src="../../../js/common/update-split-blocks.js"></script>
-    <!-- <script src="../../../js/common/ondutyplan.js"></script> -->
    <script src="../../../js/common/echarts.common.js"></script>
    <script src="../../../js/common/scrollTable.js"></script>
 </head>

 <body>
+    <!--数据信息-->
+    <div class="dataInformation" id="dataInformation"></div>
+    <div class="synthetic" id="synthetic"></div>
+
    <!--设备OEE统计-->
    <div class="OEEStatistics" id="OEEStatistics"></div>

@ -34,6 +35,7 @@
    <div class="equipmentFailure" id="equipmentFailure"></div>

 </body>
+<script src="../../../js/common/synthetic.js"></script>
 <script src="../../../js/aluminumLiner/index.js"></script>

 </html>
--- a/productionboard/target/classes/com/productionboard/ProductionBoardApplication.class
+++ b/productionboard/target/classes/com/productionboard/ProductionBoardApplication.class
--- a/productionboard/target/classes/com/productionboard/common/CodeGenerator$1.class
+++ b/productionboard/target/classes/com/productionboard/common/CodeGenerator$1.class
--- a/productionboard/target/classes/com/productionboard/common/CodeGenerator$2.class
+++ b/productionboard/target/classes/com/productionboard/common/CodeGenerator$2.class
--- a/productionboard/target/classes/com/productionboard/common/CodeGenerator.class
+++ b/productionboard/target/classes/com/productionboard/common/CodeGenerator.class
--- a/productionboard/target/classes/com/productionboard/config/MybatisPlusConfig.class
+++ b/productionboard/target/classes/com/productionboard/config/MybatisPlusConfig.class
--- a/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class
+++ b/productionboard/target/classes/com/productionboard/controller/AdsorptionTankController.class
--- a/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class
+++ b/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class
--- a/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class
+++ b/productionboard/target/classes/com/productionboard/controller/AluminumTtankController.class
--- a/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class
+++ b/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class
--- a/productionboard/target/classes/com/productionboard/controller/PreassembleController.class
+++ b/productionboard/target/classes/com/productionboard/controller/PreassembleController.class
--- a/productionboard/target/classes/com/productionboard/controller/StorageController.class
+++ b/productionboard/target/classes/com/productionboard/controller/StorageController.class
--- a/productionboard/target/classes/com/productionboard/controller/TankShellController.class
+++ b/productionboard/target/classes/com/productionboard/controller/TankShellController.class
--- a/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class
+++ b/productionboard/target/classes/com/productionboard/controller/TankShellDeviceController.class
--- a/productionboard/target/classes/com/productionboard/entity/BasicScadaDeviceinfo.class
+++ b/productionboard/target/classes/com/productionboard/entity/BasicScadaDeviceinfo.class
--- a/productionboard/target/classes/com/productionboard/mapper/BasicScadaDeviceinfoMapper.class
+++ b/productionboard/target/classes/com/productionboard/mapper/BasicScadaDeviceinfoMapper.class
--- a/productionboard/target/classes/com/productionboard/service/BasicScadaDeviceinfoService.class
+++ b/productionboard/target/classes/com/productionboard/service/BasicScadaDeviceinfoService.class
--- a/productionboard/target/classes/com/productionboard/service/impl/BasicScadaDeviceinfoServiceImpl.class
+++ b/productionboard/target/classes/com/productionboard/service/impl/BasicScadaDeviceinfoServiceImpl.class
--- a/productionboard/target/classes/static/css/aluminumLiner/style.css
+++ b/productionboard/target/classes/static/css/aluminumLiner/style.css
@ -7,6 +7,16 @@ body {
    background-size: 100% 100%;
 }

+
+.dataInformation{
+    border: 1px solid red;
+    position: absolute;
+    width: 24%;
+    height: 22%;
+    top: 14%;
+    left: 3.3%;
+}
+
 .OEEStatistics {
    border: 0px solid red;
    position: absolute;
--- a/productionboard/target/classes/static/css/tankShell/device.css
+++ b/productionboard/target/classes/static/css/tankShell/device.css
@ -0,0 +1,118 @@
+body {
+    background-color: aquamarine;
+    background: url(../../img/tankShell/tankShellDeviceBackground.jpg);
+    background-position: center center;
+    background-repeat: no-repeat;
+    background-attachment: fixed;
+    background-size: 100% 100%;
+}
+
+.dataInformation {
+    border: 0px solid red;
+    position: absolute;
+    width: 24%;
+    height: 22%;
+    top: 14%;
+    left: 3.3%;
+}
+
+.energyProductionStatistics {
+    border: 0px solid red;
+    position: absolute;
+    width: 42%;
+    height: 6%;
+    top: 9%;
+    left: 29%;
+}
+
+.runParamStatistics {
+    border: 0px solid red;
+    position: absolute;
+    width: 42%;
+    height: 7.5%;
+    top: 25%;
+    left: 29%;
+}
+
+.runParamStatistics div {
+    border: 0px solid red;
+    position: absolute;
+    top: 4%;
+    width: 13%;
+    height: 96%;
+    color: blueviolet;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.lossParam{
+    border: 0px solid yellowgreen;
+    position: absolute;
+    width: 8.8%;
+    height: 4.5%;
+    top: 12.5%;
+    right: 6%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #8FB7D1;
+}
+
+.meterParam{
+    border: 0px solid yellowgreen;
+    position: absolute;
+    width: 8.8%;
+    height: 4.5%;
+    top: 27.4%;
+    right: 6%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color:#A5E3B1;
+}
+
+.theEnergyConsumptionContrast {
+    border: 1px solid red;
+    position: absolute;
+    width: 24.1%;
+    height: 21%;
+    top: 44%;
+    left: 3.3%;
+}
+
+.lossStatistics {
+    border: 1px solid yellowgreen;
+    position: absolute;
+    width: 24%;
+    height: 21%;
+    top: 44%;
+    right: 3.3%;
+}
+
+.deviceInfoTable {
+    border: 1px solid #6ACBFE;
+    position: absolute;
+    width: 33%;
+    height: 21%;
+    bottom: 5%;
+    left: 3.3%;
+}
+
+.oeeStatistics {
+    border: 1px solid cornflowerblue;
+    position: absolute;
+    width: 33%;
+    height: 21%;
+    bottom: 5%;
+    left: 38%;
+}
+
+.faultRank {
+    border: 1px solid bisque;
+    position: absolute;
+    width: 24%;
+    height: 21%;
+    bottom: 5%;
+    right: 3.3%;
+}
--- a/productionboard/target/classes/static/img/tankShell/tankShellDeviceBackground.jpg
+++ b/productionboard/target/classes/static/img/tankShell/tankShellDeviceBackground.jpg
--- a/productionboard/target/classes/static/js/aluminumLiner/index.js
+++ b/productionboard/target/classes/static/js/aluminumLiner/index.js
@ -1,5 +1,10 @@
 $(() => {
-    // onDutyPlan(1234, 1202, 33);
+
+    const statusArray = [0, 0, 0, 0, 0];
+    const syntheticDate = [0, 0, 0, 0, 0];
+    dataInformationFunction(statusArray);
+    synthetic(syntheticDate)
+
    //设备OEE统计
    OEEStatistics(null, document.getElementById("OEEStatistics"));

--- a/productionboard/target/classes/static/js/common/echarts.common.js
+++ b/productionboard/target/classes/static/js/common/echarts.common.js
@ -2188,7 +2188,7 @@ const equipmentFailure = (res, ids) => {
    });
    let option = {
        grid: {
-            top:'1%',
+            top: '1%',
            left: '6%',
            right: '6%',
            bottom: '3%',
--- a/productionboard/target/classes/static/js/common/synthetic.js
+++ b/productionboard/target/classes/static/js/common/synthetic.js
@ -0,0 +1,45 @@
+
+const dataInformationFunction = (statusArray) => {
+    let info = `<table style="position: absolute;top: 8%;width: 100%;height:100%;">
+            <tr style="width: 100%; height: 50%;">
+                <td style="border:0px solid red;text-align:center;width: 50%;"><img src="../../img/foamBox/${statusArray[0] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="20%" height="40%"/>${statusArray[0] == 0 ? `<span style="color:green;margin-left: 10px">运行正常</span>` : `<span style="color:red;margin-left: 10px">运行异常</span>`}</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;color: #E6ECBE;">389kW</td>
+            </tr>
+            <tr style="width: 100%; height: 50%;">
+            
+                <td style="border:0px solid red;text-align:center;width: 50%;color: white;">4563kW·h</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;color: #D18DA2;">2</td>
+            </tr>
+        </table>`;
+
+    $("#dataInformation").append(info);
+}
+const synthetic = (statusArray) => {
+    let info = `<table style="position: absolute;top: 9%;left: 30%;width: 40%;height:7%;">
+    <tr style="width: 100%; height: 50%;">
+        <td style="border:0px solid red;text-align:center;width: 23%;color: #99C4EF;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 27%;color: #7CED92;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 27%;color: #99C4EF;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 19%;color: #7CED92;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 15%;"></td>
+    </tr>
+        </table>
+        <table style="position: absolute;top: 24%;left: 30%;width: 42%;height:10%;">
+    <tr style="width: 100%; height: 50%;">
+        <td style="border:0px solid red;text-align:center;width: 7%;"></td>
+        <td style="border:0px solid red;text-align:center;width: 13%;color: #70C0EC;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 13%;"></td>
+        <td style="border:0px solid red;text-align:center;width: 14%;color: #DB718D;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 12%;"></td>
+        <td style="border:0px solid red;text-align:center;width: 13%;color: #8CEF92;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 13%;"></td>
+        <td style="border:0px solid red;text-align:center;width: 14%;color: #ECE790;">123</td>
+        <td style="border:0px solid red;text-align:center;width: 0%;"></td>
+    </tr>
+        </table>
+        <span style="position: absolute;top: 13%;left: 85%;width: 9%;height:4%;text-align:center;background: linear-gradient(to bottom, #D2E5F7, #8CBAE4);color: transparent;display:inline-block;-webkit-background-clip: text;">123213</span>
+        <span style="position: absolute;top: 28%;left: 85%;width: 9%;height:4%;text-align:center;background: linear-gradient(to bottom, #F1FFFF, #7FE782);color: transparent;display:inline-block;-webkit-background-clip: text;">123213</span>
+        `;
+
+    $("#synthetic").append(info);
+}
--- a/productionboard/target/classes/static/js/tankShell/device.js
+++ b/productionboard/target/classes/static/js/tankShell/device.js
@ -0,0 +1,55 @@
+$(() => {
+    /*数据信息*/
+    const statusArray = [0, 0, 0, 0, 0];
+    dataInformationFunction(statusArray);
+
+    energyProductionStatisticsFunction(statusArray);
+
+    runParamStatisticsFunction(statusArray);
+
+    $("#lossParam").text(123.87);
+
+    $("#meterParam").text(123.65);
+})
+
+/*数据信息*/
+const dataInformationFunction = (statusArray) => {
+    let info = `<table style="position: absolute;top: 8%;width: 100%;height:100%;">
+            <tr style="width: 100%; height: 50%;">
+                <td style="border:0px solid red;text-align:center;width: 50%;"><img src="../../img/foamBox/${statusArray[0] == 0 ? "deviceopen.png" : "deviceclose.png"}" width="20%" height="40%"/>${statusArray[0] == 0 ? `<span style="color:green;margin-left: 10px">运行正常</span>` : `<span style="color:red;margin-left: 10px">运行异常</span>`}</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;color: #E6ECBE;">389kW</td>
+            </tr>
+            <tr style="width: 100%; height: 50%;">
+            
+                <td style="border:0px solid red;text-align:center;width: 50%;color: white;">4563kW·h</td>
+                <td style="border:0px solid red;text-align:center;width: 50%;color: #D18DA2;">2</td>
+            </tr>
+        </table>`;
+
+    $("#dataInformation").append(info);
+}
+
+/*能耗产量统计*/
+const energyProductionStatisticsFunction = (statusArray) => {
+    let info = `<table style="position: absolute;top: 8%;width: 100%;height:100%;">
+            <tr style="width: 100%; height: 100%;">
+                <td style="border:0px solid red;width: 25%;text-align:center;color: #76BBE8;">68</td>
+                <td style="border:0px solid red;width: 25%;text-align:center;color: #8AE9A0;">675</td>
+                <td style="border:0px solid red;width: 25%;text-align:center;color: #76BBE8;">68</td>
+                <td style="border:0px solid red;width: 25%;text-align:center;color: #8AE9A0;">675</td>
+            </tr>
+        </table>`;
+
+    $("#energyProductionStatistics").append(info);
+}
+
+const runParamStatisticsFunction = (statusArray) => {
+    let info = `
+        <div style="left: 9%;color:#76BBE8">68</div>
+        <div style="left: 35%;color:#C0818B">685</div>
+        <div style="left: 61%;color: #8AE9A0">685</div>
+        <div style="left: 87%;color:#D5D2AA">685</div>
+    `;
+
+    $("#runParamStatistics").append(info);
+}
--- a/productionboard/target/classes/templates/aluminumLiner/index.html
+++ b/productionboard/target/classes/templates/aluminumLiner/index.html
@ -5,17 +5,18 @@
    <meta charset="UTF-8">
    <title>铝内胆数据监控平台</title>
    <link rel="stylesheet" href="../../../css/aluminumLiner/style.css">
-    <link rel="stylesheet" href="../../../css/common/ondutyplan.css">
    <script src="../../../js/common/jquery.min.js"></script>
    <script src="../../../js/common/echarts.min.js"></script>
-    <script src="../../../js/common/date-time-common.js"></script>
    <script src="../../../js/common/update-split-blocks.js"></script>
-    <!-- <script src="../../../js/common/ondutyplan.js"></script> -->
    <script src="../../../js/common/echarts.common.js"></script>
    <script src="../../../js/common/scrollTable.js"></script>
 </head>

 <body>
+    <!--数据信息-->
+    <div class="dataInformation" id="dataInformation"></div>
+    <div class="synthetic" id="synthetic"></div>
+
    <!--设备OEE统计-->
    <div class="OEEStatistics" id="OEEStatistics"></div>

@ -34,6 +35,7 @@
    <div class="equipmentFailure" id="equipmentFailure"></div>

 </body>
+<script src="../../../js/common/synthetic.js"></script>
 <script src="../../../js/aluminumLiner/index.js"></script>

 </html>
--- a/productionboard/target/classes/templates/tankShell/device.html
+++ b/productionboard/target/classes/templates/tankShell/device.html
@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>箱壳成型数据监控平台</title>
+    <link rel="stylesheet" href="../../../css/tankShell/device.css">
+    <script src="../../../js/common/jquery.min.js"></script>
+    <script src="../../../js/common/echarts.min.js"></script>
+    <script src="../../../js/common/update-split-blocks.js"></script>
+    <script src="../../../js/common/echarts.common.js"></script>
+</head>
+<body>
+    <!--数据信息-->
+    <div class="dataInformation" id="dataInformation"></div>
+    <!--能耗产量统计-->
+    <div class="energyProductionStatistics" id="energyProductionStatistics"></div>
+    <!--运行参数统计-->
+    <div class="runParamStatistics" id="runParamStatistics"></div>
+
+    <!--loss参数-->
+    <div class="lossParam" id="lossParam"></div>
+
+    <!--节拍参数-->
+    <div class="meterParam" id="meterParam"></div>
+
+    <!--设备能耗产量对比-->
+    <div class="theEnergyConsumptionContrast" id="theEnergyConsumptionContrast"></div>
+    <!--loss统计-->
+    <div class="lossStatistics" id="lossStatistics"></div>
+    <!--设备信息列表-->
+    <div class="deviceInfoTable" id="deviceInfoTable"></div>
+    <!--oee统计-->
+    <div class="oeeStatistics" id="oeeStatistics"></div>
+    <!--故障率统计-->
+    <div class="faultRank" id="faultRank"></div>
+</body>
+<script src="../../../js/tankShell/device.js"></script>
+</html>