From 011ca316e6ec2ed93e31c45a9ebd9d3c66664871 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 17 四月 2026 11:47:03 +0800
Subject: [PATCH] 代码更新
---
项目代码/BigScreen/src/views/index.vue | 58 +++++++++++++++++++++++++---------------------------------
1 files changed, 25 insertions(+), 33 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/index.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/index.vue"
index e8d5763..396676d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/index.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/index.vue"
@@ -74,7 +74,7 @@
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>',
@@ -83,22 +83,12 @@
],
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: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:60px;">06D4BC6110</span>',
+ '<span style="color:#FF4500; font-size:60px;">I0</span>',
+ '<span style="color:#FF4500; font-size:60px;">绯婅溅</span>',
+ '<span style="color:#FF4500; font-size:60px;">2450</span>',
+ '<span style="color:#FF4500; font-size:60px;">6976</span>',
+ '<span style="color:#FF4500; font-size:60px;;">1597</span>',
],
],
headerHeight: 60,
@@ -173,10 +163,13 @@
// 1. 鎸夌焊鍗锋潯鐮佸垎缁�
const groupedData = {};
res.data.data.forEach((x) => {
- if (!groupedData[x.palletCode]) {
+ console.log(x);
+ if (x.taskNum) {
+ if (!groupedData[x.palletCode]) {
groupedData[x.palletCode] = [];
+ }
+ groupedData[x.palletCode].push(x);
}
- groupedData[x.palletCode].push(x);
});
// 2. 澶勭悊鏁版嵁锛氬皢姣忕粍鐩稿悓绾稿嵎鏉＄爜鐨勮褰曞悎骞朵负涓�鏉�
@@ -196,7 +189,6 @@
uniquePalletCodes.add(item.palletCode);
}
});
- this.showMsg = uniquePalletCodes.size;
// 鐩存帴澶勭悊姣忔潯璁板綍锛屼笉杩涜鍒嗙粍
group.forEach((item) => {
@@ -216,26 +208,26 @@
// 鍒涘缓鍚堝苟鍚庣殑鍗曟潯璁板綍
var item = [
- '<span style="color:#FF4500; font-size:85px;">' + palletCode + '</span>',
+ '<span style="color:#FF4500; font-size:89px;">' + palletCode + '</span>',
//'<span style="color:#FF4500; font-size:55px;">' + orderNos + '</span>',
- '<span style="color:#FF4500; font-size:85px;">' + firstItem.materielCode + '</span>',
- '<span style="color:#FF4500; font-size:85px;">' + machineLastChar + '</span>',
- '<span style="color:#FF4500; font-size:85px;">' + materialWide + '</span>',
- '<span style="color:#FF4500; font-size:85px;;">' + originalQuantity + '</span>',
- '<span style="color:#FF4500; font-size:85px;">' + parseInt(totalOrderQuantity) + '</span>',
+ '<span style="color:#FF4500; font-size:90px;">' + firstItem.materielCode + '</span>',
+ '<span style="color:#FF4500; font-size:90px;">' + machineLastChar + '</span>',
+ '<span style="color:#FF4500; font-size:90px;">' + materialWide + '</span>',
+ '<span style="color:#FF4500; font-size:90px;;">' + originalQuantity + '</span>',
+ '<span style="color:#FF4500; font-size:90px;">' + parseInt(totalOrderQuantity) + '</span>',
];
arr.push(item);
});
if (this.IsDetail) {
this.config = {
header: [
- '<span style="font-size:63px;">绾稿嵎鏉＄爜</span>',
+ '<span style="font-size:68px;">绾稿嵎鏉＄爜</span>',
//'<span style="font-size:50px;">宸ュ崟鍙�</span>',
- '<span style="font-size:63px;">浠ｇ爜</span>',
- '<span style="font-size:63px;">涓婃満浣�</span>',
- '<span style="font-size:63px;">瀹藉箙</span>',
- '<span style="font-size:63px;">绾稿嵎闀�</span>',
- '<span style="font-size:63px;">闇�鐢ㄧ焊闀�</span>'
+ '<span style="font-size:68px;">浠ｇ爜</span>',
+ '<span style="font-size:68px;">涓婃満浣�</span>',
+ '<span style="font-size:68px;">瀹藉箙</span>',
+ '<span style="font-size:68px;">绾稿嵎闀�</span>',
+ '<span style="font-size:68px;">闇�鐢ㄧ焊闀�</span>'
],
data: arr,
headerHeight: 60,
@@ -243,7 +235,7 @@
evenRowBGC: "rgba(0, 0, 0, 0.6)",
headerBGC: "rgba(0, 0, 0, 0.6)",
waitTime: 5000,
- columnWidth: [550, 200, 250, 250, 250, 300],
+ columnWidth: [560, 200, 250, 250, 250, 300],
rowNum: 10,
align: ["center", "center", "center", "center", "center", "center", "center"],
};
--
Gitblit v1.9.3