From 114c252dcc51fea8b725bcd375cabb1e8d23a90e Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期二, 06 一月 2026 16:44:33 +0800
Subject: [PATCH] 1
---
项目代码/BigScreen/src/views/indexPick.vue | 284 +++++++++++++++++++++++---------------------------------
1 files changed, 118 insertions(+), 166 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/indexPick.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/indexPick.vue"
index 2e49243..f3228ab 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/indexPick.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/indexPick.vue"
@@ -21,15 +21,15 @@
"></span>
<span style="
padding-left: 15px;
- font-size: 50px;
+ font-size: 60px;
font-weight: bold;
color: #90EE90;
- ">鎺掗櫎鍑哄簱鍘熺焊淇℃伅锛堝叡 鍗凤級</span>
+ ">鎶辩焊鎸囧紩鐪嬫澘</span>
//鏃堕棿
<div style="position: absolute; right: 20px;">
<p style="
display: inline-block;
- font-size: 50px;
+ font-size: 35px;
font-weight: bold;
color: #f7b500;
margin: 0;
@@ -64,6 +64,7 @@
data() {
return {
timing: null,
+ timeRequest: null,
loading: true,
dateDay: null,
dateYear: null,
@@ -72,149 +73,44 @@
weekday: ["鍛ㄦ棩", "鍛ㄤ竴", "鍛ㄤ簩", "鍛ㄤ笁", "鍛ㄥ洓", "鍛ㄤ簲", "鍛ㄥ叚"],
config: {
header: [
- '<span style="font-size:50px;">绾稿嵎鏉＄爜</span>',
- '<span style="font-size:50px;">宸ュ崟鍙�</span>',
- '<span style="font-size:50px;">浠ｇ爜</span>',
- '<span style="font-size:50px;">涓婃満浣�</span>',
- '<span style="font-size:50px;">瀹藉箙</span>',
- '<span style="font-size:50px;">绾稿嵎闀�</span>',
- '<span style="font-size:50px;">闇�鐢ㄧ焊闀�</span>'
+ '<span style="font-size:35px;">绯荤粺椤哄簭</span>',
+ '<span style="font-size:35px;">鏈轰綅</span>',
+ '<span style="font-size:35px;">鐢ㄧ焊椤哄簭</span>',
+ '<span style="font-size:35px;">绾哥</span>',
+ '<span style="font-size:35px;">闂ㄥ箙</span>',
+ '<span style="font-size:35px;">绾稿嵎鍙�</span>',
+ '<span style="font-size:35px;">闀垮害(m)</span>',
+ '<span style="font-size:35px;">璁″垝鐢ㄧ焊(m)</span>',
+ '<span style="font-size:35px;">瀛樻斁搴撳尯</span>',
+ '<span style="font-size:35px;">閰嶉�佺姸鎬�</span>',
+ '<span style="font-size:35px;">澶囨敞</span>'
],
data: [
[
- '<span style="color:#FF4500; font-size:75px;">705010</span>',
- '<span style="color:#FF4500; font-size:75px;">015004</span>',
- '<span style="color:#FF4500; font-size:75px;">X2</span>',
- '<span style="color:#FF4500; font-size:75px;">1</span>',
- '<span style="color:#FF4500; font-size:75px;">1200</span>',
- '<span style="color:#FF4500; font-size:75px;;">4798</span>',
- '<span style="color:#FF4500; font-size:75px;">180</span>',
+ '<span style="color:#FF4500; font-size:60px;">15</span>',
+ '<span style="color:#FF4500; font-size:60px;">1鍙�</span>',
+ '<span style="color:#FF4500; font-size:60px;">1</span>',
+ '<span style="color:#FF4500; font-size:60px;">W3</span>',
+ '<span style="color:#FF4500; font-size:60px;">2250</span>',
+ '<span style="color:#FF4500; font-size:60px;">705010</span>',
+ '<span style="color:#FF4500; font-size:60px;">4798</span>',
+ '<span style="color:#FF4500; font-size:60px;">180</span>',
+ '<span style="color:#FF4500; font-size:60px;">浜у墠鍛ㄨ浆鍖�</span>',
+ '<span style="color:#FF4500; font-size:60px;">鏈厤閫�</span>',
+ '<span style="color:#FF4500; font-size:60px;">宸蹭笂鏈烘湭棰嗙敤/棰嗙敤涓嶆樉绀�</span>'
],
[
- '<span style="color:#FF4500; font-size:75px;">705010</span>',
- '<span style="color:#FF4500; font-size:75px;">015004</span>',
- '<span style="color:#FF4500; font-size:75px;">X2</span>',
- '<span style="color:#FF4500; font-size:75px;">2</span>',
- '<span style="color:#FF4500; font-size:75px;">1200</span>',
- '<span style="color:#FF4500; font-size:75px;;">4798</span>',
- '<span style="color:#FF4500; font-size:75px;">180</span>',
- ],
- [
- '<span style="color:#FF4500; font-size:75px;">705010</span>',
- '<span style="color:#FF4500; font-size:75px;">015004</span>',
- '<span style="color:#FF4500; font-size:75px;">X2</span>',
- '<span style="color:#FF4500; font-size:75px;">3</span>',
- '<span style="color:#FF4500; font-size:75px;">1200</span>',
- '<span style="color:#FF4500; font-size:75px;;">4798</span>',
- '<span style="color:#FF4500; font-size:75px;">180</span>',
- ],
- [
- '<span style="color:#FF4500; font-size:75px;">705010</span>',
- '<span style="color:#FF4500; font-size:75px;">015004</span>',
- '<span style="color:#FF4500; font-size:75px;">X2</span>',
- '<span style="color:#FF4500; font-size:75px;">4</span>',
- '<span style="color:#FF4500; font-size:75px;">1200</span>',
- '<span style="color:#FF4500; font-size:75px;;">4798</span>',
- '<span style="color:#FF4500; font-size:75px;">180</span>',
- ],
- [
- '<span style="color:#FF4500; font-size:75px;">705010</span>',
- '<span style="color:#FF4500; font-size:75px;">015004</span>',
- '<span style="color:#FF4500; font-size:75px;">X2</span>',
- '<span style="color:#FF4500; font-size:75px;">5</span>',
- '<span style="color:#FF4500; font-size:75px;">1200</span>',
- '<span style="color:#FF4500; font-size:75px;;">4798</span>',
- '<span style="color:#FF4500; font-size:75px;">180</span>',
- ],
- [
- '<span style="color:#FF4500; font-size:75px;">705010</span>',
- '<span style="color:#FF4500; font-size:75px;">015004</span>',
- '<span style="color:#FF4500; font-size:75px;">X2</span>',
- '<span style="color:#FF4500; font-size:75px;">6</span>',
- '<span style="color:#FF4500; font-size:75px;">1200</span>',
- '<span style="color:#FF4500; font-size:75px;;">4798</span>',
- '<span style="color:#FF4500; font-size:75px;">180</span>',
- ],
- [
- '<span style="color:#FF4500; font-size:75px;">705010</span>',
- '<span style="color:#FF4500; font-size:75px;">015004</span>',
- '<span style="color:#FF4500; font-size:75px;">X2</span>',
- '<span style="color:#FF4500; font-size:75px;">7</span>',
- '<span style="color:#FF4500; font-size:75px;">1200</span>',
- '<span style="color:#FF4500; font-size:75px;;">4798</span>',
- '<span style="color:#FF4500; font-size:75px;">180</span>',
- ],
- [
- '<span style="color:#FF4500; font-size:75px;">705010</span>',
- '<span style="color:#FF4500; font-size:75px;">015004</span>',
- '<span style="color:#FF4500; font-size:75px;">X2</span>',
- '<span style="color:#FF4500; font-size:75px;">8</span>',
- '<span style="color:#FF4500; font-size:75px;">1200</span>',
- '<span style="color:#FF4500; font-size:75px;;">4798</span>',
- '<span style="color:#FF4500; font-size:75px;">180</span>',
- ],
- [
- '<span style="color:#FF4500; font-size:75px;">705010</span>',
- '<span style="color:#FF4500; font-size:75px;">015004</span>',
- '<span style="color:#FF4500; font-size:75px;">X2</span>',
- '<span style="color:#FF4500; font-size:75px;">9</span>',
- '<span style="color:#FF4500; font-size:75px;">1200</span>',
- '<span style="color:#FF4500; font-size:75px;;">4798</span>',
- '<span style="color:#FF4500; font-size:75px;">180</span>',
- ],
- [
- '<span style="color:#FF4500; font-size:75px;">705010</span>',
- '<span style="color:#FF4500; font-size:75px;">015004</span>',
- '<span style="color:#FF4500; font-size:75px;">X2</span>',
- '<span style="color:#FF4500; font-size:75px;">10</span>',
- '<span style="color:#FF4500; font-size:75px;">1200</span>',
- '<span style="color:#FF4500; font-size:75px;;">4798</span>',
- '<span style="color:#FF4500; font-size:75px;">180</span>',
- ],
- [
- '<span style="color:#FF4500; font-size:75px;">705010</span>',
- '<span style="color:#FF4500; font-size:75px;">015004</span>',
- '<span style="color:#FF4500; font-size:75px;">X2</span>',
- '<span style="color:#FF4500; font-size:75px;">11</span>',
- '<span style="color:#FF4500; font-size:75px;">1200</span>',
- '<span style="color:#FF4500; font-size:75px;;">4798</span>',
- '<span style="color:#FF4500; font-size:75px;">180</span>',
- ],
- [
- '<span style="color:#FF4500; font-size:75px;">705010</span>',
- '<span style="color:#FF4500; font-size:75px;">015004</span>',
- '<span style="color:#FF4500; font-size:75px;">X2</span>',
- '<span style="color:#FF4500; font-size:75px;">12</span>',
- '<span style="color:#FF4500; font-size:75px;">1200</span>',
- '<span style="color:#FF4500; font-size:75px;;">4798</span>',
- '<span style="color:#FF4500; font-size:75px;">180</span>',
- ],
- [
- '<span style="color:#FF4500; font-size:75px;">705010</span>',
- '<span style="color:#FF4500; font-size:75px;">015004</span>',
- '<span style="color:#FF4500; font-size:75px;">X2</span>',
- '<span style="color:#FF4500; font-size:75px;">13</span>',
- '<span style="color:#FF4500; font-size:75px;">1200</span>',
- '<span style="color:#FF4500; font-size:75px;;">4798</span>',
- '<span style="color:#FF4500; font-size:75px;">180</span>',
- ],
- [
- '<span style="color:#FF4500; font-size:75px;">705010</span>',
- '<span style="color:#FF4500; font-size:75px;">015004</span>',
- '<span style="color:#FF4500; font-size:75px;">X2</span>',
- '<span style="color:#FF4500; font-size:75px;">14</span>',
- '<span style="color:#FF4500; font-size:75px;">1200</span>',
- '<span style="color:#FF4500; font-size:75px;;">4798</span>',
- '<span style="color:#FF4500; font-size:75px;">180</span>',
- ],
- [
- '<span style="color:#FF4500; font-size:75px;">705010</span>',
- '<span style="color:#FF4500; font-size:75px;">015004</span>',
- '<span style="color:#FF4500; font-size:75px;">X2</span>',
- '<span style="color:#FF4500; font-size:75px;">15</span>',
- '<span style="color:#FF4500; font-size:75px;">1200</span>',
- '<span style="color:#FF4500; font-size:75px;;">4798</span>',
- '<span style="color:#FF4500; font-size:75px;">180</span>',
+ '<span style="color:#FF4500; font-size:60px;">15</span>',
+ '<span style="color:#FF4500; font-size:60px;">3鍙�</span>',
+ '<span style="color:#FF4500; font-size:60px;">1</span>',
+ '<span style="color:#FF4500; font-size:60px;">I1</span>',
+ '<span style="color:#FF4500; font-size:60px;">2250</span>',
+ '<span style="color:#FF4500; font-size:60px;">705011</span>',
+ '<span style="color:#FF4500; font-size:60px;">4798</span>',
+ '<span style="color:#FF4500; font-size:60px;">180</span>',
+ '<span style="color:#FF4500; font-size:60px;">浜у墠鍛ㄨ浆鍖�</span>',
+ '<span style="color:#FF4500; font-size:60px;">宸查厤閫�</span>',
+ '<span style="color:#FF4500; font-size:60px;">宸蹭笂鏈烘湭棰嗙敤/棰嗙敤涓嶆樉绀�</span>'
],
],
headerHeight: 60,
@@ -222,12 +118,12 @@
evenRowBGC: "rgba(0, 0, 0, 0.6)",
headerBGC: "rgba(0, 0, 0, 0.6)",
waitTime: 5000,
- columnWidth: [350, 350, 200, 200, 250, 250, 350],
+ columnWidth: [100, 100, 100, 100, 100, 200, 150, 150, 150, 150, 250],
rowNum: 10,
- align: ["center", "center", "center", "center", "center", "center", "center"],
+ align: ["center", "center", "center", "center", "center", "center", "center", "center", "center", "center", "center"],
},
IsDetail: true,
- OrderCreator: {},
+ showMsg:""
};
},
components: {
@@ -240,10 +136,11 @@
this.updateTime(); // 姣忕鏇存柊鏃堕棿
}, 1000);
this.cancelLoading();
- // this.GetOrderDetail();
+ this.GetOrderDetail();
},
beforeDestroy() {
clearInterval(this.timing);
+ clearInterval(this.timeRequest);
},
methods: {
// 鏇存柊鍖椾含鏃堕棿
@@ -278,42 +175,97 @@
}, 1000);
},
GetOrderDetail() {
- axios.post("/api/dt_WorkOrder/getWorkOrderInfo", null, "").then((res) => {
+ axios.post("/api/OutLineView/GetOutLineView", null, "").then((res) => {
if (res.data.status) {
if (res.data.data == null) {
return;
}
- var sp = '</span>';
- var arr = [];
- res.data.data.dt_WorkOrderDetail.forEach((x) => {
- var item = [
- '<span style="color:#67e0e3;">' + x.layer + '灞�' + sp,
- '<span style="color:#9fe6b8;">' + (x.lj_hight == null ? '鏃犻渶娴嬮噺' : x.lj_hight + 'mm') + sp,
- '<span style="color:#fb7503;">' + (x.measure_hight == null ? '鏃犻渶娴嬮噺' : x.measure_hight + 'mm') + sp,
- '<span style="color:#fb7503;">' + x.lj_is_tolerance + sp,
- ];
- arr.push(item);
+ this.showMsg=res.data.message
+
+ // 1. 鎸夌焊鍗峰彿鍒嗙粍鏁版嵁
+ const groupedData = {};
+ res.data.data.forEach((item) => {
+ const palletCode = item.palletCode || '';
+ if (!groupedData[palletCode]) {
+ groupedData[palletCode] = [];
+ }
+ groupedData[palletCode].push(item);
});
- this.OrderCreator = res.data.data;
+
+ // 2. 澶勭悊鍒嗙粍鍚庣殑鏁版嵁锛氬悎骞惰鍒掔敤绾�
+ var arr = [];
+ Object.keys(groupedData).forEach((palletCode, index) => {
+ const group = groupedData[palletCode];
+
+ // 鍙栫涓�鏉℃暟鎹綔涓哄熀纭�鏁版嵁
+ const firstItem = group[0];
+
+ // 璁＄畻璁″垝鐢ㄧ焊鎬诲拰
+ let totalOrderQuantity = 0;
+ group.forEach((item) => {
+ totalOrderQuantity += parseInt(item.orderQuantity) || 0;
+ });
+
+ // 澶勭悊鍏朵粬鏁板��
+ const originalQuantity = parseInt(firstItem.originalQuantity) || 0;
+ const materialWide = parseInt(firstItem.materialWide) || 0;
+
+ // 鏄犲皠瀛楁鍒版柊鐨勮〃鏍肩粨鏋�
+ var tableRow = [
+ // 搴忓彿锛堜粠1寮�濮嬮�掑锛�
+ '<span style="color:#FF4500; font-size:35px;">' + (index + 1) + '</span>',
+ // 鏈轰綅
+ '<span style="color:#FF4500; font-size:35px;">' + (firstItem.machineName || '') + '</span>',
+ // 椤哄簭
+ //'<span style="color:#FF4500; font-size:35px;">' + (firstItem.paperUseOrder || '') + '</span>',
+ // 绾哥
+ '<span style="color:#FF4500; font-size:35px;">' + (firstItem.materielCode || '') + '</span>',
+ // 闂ㄥ箙
+ '<span style="color:#FF4500; font-size:35px;">' + materialWide + '</span>',
+ // 绾稿嵎鍙�
+ '<span style="color:#FF4500; font-size:35px;">' + (firstItem.palletCode || '') + '</span>',
+ // 闀垮害(m)
+ '<span style="color:#FF4500; font-size:35px;">' + originalQuantity + '</span>',
+ // 璁″垝鐢ㄧ焊(m) - 鍚堝苟鍚庣殑鍊�
+ '<span style="color:#FF4500; font-size:35px;">' + totalOrderQuantity + '</span>',
+ // 瀛樻斁搴撳尯
+ '<span style="color:#FF4500; font-size:35px;">' + ('鑰佸巶鏆傚瓨鍖�') + '</span>',
+ // 閰嶉�佺姸鎬�
+ '<span style="color:#FF4500; font-size:35px;">' + ('鏈厤閫�') + '</span>',
+ ];
+ arr.push(tableRow);
+ });
+
if (this.IsDetail) {
this.config = {
header: [
- '<span style="font-size:18px;">灞傛暟</span>',
- '<span style="font-size:18px;">绱鏍囧噯楗煎帤</span>',
- '<span style="font-size:18px;">绱楗煎帤</span>',
- '<span style="font-size:18px;">娴嬮珮缁撴灉</span>'
+ '<span style="font-size:30px;">搴忓彿</span>',
+ '<span style="font-size:30px;">鏈轰綅</span>',
+ // '<span style="font-size:30px;">椤哄簭</span>',
+ '<span style="font-size:30px;">绾哥</span>',
+ '<span style="font-size:30px;">闂ㄥ箙</span>',
+ '<span style="font-size:30px;">绾稿嵎鍙�</span>',
+ '<span style="font-size:30px;">闀垮害(m)</span>',
+ '<span style="font-size:30px;">璁″垝鐢ㄧ焊(m)</span>',
+ '<span style="font-size:30px;">瀛樻斁搴撳尯</span>',
+ '<span style="font-size:30px;">閰嶉�佺姸鎬�</span>',
],
data: arr,
- waitTime: 10000,
- rowNum: 15,
- columnWidth: [75, 150, 110, 110],
- align: ["center", "center", "center", "center"]
+ headerHeight: 60,
+ oddRowBGC: "rgba(0, 0, 0, 0.6)",
+ evenRowBGC: "rgba(0, 0, 0, 0.6)",
+ headerBGC: "rgba(0, 0, 0, 0.6)",
+ waitTime: 5000,
+ columnWidth: [100, 150, 150, 200, 250, 200, 250, 250, 150, 200],
+ rowNum: 10,
+ align: ["center", "center", "center", "center", "center", "center", "center", "center", "center", "center"],
};
} else {
this.$refs["scrollBoard"].updateRows(arr)
}
+
if (this.IsDetail) {
- setInterval(() => {
+ this.timeRequest = setInterval(() => {
this.GetOrderDetail();
}, 10000);
this.IsDetail = false;
--
Gitblit v1.9.3