diff --git a/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css b/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css
index a0fd894..6047305 100644
--- a/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css
+++ b/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css
@@ -29,6 +29,12 @@ body {
top: 45.1%;
right: 0%;
}
+.arrowsOne{
+ display: block;
+}
+.arrowsTwo{
+ display: none;
+}
.layerOne{
background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/layerOne.png);
background-size: 100% 100%;
diff --git a/ruoyi-admin/src/main/resources/static/img/mid.png b/ruoyi-admin/src/main/resources/static/img/mid.png
index 97e04cd..9be5c4f 100644
Binary files a/ruoyi-admin/src/main/resources/static/img/mid.png and b/ruoyi-admin/src/main/resources/static/img/mid.png differ
diff --git a/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js b/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js
index 79d1f52..0d0a31e 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js
@@ -10,17 +10,23 @@ $(() => {
const btnTwo = $('#btnTwo')
const layerOne = $('#layerOne')
const layerTwo = $('#layerTwo')
+ const arrowsOne = $('#arrowsOne')
+ const arrowsTwo = $('#arrowsTwo')
btnOne.click(() => {
btnOne.css({backgroundImage: 'url(../../img/board/intelligentRefrigeratorInterconnectionFactory/btnOneClick.png)'})
btnTwo.css({backgroundImage: 'url(../../img/board/intelligentRefrigeratorInterconnectionFactory/btnTwo.png)'})
layerOne.css({display: 'block'})
layerTwo.css({display: 'none'})
+ arrowsOne.css({display: 'block'})
+ arrowsTwo.css({display: 'none'})
})
btnTwo.click(() => {
btnOne.css({backgroundImage: 'url(../../img/board/intelligentRefrigeratorInterconnectionFactory/btnOne.png)'})
btnTwo.css({backgroundImage: 'url(../../img/board/intelligentRefrigeratorInterconnectionFactory/btnTwoClick.png)'})
layerOne.css({display: 'none'})
layerTwo.css({display: 'block'})
+ arrowsOne.css({display: 'none'})
+ arrowsTwo.css({display: 'block'})
})
})
diff --git a/ruoyi-admin/src/main/resources/static/js/board/week.js b/ruoyi-admin/src/main/resources/static/js/board/week.js
index 7b18975..85ca5ad 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/week.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/week.js
@@ -23,9 +23,15 @@ $(() => {
// 三日订单执行情况
autoUpdate(url + "/selectOrderRateInfo", INTERVAL, data => {
+ let newData = []
+ data.forEach((val,index) => {
+ if (val.actual_number !== 0){
+ newData.push(data[index])
+ }
+ })
singleVerticalBarChart({
- xName: data.map(val => val.name_sub),
- yData: data.map(val => val.actual_number),
+ xName: newData.map(val => val.name_sub),
+ yData: newData.map(val => val.actual_number),
}, document.getElementById("productionEfficiency"), -20)
orderDetailsTable.loadData(data.map(value => [value.plan_code, value.name, value.plan_number, value.actual_number, value.plan_number - value.actual_number]), Object.keys(["编号", "型号", "计划数量", "完成数量", "差异值"]))
@@ -39,12 +45,12 @@ $(() => {
// 当日订单入库统计
autoUpdate(url + "/zhou_selectQaItemInfo", INTERVAL, data => {
- let arr = [0,0,0,0,0,0]
- let yDataOne = [...(data.find(val => val.code == '内胆检漏')?.list.map(val => val.qty) || []),...arr]
- let yDataTwo = [...(data.find(val => val.code == '安全检测')?.list.map(val => val.qty) || []),...arr]
- let yDataThree = [...(data.find(val => val.code == '成品检漏')?.list.map(val => val.qty) || []),...arr]
- let yDataFour = [...(data.find(val => val.code == '测温性能')?.list.map(val => val.qty) || []),...arr]
- let yDataFive = [...(data.find(val => val.code == '成品外观')?.list.map(val => val.qty) || []),...arr]
+ let arr = [0, 0, 0, 0, 0, 0]
+ let yDataOne = [...(data.find(val => val.code == '内胆检漏')?.list.map(val => val.qty) || []), ...arr]
+ let yDataTwo = [...(data.find(val => val.code == '安全检测')?.list.map(val => val.qty) || []), ...arr]
+ let yDataThree = [...(data.find(val => val.code == '成品检漏')?.list.map(val => val.qty) || []), ...arr]
+ let yDataFour = [...(data.find(val => val.code == '测温性能')?.list.map(val => val.qty) || []), ...arr]
+ let yDataFive = [...(data.find(val => val.code == '成品外观')?.list.map(val => val.qty) || []), ...arr]
multipleBrokenLineAreaDiagramTwo(
{
xData: data.find(val => val.code == '横坐标')?.list.map(val => val.name),
diff --git a/ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html b/ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html
index 5436bf1..beed8be 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html
@@ -6,7 +6,8 @@
name="viewport">
箱壳成型数据监控平台
-
+
@@ -43,40 +44,69 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-