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/indexLine.vue | 152 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 103 insertions(+), 49 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/indexLine.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/indexLine.vue"
index 75d0137..9f9efab 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/indexLine.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/indexLine.vue"
@@ -21,10 +21,10 @@
"></span>
<span style="
padding-left: 15px;
- font-size: 50px;
+ font-size: 55px;
font-weight: bold;
color: #90EE90;
- ">绔嬪簱杈撻�佽建閬撳師绾镐俊鎭紙鍏眥{showMsg}}鍗凤級</span>
+ ">浜х嚎淇℃伅鐪嬫澘</span>
//鏃堕棿
<div style="position: absolute; right: 20px;">
<p style="
@@ -73,32 +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: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;">闀垮害(m)</span>',
+ '<span style="font-size:50px;">璁″垝鐢ㄧ焊(m)</span>',
+ '<span style="font-size:50px;">瀛樻斁搴撳尯</span>',
+ '<span style="font-size:50px;">閰嶉�佺姸鎬�</span>',
+ '<span style="font-size:50px;">澶囨敞</span>'
],
data: [
[
- '<span style="color:#FF4500; font-size:60px;">705010</span>',
- '<span style="color:#FF4500; font-size:60px;">015004</span>',
- '<span style="color:#FF4500; font-size:60px;">X2</span>',
- '<span style="color:#FF4500; font-size:60px;">1</span>',
- '<span style="color:#FF4500; font-size:60px;">1200</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:85px;">15</span>',
+ '<span style="color:#FF4500; font-size:85px;">1鍙�</span>',
+ '<span style="color:#FF4500; font-size:85px;">1</span>',
+ '<span style="color:#FF4500; font-size:85px;">W3</span>',
+ '<span style="color:#FF4500; font-size:85px;">2250</span>',
+ '<span style="color:#FF4500; font-size:85px;">705010</span>',
+ '<span style="color:#FF4500; font-size:85px;">4798</span>',
+ '<span style="color:#FF4500; font-size:85px;">180</span>',
+ '<span style="color:#FF4500; font-size:85px;">浜у墠鍛ㄨ浆鍖�</span>',
+ '<span style="color:#FF4500; font-size:85px;">鏈厤閫�</span>',
+ '<span style="color:#FF4500; font-size:85px;">宸蹭笂鏈烘湭棰嗙敤/棰嗙敤涓嶆樉绀�</span>'
],
[
- '<span style="color:#FF4500; font-size:60px;">705010</span>',
- '<span style="color:#FF4500; font-size:60px;">015004</span>',
- '<span style="color:#FF4500; font-size:60px;">X2</span>',
- '<span style="color:#FF4500; font-size:60px;">2</span>',
- '<span style="color:#FF4500; font-size:60px;">1200</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:85px;">15</span>',
+ '<span style="color:#FF4500; font-size:85px;">3鍙�</span>',
+ '<span style="color:#FF4500; font-size:85px;">1</span>',
+ '<span style="color:#FF4500; font-size:85px;">I1</span>',
+ '<span style="color:#FF4500; font-size:85px;">2250</span>',
+ '<span style="color:#FF4500; font-size:85px;">705011</span>',
+ '<span style="color:#FF4500; font-size:85px;">4798</span>',
+ '<span style="color:#FF4500; font-size:85px;">180</span>',
+ '<span style="color:#FF4500; font-size:85px;">浜у墠鍛ㄨ浆鍖�</span>',
+ '<span style="color:#FF4500; font-size:85px;">宸查厤閫�</span>',
+ '<span style="color:#FF4500; font-size:85px;">宸蹭笂鏈烘湭棰嗙敤/棰嗙敤涓嶆樉绀�</span>'
],
],
headerHeight: 60,
@@ -106,9 +118,9 @@
evenRowBGC: "rgba(0, 0, 0, 0.6)",
headerBGC: "rgba(0, 0, 0, 0.6)",
waitTime: 5000,
- columnWidth: [380, 380, 180, 200, 200, 250, 250],
+ 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,
showMsg:""
@@ -169,29 +181,70 @@
return;
}
this.showMsg=res.data.message
- var arr = [];
- res.data.data.forEach((x) => {
- var item = [
- '<span style="color:#FF4500; font-size:55px;">'+x.palletCode+'</span>',
- '<span style="color:#FF4500; font-size:55px;">'+x.orderNo+'</span>',
- '<span style="color:#FF4500; font-size:55px;">'+x.materielCode+'</span>',
- '<span style="color:#FF4500; font-size:55px;">'+x.machineName+'</span>',
- '<span style="color:#FF4500; font-size:55px;">'+x.materialWide+'</span>',
- '<span style="color:#FF4500; font-size:55px;;">'+x.originalQuantity+'</span>',
- '<span style="color:#FF4500; font-size:55px;">'+x.orderQuantity+'</span>',
- ];
- arr.push(item);
+
+ // 1. 鎸夌焊鍗峰彿鍒嗙粍鏁版嵁
+ const groupedData = {};
+ res.data.data.forEach((item) => {
+ const palletCode = item.palletCode || '';
+ if (!groupedData[palletCode]) {
+ groupedData[palletCode] = [];
+ }
+ groupedData[palletCode].push(item);
});
+
+ // 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:85px;">' + (index + 1) + '</span>',
+ // 鏈轰綅
+ '<span style="color:#FF4500; font-size:85px;">' + (firstItem.machineName || '') + '</span>',
+ // 绾哥
+ '<span style="color:#FF4500; font-size:85px;">' + (firstItem.materielCode || '') + '</span>',
+ // 闂ㄥ箙
+ '<span style="color:#FF4500; font-size:85px;">' + materialWide + '</span>',
+ // 绾稿嵎鍙� - 灏�3-6浣嶈繛缁瓧姣嶈浆鎹负*
+ '<span style="color:#FF4500; font-size:85px;">' + ((firstItem.palletCode || '').replace(/[A-Za-z]{3,6}/g, function(match) {
+ return '*'.repeat(match.length);
+ })) + '</span>',
+ // 闀垮害(m)
+ '<span style="color:#FF4500; font-size:85px;">' + originalQuantity + '</span>',
+ // 璁″垝鐢ㄧ焊(m) - 鍚堝苟鍚庣殑鍊�
+ // '<span style="color:#FF4500; font-size:85px;">' + totalOrderQuantity + '</span>',
+ // 瀛樻斁搴撳尯
+ '<span style="color:#FF4500; font-size:85px;">' + ('鑰佸巶') + '</span>',
+ ];
+ arr.push(tableRow);
+ });
+
if (this.IsDetail) {
this.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: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:50px;">瀛樻斁鍖�</span>',
],
data: arr,
headerHeight: 60,
@@ -199,13 +252,14 @@
evenRowBGC: "rgba(0, 0, 0, 0.6)",
headerBGC: "rgba(0, 0, 0, 0.6)",
waitTime: 5000,
- columnWidth: [380, 380, 180, 200, 200, 250, 250],
+ columnWidth: [135, 270, 200, 240, 460, 220, 260],
rowNum: 10,
- align: ["center", "center", "center", "center", "center", "center", "center"],
+ align: ["center", "center", "center", "center", "center", "center", "center", "center", "center"],
};
} else {
this.$refs["scrollBoard"].updateRows(arr)
}
+
if (this.IsDetail) {
this.timeRequest = setInterval(() => {
this.GetOrderDetail();
@@ -262,13 +316,13 @@
display: flex;
background-color: rgb(0, 0, 0);
color: #fff;
- height: 30px;
- line-height: 30px;
+ height: 40px;
+ line-height: 40px;
font-size: 18px;
}
.cell {
- width: 160px;
+ width: 185px;
border-right: #fff 1px solid;
text-align: center;
}
--
Gitblit v1.9.3