From f115f49c29081d907ee010e63398156a4e8b7854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Mon, 6 Jun 2022 16:10:28 +0800
Subject: [PATCH 1/6] 1

---
 .../resources/static/css/tankShell/device.css | 54 ++++++++-----------
 .../resources/static/js/tankShell/device.js   | 49 +++++++++++++++++
 .../resources/templates/tankShell/device.html | 25 +++++----
 .../classes/static/css/tankShell/device.css   | 54 ++++++++-----------
 .../classes/static/js/tankShell/device.js     | 49 +++++++++++++++++
 .../classes/templates/tankShell/device.html   | 25 +++++----
 6 files changed, 174 insertions(+), 82 deletions(-)

diff --git a/productionboard/src/main/resources/static/css/tankShell/device.css b/productionboard/src/main/resources/static/css/tankShell/device.css
index 0c17a6e..9b0dfa3 100644
--- a/productionboard/src/main/resources/static/css/tankShell/device.css
+++ b/productionboard/src/main/resources/static/css/tankShell/device.css
@@ -72,47 +72,39 @@ body {
     color:#A5E3B1;
 }
 
-.theEnergyConsumptionContrast {
-    border: 1px solid red;
+.OEEStatistics {
+    border: 0px solid red;
     position: absolute;
-    width: 24.1%;
-    height: 21%;
-    top: 44%;
-    left: 3.3%;
+    width: 35%;
+    height: 26%;
+    top: 71.5%;
+    left: 36%;
 }
 
-.lossStatistics {
-    border: 1px solid yellowgreen;
+.equipmentFailure {
+    border: 0px solid red;
     position: absolute;
-    width: 24%;
-    height: 21%;
-    top: 44%;
-    right: 3.3%;
+    width: 28%;
+    height: 22%;
+    top: 75%;
+    left: 70%;
 }
 
-.deviceInfoTable {
-    border: 1px solid #6ACBFE;
+.loss {
+    border: 0px solid red;
     position: absolute;
-    width: 33%;
-    height: 21%;
-    bottom: 5%;
-    left: 3.3%;
+    width: 28%;
+    height: 25%;
+    top: 41%;
+    left: 71%;
 }
 
-.oeeStatistics {
-    border: 1px solid cornflowerblue;
+.productionPlan {
     position: absolute;
+    border: 0px solid red;
     width: 33%;
     height: 21%;
-    bottom: 5%;
-    left: 38%;
-}
-
-.faultRank {
-    border: 1px solid bisque;
-    position: absolute;
-    width: 24%;
-    height: 21%;
-    bottom: 5%;
-    right: 3.3%;
+    top: 73.5%;
+    left: 3.5%;
+    font-size: 9%;
 }
\ No newline at end of file
diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js
index 6fc6661..6791c6c 100644
--- a/productionboard/src/main/resources/static/js/tankShell/device.js
+++ b/productionboard/src/main/resources/static/js/tankShell/device.js
@@ -1,4 +1,53 @@
 $(() => {
+    
+    //设备OEE统计
+    OEEStatistics(null, document.getElementById("OEEStatistics"));
+
+    //设备故障排名
+    $.getJSON('/tankShell/getStatisticalOutputByModel', function (result) {
+        equipmentFailure(result, document.getElementById("equipmentFailure"));
+    });
+
+    //loss
+    $.getJSON('/tankShell/getInventoryStatistics', function (result) {
+        loss(result, document.getElementById("loss"));
+    });
+    
+    //生产计划
+    $.ajax({
+        url: '/storage/getProductionPlan',
+        type: 'GET',
+        dataType: 'JSON',
+        success: function (res) {
+            let Res = res
+            Res.data.forEach(val => {
+                val[0] = 'sc-228NE'
+                val[1] = '431'
+                val[2] = '0'
+                val[3] = '431'
+                val[4] = '0%'
+            });
+            Res.header = ['型号', '计划数', '完成数', '差异数', '执行进度']
+            dynamicTable({
+                el: '#productionPlan',
+                rowNum: 5,
+                timeout: 0,
+                header: Res.header,
+                data: Res.data,
+                index: false,
+                fontColor: '#B4B7BF ',
+                indexBGC: '#86F3FF',
+                headerBGC: 'rgba(8,36,75,0.2)',
+                oddRowBGC: 'rgba(8,36,75,0.2)',
+                evenRowBGC: 'rgba(6,25,57,0.2)',
+                colWidth: ['100%', '100%', '100%', '100%', '100%']
+            });
+        },
+        error: function (e) {
+            console.log(e)
+        }
+    });
+    
     /*数据信息*/
     const statusArray = [0, 0, 0, 0, 0];
     dataInformationFunction(statusArray);
diff --git a/productionboard/src/main/resources/templates/tankShell/device.html b/productionboard/src/main/resources/templates/tankShell/device.html
index 8c15b52..5713887 100644
--- a/productionboard/src/main/resources/templates/tankShell/device.html
+++ b/productionboard/src/main/resources/templates/tankShell/device.html
@@ -8,6 +8,7 @@
     <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>
+    <script src="../../../js/common/scrollTable.js"></script>
 </head>
 <body>
     <!--数据信息-->
@@ -23,16 +24,20 @@
     <!--节拍参数-->
     <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>
+
+    
+    <!--设备OEE统计-->
+    <div class="OEEStatistics" id="OEEStatistics"></div>
+    
+    <!--设备故障排名-->
+    <div class="equipmentFailure" id="equipmentFailure"></div>
+    
+    <!--loss-->
+    <div class="loss" id="loss"></div>
+    
+    <!--生产计划-->
+    <div class="productionPlan" id="productionPlan"></div>
+
 </body>
 <script src="../../../js/tankShell/device.js"></script>
 </html>
\ No newline at end of file
diff --git a/productionboard/target/classes/static/css/tankShell/device.css b/productionboard/target/classes/static/css/tankShell/device.css
index 0c17a6e..9b0dfa3 100644
--- a/productionboard/target/classes/static/css/tankShell/device.css
+++ b/productionboard/target/classes/static/css/tankShell/device.css
@@ -72,47 +72,39 @@ body {
     color:#A5E3B1;
 }
 
-.theEnergyConsumptionContrast {
-    border: 1px solid red;
+.OEEStatistics {
+    border: 0px solid red;
     position: absolute;
-    width: 24.1%;
-    height: 21%;
-    top: 44%;
-    left: 3.3%;
+    width: 35%;
+    height: 26%;
+    top: 71.5%;
+    left: 36%;
 }
 
-.lossStatistics {
-    border: 1px solid yellowgreen;
+.equipmentFailure {
+    border: 0px solid red;
     position: absolute;
-    width: 24%;
-    height: 21%;
-    top: 44%;
-    right: 3.3%;
+    width: 28%;
+    height: 22%;
+    top: 75%;
+    left: 70%;
 }
 
-.deviceInfoTable {
-    border: 1px solid #6ACBFE;
+.loss {
+    border: 0px solid red;
     position: absolute;
-    width: 33%;
-    height: 21%;
-    bottom: 5%;
-    left: 3.3%;
+    width: 28%;
+    height: 25%;
+    top: 41%;
+    left: 71%;
 }
 
-.oeeStatistics {
-    border: 1px solid cornflowerblue;
+.productionPlan {
     position: absolute;
+    border: 0px solid red;
     width: 33%;
     height: 21%;
-    bottom: 5%;
-    left: 38%;
-}
-
-.faultRank {
-    border: 1px solid bisque;
-    position: absolute;
-    width: 24%;
-    height: 21%;
-    bottom: 5%;
-    right: 3.3%;
+    top: 73.5%;
+    left: 3.5%;
+    font-size: 9%;
 }
\ No newline at end of file
diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js
index 6fc6661..6791c6c 100644
--- a/productionboard/target/classes/static/js/tankShell/device.js
+++ b/productionboard/target/classes/static/js/tankShell/device.js
@@ -1,4 +1,53 @@
 $(() => {
+    
+    //设备OEE统计
+    OEEStatistics(null, document.getElementById("OEEStatistics"));
+
+    //设备故障排名
+    $.getJSON('/tankShell/getStatisticalOutputByModel', function (result) {
+        equipmentFailure(result, document.getElementById("equipmentFailure"));
+    });
+
+    //loss
+    $.getJSON('/tankShell/getInventoryStatistics', function (result) {
+        loss(result, document.getElementById("loss"));
+    });
+    
+    //生产计划
+    $.ajax({
+        url: '/storage/getProductionPlan',
+        type: 'GET',
+        dataType: 'JSON',
+        success: function (res) {
+            let Res = res
+            Res.data.forEach(val => {
+                val[0] = 'sc-228NE'
+                val[1] = '431'
+                val[2] = '0'
+                val[3] = '431'
+                val[4] = '0%'
+            });
+            Res.header = ['型号', '计划数', '完成数', '差异数', '执行进度']
+            dynamicTable({
+                el: '#productionPlan',
+                rowNum: 5,
+                timeout: 0,
+                header: Res.header,
+                data: Res.data,
+                index: false,
+                fontColor: '#B4B7BF ',
+                indexBGC: '#86F3FF',
+                headerBGC: 'rgba(8,36,75,0.2)',
+                oddRowBGC: 'rgba(8,36,75,0.2)',
+                evenRowBGC: 'rgba(6,25,57,0.2)',
+                colWidth: ['100%', '100%', '100%', '100%', '100%']
+            });
+        },
+        error: function (e) {
+            console.log(e)
+        }
+    });
+    
     /*数据信息*/
     const statusArray = [0, 0, 0, 0, 0];
     dataInformationFunction(statusArray);
diff --git a/productionboard/target/classes/templates/tankShell/device.html b/productionboard/target/classes/templates/tankShell/device.html
index 8c15b52..5713887 100644
--- a/productionboard/target/classes/templates/tankShell/device.html
+++ b/productionboard/target/classes/templates/tankShell/device.html
@@ -8,6 +8,7 @@
     <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>
+    <script src="../../../js/common/scrollTable.js"></script>
 </head>
 <body>
     <!--数据信息-->
@@ -23,16 +24,20 @@
     <!--节拍参数-->
     <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>
+
+    
+    <!--设备OEE统计-->
+    <div class="OEEStatistics" id="OEEStatistics"></div>
+    
+    <!--设备故障排名-->
+    <div class="equipmentFailure" id="equipmentFailure"></div>
+    
+    <!--loss-->
+    <div class="loss" id="loss"></div>
+    
+    <!--生产计划-->
+    <div class="productionPlan" id="productionPlan"></div>
+
 </body>
 <script src="../../../js/tankShell/device.js"></script>
 </html>
\ No newline at end of file

From 12ec81b9799d22c4fcad39d11771823ecc0ddc0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Mon, 6 Jun 2022 17:02:40 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=AE=B1=E5=A3=B3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=88=90=E5=9E=8B=E7=BA=BF=20-=20=E7=BB=BC=E5=90=88=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/css/tankShell/device.css |  11 ++
 .../static/js/common/echarts.common.js        | 155 ++++++++++++++++++
 .../resources/static/js/tankShell/device.js   |   7 +-
 .../resources/templates/tankShell/device.html |   3 +
 .../classes/static/css/tankShell/device.css   |  11 ++
 .../static/js/common/echarts.common.js        | 155 ++++++++++++++++++
 .../classes/static/js/tankShell/device.js     |   7 +-
 .../classes/templates/tankShell/device.html   |   3 +
 8 files changed, 350 insertions(+), 2 deletions(-)

diff --git a/productionboard/src/main/resources/static/css/tankShell/device.css b/productionboard/src/main/resources/static/css/tankShell/device.css
index 9b0dfa3..b5c097d 100644
--- a/productionboard/src/main/resources/static/css/tankShell/device.css
+++ b/productionboard/src/main/resources/static/css/tankShell/device.css
@@ -107,4 +107,15 @@ body {
     top: 73.5%;
     left: 3.5%;
     font-size: 9%;
+}
+
+
+.energyConsumption {
+    position: absolute;
+    border: 0px solid red;
+    width: 26%;
+    height: 20%;
+    top: 46%;
+    left: 2%;
+    font-size: 9%;
 }
\ No newline at end of file
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 e4c39cb..7755e46 100644
--- a/productionboard/src/main/resources/static/js/common/echarts.common.js
+++ b/productionboard/src/main/resources/static/js/common/echarts.common.js
@@ -2306,6 +2306,161 @@ const equipmentFailure = (res, ids) => {
         ]
     };
 
+    mycharts.setOption(option);
+    $(window).resize(mycharts.resize);
+}
+
+// 设备产量能耗对比
+
+const energyConsumption = (res, ids) => {
+    let mycharts = echarts.init(ids);
+
+
+    let stationData = [];
+    let values = [];
+
+    res.datas.forEach(function (it, index) {
+        stationData.push(it.station);
+        values.push(it.value);
+    });
+    let option = {
+        grid: {
+            top: '25%',
+            left: '6%',
+            right: '6%',
+            bottom: '3%',
+            containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        xAxis: [
+          {
+            interval: 0,
+            type: 'category',
+            data: ['6-13', '6-14', '6-15', '6-16', '6-17'],
+            axisPointer: {
+              type: 'shadow'
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            name: '产量(t)',
+            min: 0,
+            max: 40,
+            interval: 10,
+            axisLabel: {
+              formatter: '{value} ml'
+            },
+            splitLine: {
+                show: true,
+                lineStyle: {
+                    color: "rgb(217,217,217,0.5)",
+                    type: "dashed" //虚线
+                    // width: 2
+                }
+            },
+            axisLine: {
+                show: true,
+            },
+          },
+          {
+            type: 'value',
+            name: '能耗(kw·h)',
+            min: 0,
+            max: 20,
+            interval: 5,
+            axisLabel: {
+              formatter: '{value} °C'
+            },
+            splitLine: {
+                show: true,
+                lineStyle: {
+                    color: "rgb(217,217,217,0.5)",
+                    type: "dashed" //虚线
+                    // width: 2
+                }
+            },
+            axisLine: {
+                show: true,
+            },
+          }
+        ],
+        series: [
+          {
+            name: 'Evaporation',
+            type: 'bar',
+            itemStyle: {
+                normal: {
+                    color: function (params) {
+                        return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                            {
+                                offset: 1,
+                                color:  "rgba(10,50,220)",
+                            },
+                            {
+                                offset: 0,
+                                color: "rgba(40,140,210)",
+                            },
+                        ]);
+                    },
+                },
+            },
+            tooltip: {
+              valueFormatter: function (value) {
+                return value + ' ml';
+              }
+            },
+            barWidth: 20,
+            data: [
+              2.0, 4.9, 7.0, 23.2, 25.6
+            ]
+          },
+          {
+            name: 'Temperature',
+            type: 'line',
+            yAxisIndex: 1,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value + ' °C';
+              }
+            },
+            data: [2.0, 2.2, 3.3, 4.5, 6.3]
+          },
+          {
+              name: "柱顶部",
+              type: "pictorialBar",
+              symbolSize: [20, 6],
+              symbolOffset: [0, -3],
+              z: 12,
+              itemStyle: {
+                  normal: {
+                      color: function (params) {
+                          return 'rgb(217,217,217)';
+                      },
+                  },
+              },
+              label: {
+                  show: true,
+                  position: "top",
+                  textStyle: {
+                      color: "#02C3F1",
+                  },
+              },
+              symbolPosition: "end",
+              data: [2.0, 4.9, 7.0, 23.2, 25.6],
+          },
+        ]
+      };
+
     mycharts.setOption(option);
     $(window).resize(mycharts.resize);
 }
\ No newline at end of file
diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js
index 6791c6c..7e5b917 100644
--- a/productionboard/src/main/resources/static/js/tankShell/device.js
+++ b/productionboard/src/main/resources/static/js/tankShell/device.js
@@ -12,6 +12,11 @@ $(() => {
     $.getJSON('/tankShell/getInventoryStatistics', function (result) {
         loss(result, document.getElementById("loss"));
     });
+
+    //设备产量能耗对比
+    $.getJSON('/tankShell/getInventoryStatistics', function (result) {
+        energyConsumption(result, document.getElementById("energyConsumption"));
+    });
     
     //生产计划
     $.ajax({
@@ -47,7 +52,7 @@ $(() => {
             console.log(e)
         }
     });
-    
+
     /*数据信息*/
     const statusArray = [0, 0, 0, 0, 0];
     dataInformationFunction(statusArray);
diff --git a/productionboard/src/main/resources/templates/tankShell/device.html b/productionboard/src/main/resources/templates/tankShell/device.html
index 5713887..543c51a 100644
--- a/productionboard/src/main/resources/templates/tankShell/device.html
+++ b/productionboard/src/main/resources/templates/tankShell/device.html
@@ -37,6 +37,9 @@
     
     <!--生产计划-->
     <div class="productionPlan" id="productionPlan"></div>
+    
+    <!--设备产量能耗对比-->
+    <div class="energyConsumption" id="energyConsumption"></div>
 
 </body>
 <script src="../../../js/tankShell/device.js"></script>
diff --git a/productionboard/target/classes/static/css/tankShell/device.css b/productionboard/target/classes/static/css/tankShell/device.css
index 9b0dfa3..b5c097d 100644
--- a/productionboard/target/classes/static/css/tankShell/device.css
+++ b/productionboard/target/classes/static/css/tankShell/device.css
@@ -107,4 +107,15 @@ body {
     top: 73.5%;
     left: 3.5%;
     font-size: 9%;
+}
+
+
+.energyConsumption {
+    position: absolute;
+    border: 0px solid red;
+    width: 26%;
+    height: 20%;
+    top: 46%;
+    left: 2%;
+    font-size: 9%;
 }
\ No newline at end of file
diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js
index e4c39cb..7755e46 100644
--- a/productionboard/target/classes/static/js/common/echarts.common.js
+++ b/productionboard/target/classes/static/js/common/echarts.common.js
@@ -2306,6 +2306,161 @@ const equipmentFailure = (res, ids) => {
         ]
     };
 
+    mycharts.setOption(option);
+    $(window).resize(mycharts.resize);
+}
+
+// 设备产量能耗对比
+
+const energyConsumption = (res, ids) => {
+    let mycharts = echarts.init(ids);
+
+
+    let stationData = [];
+    let values = [];
+
+    res.datas.forEach(function (it, index) {
+        stationData.push(it.station);
+        values.push(it.value);
+    });
+    let option = {
+        grid: {
+            top: '25%',
+            left: '6%',
+            right: '6%',
+            bottom: '3%',
+            containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        xAxis: [
+          {
+            interval: 0,
+            type: 'category',
+            data: ['6-13', '6-14', '6-15', '6-16', '6-17'],
+            axisPointer: {
+              type: 'shadow'
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            name: '产量(t)',
+            min: 0,
+            max: 40,
+            interval: 10,
+            axisLabel: {
+              formatter: '{value} ml'
+            },
+            splitLine: {
+                show: true,
+                lineStyle: {
+                    color: "rgb(217,217,217,0.5)",
+                    type: "dashed" //虚线
+                    // width: 2
+                }
+            },
+            axisLine: {
+                show: true,
+            },
+          },
+          {
+            type: 'value',
+            name: '能耗(kw·h)',
+            min: 0,
+            max: 20,
+            interval: 5,
+            axisLabel: {
+              formatter: '{value} °C'
+            },
+            splitLine: {
+                show: true,
+                lineStyle: {
+                    color: "rgb(217,217,217,0.5)",
+                    type: "dashed" //虚线
+                    // width: 2
+                }
+            },
+            axisLine: {
+                show: true,
+            },
+          }
+        ],
+        series: [
+          {
+            name: 'Evaporation',
+            type: 'bar',
+            itemStyle: {
+                normal: {
+                    color: function (params) {
+                        return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                            {
+                                offset: 1,
+                                color:  "rgba(10,50,220)",
+                            },
+                            {
+                                offset: 0,
+                                color: "rgba(40,140,210)",
+                            },
+                        ]);
+                    },
+                },
+            },
+            tooltip: {
+              valueFormatter: function (value) {
+                return value + ' ml';
+              }
+            },
+            barWidth: 20,
+            data: [
+              2.0, 4.9, 7.0, 23.2, 25.6
+            ]
+          },
+          {
+            name: 'Temperature',
+            type: 'line',
+            yAxisIndex: 1,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value + ' °C';
+              }
+            },
+            data: [2.0, 2.2, 3.3, 4.5, 6.3]
+          },
+          {
+              name: "柱顶部",
+              type: "pictorialBar",
+              symbolSize: [20, 6],
+              symbolOffset: [0, -3],
+              z: 12,
+              itemStyle: {
+                  normal: {
+                      color: function (params) {
+                          return 'rgb(217,217,217)';
+                      },
+                  },
+              },
+              label: {
+                  show: true,
+                  position: "top",
+                  textStyle: {
+                      color: "#02C3F1",
+                  },
+              },
+              symbolPosition: "end",
+              data: [2.0, 4.9, 7.0, 23.2, 25.6],
+          },
+        ]
+      };
+
     mycharts.setOption(option);
     $(window).resize(mycharts.resize);
 }
\ No newline at end of file
diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js
index 6791c6c..7e5b917 100644
--- a/productionboard/target/classes/static/js/tankShell/device.js
+++ b/productionboard/target/classes/static/js/tankShell/device.js
@@ -12,6 +12,11 @@ $(() => {
     $.getJSON('/tankShell/getInventoryStatistics', function (result) {
         loss(result, document.getElementById("loss"));
     });
+
+    //设备产量能耗对比
+    $.getJSON('/tankShell/getInventoryStatistics', function (result) {
+        energyConsumption(result, document.getElementById("energyConsumption"));
+    });
     
     //生产计划
     $.ajax({
@@ -47,7 +52,7 @@ $(() => {
             console.log(e)
         }
     });
-    
+
     /*数据信息*/
     const statusArray = [0, 0, 0, 0, 0];
     dataInformationFunction(statusArray);
diff --git a/productionboard/target/classes/templates/tankShell/device.html b/productionboard/target/classes/templates/tankShell/device.html
index 5713887..543c51a 100644
--- a/productionboard/target/classes/templates/tankShell/device.html
+++ b/productionboard/target/classes/templates/tankShell/device.html
@@ -37,6 +37,9 @@
     
     <!--生产计划-->
     <div class="productionPlan" id="productionPlan"></div>
+    
+    <!--设备产量能耗对比-->
+    <div class="energyConsumption" id="energyConsumption"></div>
 
 </body>
 <script src="../../../js/tankShell/device.js"></script>

From a25194f3db59592e96f287d719a2bcf1dc361ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Mon, 6 Jun 2022 17:04:54 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/js/common/echarts.common.js       | 2 +-
 .../target/classes/static/js/common/echarts.common.js           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 7755e46..7efd031 100644
--- a/productionboard/src/main/resources/static/js/common/echarts.common.js
+++ b/productionboard/src/main/resources/static/js/common/echarts.common.js
@@ -2433,7 +2433,7 @@ const energyConsumption = (res, ids) => {
                 return value + ' °C';
               }
             },
-            data: [2.0, 2.2, 3.3, 4.5, 6.3]
+            data: [2.0, 12.2, 3.3, 14.5, 6.3]
           },
           {
               name: "柱顶部",
diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js
index 7755e46..7efd031 100644
--- a/productionboard/target/classes/static/js/common/echarts.common.js
+++ b/productionboard/target/classes/static/js/common/echarts.common.js
@@ -2433,7 +2433,7 @@ const energyConsumption = (res, ids) => {
                 return value + ' °C';
               }
             },
-            data: [2.0, 2.2, 3.3, 4.5, 6.3]
+            data: [2.0, 12.2, 3.3, 14.5, 6.3]
           },
           {
               name: "柱顶部",

From fe17732876cb5588b5035adaff8ac3fc30f4eb8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Mon, 6 Jun 2022 17:12:01 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/css/aluminumLiner/style.css   | 4 ++++
 .../src/main/resources/static/css/tankShell/device.css      | 6 ++++++
 .../src/main/resources/templates/aluminumLiner/index.html   | 1 +
 .../src/main/resources/templates/tankShell/device.html      | 1 +
 .../target/classes/static/css/aluminumLiner/style.css       | 4 ++++
 .../target/classes/static/css/tankShell/device.css          | 6 ++++++
 .../target/classes/templates/aluminumLiner/index.html       | 1 +
 .../target/classes/templates/tankShell/device.html          | 1 +
 8 files changed, 24 insertions(+)

diff --git a/productionboard/src/main/resources/static/css/aluminumLiner/style.css b/productionboard/src/main/resources/static/css/aluminumLiner/style.css
index b7637dc..107eb6c 100644
--- a/productionboard/src/main/resources/static/css/aluminumLiner/style.css
+++ b/productionboard/src/main/resources/static/css/aluminumLiner/style.css
@@ -15,6 +15,10 @@ body {
     height: 22%;
     top: 14%;
     left: 3.3%;
+    font-size: 16px !important;
+}
+.synthetic{
+    font-size: 16px !important;
 }
 
 .OEEStatistics {
diff --git a/productionboard/src/main/resources/static/css/tankShell/device.css b/productionboard/src/main/resources/static/css/tankShell/device.css
index b5c097d..d77bd08 100644
--- a/productionboard/src/main/resources/static/css/tankShell/device.css
+++ b/productionboard/src/main/resources/static/css/tankShell/device.css
@@ -14,6 +14,7 @@ body {
     height: 22%;
     top: 14%;
     left: 3.3%;
+    font-size: 16px !important;
 }
 
 .energyProductionStatistics {
@@ -23,6 +24,7 @@ body {
     height: 6%;
     top: 9%;
     left: 29%;
+    font-size: 16px !important;
 }
 
 .runParamStatistics {
@@ -32,6 +34,7 @@ body {
     height: 7.5%;
     top: 25%;
     left: 29%;
+    font-size: 16px !important;
 }
 
 .runParamStatistics div {
@@ -44,6 +47,7 @@ body {
     display: flex;
     justify-content: center;
     align-items: center;
+    font-size: 16px !important;
 }
 
 .lossParam{
@@ -57,6 +61,7 @@ body {
     justify-content: center;
     align-items: center;
     color: #8FB7D1;
+    font-size: 16px !important;
 }
 
 .meterParam{
@@ -70,6 +75,7 @@ body {
     justify-content: center;
     align-items: center;
     color:#A5E3B1;
+    font-size: 16px !important;
 }
 
 .OEEStatistics {
diff --git a/productionboard/src/main/resources/templates/aluminumLiner/index.html b/productionboard/src/main/resources/templates/aluminumLiner/index.html
index 01cbd92..ed5035b 100644
--- a/productionboard/src/main/resources/templates/aluminumLiner/index.html
+++ b/productionboard/src/main/resources/templates/aluminumLiner/index.html
@@ -10,6 +10,7 @@
     <script src="../../../js/common/update-split-blocks.js"></script>
     <script src="../../../js/common/echarts.common.js"></script>
     <script src="../../../js/common/scrollTable.js"></script>
+    <script src="../../../js/common/date-time-common.js"></script>
 </head>
 
 <body>
diff --git a/productionboard/src/main/resources/templates/tankShell/device.html b/productionboard/src/main/resources/templates/tankShell/device.html
index 543c51a..6fc66e1 100644
--- a/productionboard/src/main/resources/templates/tankShell/device.html
+++ b/productionboard/src/main/resources/templates/tankShell/device.html
@@ -9,6 +9,7 @@
     <script src="../../../js/common/update-split-blocks.js"></script>
     <script src="../../../js/common/echarts.common.js"></script>
     <script src="../../../js/common/scrollTable.js"></script>
+    <script src="../../../js/common/date-time-common.js"></script>
 </head>
 <body>
     <!--数据信息-->
diff --git a/productionboard/target/classes/static/css/aluminumLiner/style.css b/productionboard/target/classes/static/css/aluminumLiner/style.css
index b7637dc..107eb6c 100644
--- a/productionboard/target/classes/static/css/aluminumLiner/style.css
+++ b/productionboard/target/classes/static/css/aluminumLiner/style.css
@@ -15,6 +15,10 @@ body {
     height: 22%;
     top: 14%;
     left: 3.3%;
+    font-size: 16px !important;
+}
+.synthetic{
+    font-size: 16px !important;
 }
 
 .OEEStatistics {
diff --git a/productionboard/target/classes/static/css/tankShell/device.css b/productionboard/target/classes/static/css/tankShell/device.css
index b5c097d..d77bd08 100644
--- a/productionboard/target/classes/static/css/tankShell/device.css
+++ b/productionboard/target/classes/static/css/tankShell/device.css
@@ -14,6 +14,7 @@ body {
     height: 22%;
     top: 14%;
     left: 3.3%;
+    font-size: 16px !important;
 }
 
 .energyProductionStatistics {
@@ -23,6 +24,7 @@ body {
     height: 6%;
     top: 9%;
     left: 29%;
+    font-size: 16px !important;
 }
 
 .runParamStatistics {
@@ -32,6 +34,7 @@ body {
     height: 7.5%;
     top: 25%;
     left: 29%;
+    font-size: 16px !important;
 }
 
 .runParamStatistics div {
@@ -44,6 +47,7 @@ body {
     display: flex;
     justify-content: center;
     align-items: center;
+    font-size: 16px !important;
 }
 
 .lossParam{
@@ -57,6 +61,7 @@ body {
     justify-content: center;
     align-items: center;
     color: #8FB7D1;
+    font-size: 16px !important;
 }
 
 .meterParam{
@@ -70,6 +75,7 @@ body {
     justify-content: center;
     align-items: center;
     color:#A5E3B1;
+    font-size: 16px !important;
 }
 
 .OEEStatistics {
diff --git a/productionboard/target/classes/templates/aluminumLiner/index.html b/productionboard/target/classes/templates/aluminumLiner/index.html
index 01cbd92..ed5035b 100644
--- a/productionboard/target/classes/templates/aluminumLiner/index.html
+++ b/productionboard/target/classes/templates/aluminumLiner/index.html
@@ -10,6 +10,7 @@
     <script src="../../../js/common/update-split-blocks.js"></script>
     <script src="../../../js/common/echarts.common.js"></script>
     <script src="../../../js/common/scrollTable.js"></script>
+    <script src="../../../js/common/date-time-common.js"></script>
 </head>
 
 <body>
diff --git a/productionboard/target/classes/templates/tankShell/device.html b/productionboard/target/classes/templates/tankShell/device.html
index 543c51a..6fc66e1 100644
--- a/productionboard/target/classes/templates/tankShell/device.html
+++ b/productionboard/target/classes/templates/tankShell/device.html
@@ -9,6 +9,7 @@
     <script src="../../../js/common/update-split-blocks.js"></script>
     <script src="../../../js/common/echarts.common.js"></script>
     <script src="../../../js/common/scrollTable.js"></script>
+    <script src="../../../js/common/date-time-common.js"></script>
 </head>
 <body>
     <!--数据信息-->

From dc34c35f3fb9275d324e0f2235978a881b5f9348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Mon, 6 Jun 2022 17:22:32 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/js/tankShell/device.js   | 14 +++++++-------
 .../target/classes/static/js/tankShell/device.js   | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/productionboard/src/main/resources/static/js/tankShell/device.js b/productionboard/src/main/resources/static/js/tankShell/device.js
index 7e5b917..da0de5f 100644
--- a/productionboard/src/main/resources/static/js/tankShell/device.js
+++ b/productionboard/src/main/resources/static/js/tankShell/device.js
@@ -26,13 +26,13 @@ $(() => {
         success: function (res) {
             let Res = res
             Res.data.forEach(val => {
-                val[0] = 'sc-228NE'
-                val[1] = '431'
-                val[2] = '0'
-                val[3] = '431'
-                val[4] = '0%'
+                val[0] = 'SHEBEI452736'
+                val[1] = 'AGYM45HH23'
+                val[2] = '32'
+                val[3] = '2021.01.01 10:00:00'
+                delete val[4]
             });
-            Res.header = ['型号', '计划数', '完成数', '差异数', '执行进度']
+            Res.header = ['设备名称', '参数名称', '当前值', '时间', ]
             dynamicTable({
                 el: '#productionPlan',
                 rowNum: 5,
@@ -45,7 +45,7 @@ $(() => {
                 headerBGC: 'rgba(8,36,75,0.2)',
                 oddRowBGC: 'rgba(8,36,75,0.2)',
                 evenRowBGC: 'rgba(6,25,57,0.2)',
-                colWidth: ['100%', '100%', '100%', '100%', '100%']
+                colWidth: ['100%', '100%', '40%', '160%', ]
             });
         },
         error: function (e) {
diff --git a/productionboard/target/classes/static/js/tankShell/device.js b/productionboard/target/classes/static/js/tankShell/device.js
index 7e5b917..da0de5f 100644
--- a/productionboard/target/classes/static/js/tankShell/device.js
+++ b/productionboard/target/classes/static/js/tankShell/device.js
@@ -26,13 +26,13 @@ $(() => {
         success: function (res) {
             let Res = res
             Res.data.forEach(val => {
-                val[0] = 'sc-228NE'
-                val[1] = '431'
-                val[2] = '0'
-                val[3] = '431'
-                val[4] = '0%'
+                val[0] = 'SHEBEI452736'
+                val[1] = 'AGYM45HH23'
+                val[2] = '32'
+                val[3] = '2021.01.01 10:00:00'
+                delete val[4]
             });
-            Res.header = ['型号', '计划数', '完成数', '差异数', '执行进度']
+            Res.header = ['设备名称', '参数名称', '当前值', '时间', ]
             dynamicTable({
                 el: '#productionPlan',
                 rowNum: 5,
@@ -45,7 +45,7 @@ $(() => {
                 headerBGC: 'rgba(8,36,75,0.2)',
                 oddRowBGC: 'rgba(8,36,75,0.2)',
                 evenRowBGC: 'rgba(6,25,57,0.2)',
-                colWidth: ['100%', '100%', '100%', '100%', '100%']
+                colWidth: ['100%', '100%', '40%', '160%', ]
             });
         },
         error: function (e) {

From 55452c427a8164ae7887734a51739f74e9abb11c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Mon, 6 Jun 2022 17:36:36 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/js/common/echarts.common.js    | 9 ---------
 .../target/classes/static/js/common/echarts.common.js    | 9 ---------
 2 files changed, 18 deletions(-)

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 7efd031..4c2a958 100644
--- a/productionboard/src/main/resources/static/js/common/echarts.common.js
+++ b/productionboard/src/main/resources/static/js/common/echarts.common.js
@@ -2331,15 +2331,6 @@ const energyConsumption = (res, ids) => {
             bottom: '3%',
             containLabel: true
         },
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross',
-            crossStyle: {
-              color: '#999'
-            }
-          }
-        },
         xAxis: [
           {
             interval: 0,
diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js
index 7efd031..4c2a958 100644
--- a/productionboard/target/classes/static/js/common/echarts.common.js
+++ b/productionboard/target/classes/static/js/common/echarts.common.js
@@ -2331,15 +2331,6 @@ const energyConsumption = (res, ids) => {
             bottom: '3%',
             containLabel: true
         },
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross',
-            crossStyle: {
-              color: '#999'
-            }
-          }
-        },
         xAxis: [
           {
             interval: 0,