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/router/index.js | 9
项目代码/BigScreen/src/views/indexLine.vue | 152 ++++--
项目代码/BigScreen/package-lock.json | 12
项目代码/BigScreen/src/views/index.vue | 530 +++++++++++------------
项目代码/BigScreen/src/views/1.vue | 318 ++++++++++++++
项目代码/BigScreen/src/views/indexPick.vue | 284 +++++-------
6 files changed, 813 insertions(+), 492 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/package-lock.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/package-lock.json"
index 6fc1e6f..5a9ef9b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/package-lock.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/package-lock.json"
@@ -2349,6 +2349,11 @@
"fastq": "^1.6.0"
}
},
+ "@popperjs/core": {
+ "version": "npm:@sxzz/popperjs-es@2.11.7",
+ "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+ "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
+ },
"@sideway/address": {
"version": "4.1.5",
"resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.5.tgz",
@@ -7391,13 +7396,6 @@
"lodash-unified": "^1.0.2",
"memoize-one": "^6.0.0",
"normalize-wheel-es": "^1.2.0"
- },
- "dependencies": {
- "@popperjs/core": {
- "version": "npm:@sxzz/popperjs-es@2.11.7",
- "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
- "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
- }
}
},
"element-ui": {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/router/index.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/router/index.js"
index 224d9f9..6773559 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/router/index.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/router/index.js"
@@ -5,13 +5,18 @@
const routes = [{
path: '/',
- name: 'indexLine',
- component: () => import('../views/indexLine.vue')
+ name: '',
+ component: () => import('../views/index.vue')
},
{
path:"/pick",
name:"indexPick",
component: () => import('../views/indexPick.vue')
+},
+{
+ path:"/Line",
+ name:"indexLine",
+ component: () => import('../views/indexLine.vue')
}
]
const router = new VueRouter({
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/1.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/1.vue"
new file mode 100644
index 0000000..2e23c4c
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/1.vue"
@@ -0,0 +1,318 @@
+<template>
+ <div id="index" ref="appRef">
+ <div class="bg">
+ <div class="myhead"></div>
+ <dv-loading v-if="loading">Loading...</dv-loading>
+ <div v-else class="host-body">
+
+ <div class="react-right" style="margin-left: 1510px">
+ <span class="text" style="width: 400px">{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span>
+ </div>
+ <div class="body-box">
+
+ <div class="content-box">
+ <div class="boxOrderHeight"
+ style="margin-left: 0px; display: flex; align-items: center; position: relative; width: 100%;">
+ <span style="
+ width: 5px;
+ height: 40px;
+ background-color: #FF4500;
+ display: block;
+ "></span>
+ <span style="
+ padding-left: 15px;
+ font-size: 60px;
+ font-weight: bold;
+ color: #90EE90;
+ ">绔嬪簱杈撻�佽建閬撳師绾镐俊鎭紙鍏眥{showMsg}}鍗凤級</span>
+ //鏃堕棿
+ <div style="position: absolute; right: 20px;">
+ <p style="
+ display: inline-block;
+ font-size: 50px;
+ font-weight: bold;
+ color: #f7b500;
+ margin: 0;
+ padding: 5px 15px;
+ ">{{ currentTime }}</p>
+ </div>
+ </div>
+ <!-- 宸ュ崟淇℃伅妯″潡 -->
+ <dv-border-box-8 :reverse="true"
+ style="width: 100%; height: 950px; margin-top: 5px; margin-left: auto; margin-right: auto;">
+ <dv-scroll-board :config="config" ref="scrollBoard"
+ style="width: 100%; height: 950px; padding: 5px" />
+ </dv-border-box-8>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+import drawMixin from "../utils/drawMixin";
+import { formatTime } from "../utils/index.js";
+import centerView1 from "./centerView1.vue";
+import bottomView1 from "./bottomView1.vue";
+import axios from "@/api/ajax.js";
+// import{GetDateForLED} from "@/api/http.js"
+
+export default {
+ mixins: [drawMixin],
+ data() {
+ return {
+ timing: null,
+ timeRequest: null,
+ loading: true,
+ dateDay: null,
+ dateYear: null,
+ dateWeek: null,
+ currentTime: '',
+ 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>'
+ ],
+ 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>',
+ ],
+ ],
+ 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: [380, 380, 180, 200, 200, 250, 250],
+ rowNum: 10,
+ align: ["center", "center", "center", "center", "center", "center", "center"],
+ },
+ IsDetail: true,
+ showMsg:""
+ };
+ },
+ components: {
+ centerView1,
+ bottomView1,
+ },
+ mounted() {
+ this.updateTime(); // 鍒濆鍖栨椂闂�
+ this.timing = setInterval(() => {
+ this.updateTime(); // 姣忕鏇存柊鏃堕棿
+ }, 1000);
+ this.cancelLoading();
+ this.GetOrderDetail();
+ },
+ beforeDestroy() {
+ clearInterval(this.timing);
+ clearInterval(this.timeRequest);
+ },
+ methods: {
+ // 鏇存柊鍖椾含鏃堕棿
+ updateTime() {
+ const now = new Date();
+ const year = now.getFullYear();
+ const month = String(now.getMonth() + 1).padStart(2, '0');
+ const day = String(now.getDate()).padStart(2, '0');
+ const hours = String(now.getHours()).padStart(2, '0');
+ const minutes = String(now.getMinutes()).padStart(2, '0');
+ const seconds = String(now.getSeconds()).padStart(2, '0');
+ const weekdays = ['鍛ㄦ棩', '鍛ㄤ竴', '鍛ㄤ簩', '鍛ㄤ笁', '鍛ㄥ洓', '鍛ㄤ簲', '鍛ㄥ叚'];
+ const weekday = weekdays[now.getDay()];
+
+ this.currentTime = `${year}-${month}-${day} ${weekday} ${hours}:${minutes}:${seconds}`;
+ },
+ //鍒锋柊鏃堕棿
+ timeFn() {
+ this.timing = setInterval(() => {
+ axios.post("/api/dt_WorkOrder/GetCurrentTime", null, "").then((x) => {
+ if (x.data.status) {
+ var data = x.data.data;
+ this.dateDay = formatTime(data, "HH: mm: ss");
+ this.dateYear = formatTime(data, "yyyy-MM-dd");
+ }
+ });
+ }, 1000);
+ },
+ cancelLoading() {
+ setTimeout(() => {
+ this.loading = false;
+ }, 1000);
+ },
+ GetOrderDetail() {
+ axios.post("/api/OutLineView/GetOutLineView", null, "").then((res) => {
+ if (res.data.status) {
+ if (res.data.data == null) {
+ return;
+ }
+ this.showMsg=res.data.message
+
+ // 1. 鎸夌焊鍗锋潯鐮佸垎缁�
+ const groupedData = {};
+ res.data.data.forEach((x) => {
+ if (!groupedData[x.palletCode]) {
+ groupedData[x.palletCode] = [];
+ }
+ groupedData[x.palletCode].push(x);
+ });
+
+ // 2. 澶勭悊鏁版嵁锛氬皢姣忕粍鐩稿悓绾稿嵎鏉＄爜鐨勮褰曞悎骞朵负涓�鏉�
+ var arr = [];
+ Object.keys(groupedData).forEach((palletCode) => {
+ const group = groupedData[palletCode];
+ if (group.length === 0) return;
+
+ // 鍙栫涓�鏉¤褰曠殑鍩烘湰淇℃伅
+ const firstItem = group[0];
+ let totalOrderQuantity = 0;
+
+ // 璁＄畻闇�鐢ㄧ焊闀挎�诲拰
+ group.forEach((item) => {
+ totalOrderQuantity += parseFloat(item.orderQuantity) || 0;
+ });
+
+ // 澶勭悊涓婃満浣嶏細鍙樉绀烘渶鍚庝竴浣�
+ const machineName = firstItem.machineName;
+ const machineLastChar = machineName ? machineName.slice(-3) : '';
+
+ // 澶勭悊鏁板�硷細鍘婚櫎灏忔暟鐐�
+ const materialWide = parseInt(firstItem.materialWide) || 0;
+ const originalQuantity = parseInt(firstItem.originalQuantity) || 0;
+
+ // 鍚堝苟宸ュ崟鍙凤細鐢ㄩ�楀彿鍒嗛殧鏄剧ず鎵�鏈夊伐鍗曞彿
+ const orderNos = group.map(item => item.orderNo).join(', ');
+
+ // 鍒涘缓鍚堝苟鍚庣殑鍗曟潯璁板綍
+ var item = [
+ '<span style="color:#FF4500; font-size:75px;">' + palletCode + '</span>',
+ //'<span style="color:#FF4500; font-size:55px;">' + orderNos + '</span>',
+ '<span style="color:#FF4500; font-size:75px;">' + firstItem.materielCode + '</span>',
+ '<span style="color:#FF4500; font-size:75px;">' + machineLastChar + '</span>',
+ '<span style="color:#FF4500; font-size:75px;">' + materialWide + '</span>',
+ '<span style="color:#FF4500; font-size:75px;;">' + originalQuantity + '</span>',
+ '<span style="color:#FF4500; font-size:75px;">' + parseInt(totalOrderQuantity) + '</span>',
+ ];
+ arr.push(item);
+ });
+ if (this.IsDetail) {
+ this.config = {
+ header: [
+ '<span style="font-size:63px;">绾稿嵎鏉＄爜</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>'
+ ],
+ data: arr,
+ 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: [500, 250, 250, 250, 250, 400],
+ rowNum: 10,
+ align: ["center", "center", "center", "center", "center", "center", "center"],
+ };
+ } else {
+ this.$refs["scrollBoard"].updateRows(arr)
+ }
+ if (this.IsDetail) {
+ this.timeRequest = setInterval(() => {
+ this.GetOrderDetail();
+ }, 10000);
+ this.IsDetail = false;
+ }
+ }
+ });
+ }
+ },
+};
+</script>
+
+<style lang="scss">
+@import "../assets/scss/index.scss";
+</style>
+
+<style lang="css" scoped>
+.myhead {
+ position: absolute;
+ width: 100%;
+ height: 100px;
+ /* background-color: red; */
+ top: 0;
+ left: 0;
+ z-index: 999;
+ background-size: cover;
+ background-position: center center;
+}
+
+.b-color {
+ width: 1420px;
+}
+
+.boxOrderHeight {
+ height: 40px;
+ line-height: 40px;
+ width: 400px;
+ display: flex;
+}
+
+.body-box {
+ display: flex;
+ flex-direction: column;
+ gap: 20px;
+ padding: 0 20px;
+}
+
+.content-box {
+ width: 100%;
+}
+
+.rows {
+ display: flex;
+ background-color: rgb(0, 0, 0);
+ color: #fff;
+ height: 30px;
+ line-height: 30px;
+ font-size: 18px;
+}
+
+.cell {
+ width: 160px;
+ border-right: #fff 1px solid;
+ text-align: center;
+}
+
+.bodys {
+ display: flex;
+ background-color: rgb(0, 59, 81);
+ color: #fff;
+ height: 32px;
+ line-height: 40px;
+}
+</style>
\ No newline at end of file
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 11141e9..e8d5763 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"
@@ -1,47 +1,33 @@
<template>
- <div id="index" ref="appRef">
- <div class="bg">
- <div class="myhead"></div>
- <dv-loading v-if="loading">Loading...</dv-loading>
- <div v-else class="host-body">
- <div class="d-flex jc-center" style="margin-top: 17px">
- <div class="d-flex jc-center">
- <div class="dv-dec-8"></div>
- <div class="title">
- <dv-decoration-11 class="title-text" style="
- font-size: 75px;
- color: #ffffff;
- width: 600px;
- height: 80px;
- line-height: 80px;
- margin-top: -30px;
- ">鐩� 鎺� 鏄� 绀�</dv-decoration-11>
- </div>
- </div>
- </div>
- <div class="react-right" style="margin-left: 1510px">
- <span class="text" style="width: 400px">{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span>
- </div>
- <div class="body-box">
+ <div id="index" ref="appRef">
+ <div class="bg">
+ <div class="myhead"></div>
+ <dv-loading v-if="loading">Loading...</dv-loading>
+ <div v-else class="host-body">
- <div class="content-box">
- <div class="boxOrderHeight"
- style="margin-left: 0px; display: flex; align-items: center; position: relative; width: 100%;">
- <span style="
+ <div class="react-right" style="margin-left: 1510px">
+ <span class="text" style="width: 400px">{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span>
+ </div>
+ <div class="body-box">
+
+ <div class="content-box">
+ <div class="boxOrderHeight"
+ style="margin-left: 0px; display: flex; align-items: center; position: relative; width: 100%;">
+ <span style="
width: 5px;
height: 40px;
background-color: #FF4500;
display: block;
"></span>
- <span style="
+ <span style="
padding-left: 15px;
- font-size: 50px;
+ font-size: 60px;
font-weight: bold;
color: #90EE90;
- ">绔嬪簱杈撻�佽建閬撳師绾镐俊鎭紙鍏� 鍗凤級</span>
- //鏃堕棿
- <div style="position: absolute; right: 20px;">
- <p style="
+ ">绔嬪簱杈撻�佽建閬撳師绾镐俊鎭紙鍏眥{showMsg}}鍗凤級</span>
+ //鏃堕棿
+ <div style="position: absolute; right: 20px;">
+ <p style="
display: inline-block;
font-size: 50px;
font-weight: bold;
@@ -49,39 +35,20 @@
margin: 0;
padding: 5px 15px;
">{{ currentTime }}</p>
- </div>
+ </div>
+ </div>
+ <!-- 宸ュ崟淇℃伅妯″潡 -->
+ <dv-border-box-8 :reverse="true"
+ style="width: 100%; height: 950px; margin-top: 5px; margin-left: auto; margin-right: auto;">
+ <dv-scroll-board :config="config" ref="scrollBoard"
+ style="width: 100%; height: 950px; padding: 5px" />
+ </dv-border-box-8>
+ </div>
+
+ </div>
</div>
- <!-- 宸ュ崟淇℃伅妯″潡 -->
- <dv-border-box-8 :reverse="true"
- style="width: 100%; height: 415px; margin-top: 5px; margin-left: auto; margin-right: auto;">
- <dv-scroll-board :config="config" ref="scrollBoard" style="width: 100%; height: 415px; padding: 5px" />
- </dv-border-box-8>
- </div>
- <div class="content-box">
- <div class="boxOrderHeight" style="margin-left: 0px; display: flex; align-items: center; position: relative; width: 100%;">
- <span style="
- width: 5px;
- height: 40px;
- background-color: #FF4500;
- display: block;
- "></span>
- <span style="
- padding-left: 15px;
- font-size: 50px;
- font-weight: bold;
- color: #90EE90;
- ">鎺掗櫎鍑哄簱鍘熺焊淇℃伅锛堝叡 鍗凤級</span>
- </div>
- <!-- 宸ュ崟淇℃伅妯″潡 -->
- <dv-border-box-8 :reverse="true"
- style="width: 100%; height: 415px; margin-top: 5px; margin-left: auto; margin-right: auto;">
- <dv-scroll-board :config="config" ref="scrollBoard" style="width: 100%; height: 415px; padding: 5px;" />
- </dv-border-box-8>
- </div>
</div>
- </div>
</div>
- </div>
</template>
<script>
@@ -93,178 +60,206 @@
// import{GetDateForLED} from "@/api/http.js"
export default {
- mixins: [drawMixin],
- data() {
- return {
- timing: null,
- loading: true,
- dateDay: null,
- dateYear: null,
- dateWeek: null,
- currentTime: '',
- 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>'
- ],
- 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: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>',
- ],
- ],
- 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: [350, 350, 200, 200, 250, 250, 350],
- rowNum: 4,
- align: ["center", "center", "center", "center", "center", "center", "center"],
- },
- IsDetail: true,
- OrderCreator: {},
- };
- },
- components: {
- centerView1,
- bottomView1,
- },
- mounted() {
- this.updateTime(); // 鍒濆鍖栨椂闂�
- this.timing = setInterval(() => {
- this.updateTime(); // 姣忕鏇存柊鏃堕棿
- }, 1000);
- this.cancelLoading();
- // this.GetOrderDetail();
- },
- beforeDestroy() {
- clearInterval(this.timing);
- },
- methods: {
- // 鏇存柊鍖椾含鏃堕棿
- updateTime() {
- const now = new Date();
- const year = now.getFullYear();
- const month = String(now.getMonth() + 1).padStart(2, '0');
- const day = String(now.getDate()).padStart(2, '0');
- const hours = String(now.getHours()).padStart(2, '0');
- const minutes = String(now.getMinutes()).padStart(2, '0');
- const seconds = String(now.getSeconds()).padStart(2, '0');
- const weekdays = ['鍛ㄦ棩', '鍛ㄤ竴', '鍛ㄤ簩', '鍛ㄤ笁', '鍛ㄥ洓', '鍛ㄤ簲', '鍛ㄥ叚'];
- const weekday = weekdays[now.getDay()];
+ mixins: [drawMixin],
+ data() {
+ return {
+ timing: null,
+ timeRequest: null,
+ loading: true,
+ dateDay: null,
+ dateYear: null,
+ dateWeek: null,
+ currentTime: '',
+ 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>'
+ ],
+ 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>',
+ ],
+ ],
+ 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: [380, 380, 180, 200, 200, 250, 250],
+ rowNum: 10,
+ align: ["center", "center", "center", "center", "center", "center", "center"],
+ },
+ IsDetail: true,
+ showMsg:""
+ };
+ },
+ components: {
+ centerView1,
+ bottomView1,
+ },
+ mounted() {
+ this.updateTime(); // 鍒濆鍖栨椂闂�
+ this.timing = setInterval(() => {
+ this.updateTime(); // 姣忕鏇存柊鏃堕棿
+ }, 1000);
+ this.cancelLoading();
+ this.GetOrderDetail();
+ },
+ beforeDestroy() {
+ clearInterval(this.timing);
+ clearInterval(this.timeRequest);
+ },
+ methods: {
+ // 鏇存柊鍖椾含鏃堕棿
+ updateTime() {
+ const now = new Date();
+ const year = now.getFullYear();
+ const month = String(now.getMonth() + 1).padStart(2, '0');
+ const day = String(now.getDate()).padStart(2, '0');
+ const hours = String(now.getHours()).padStart(2, '0');
+ const minutes = String(now.getMinutes()).padStart(2, '0');
+ const seconds = String(now.getSeconds()).padStart(2, '0');
+ const weekdays = ['鍛ㄦ棩', '鍛ㄤ竴', '鍛ㄤ簩', '鍛ㄤ笁', '鍛ㄥ洓', '鍛ㄤ簲', '鍛ㄥ叚'];
+ const weekday = weekdays[now.getDay()];
- this.currentTime = `${year}-${month}-${day} ${weekday} ${hours}:${minutes}:${seconds}`;
- },
- //鍒锋柊鏃堕棿
- timeFn() {
- this.timing = setInterval(() => {
- axios.post("/api/dt_WorkOrder/GetCurrentTime", null, "").then((x) => {
- if (x.data.status) {
- var data = x.data.data;
- this.dateDay = formatTime(data, "HH: mm: ss");
- this.dateYear = formatTime(data, "yyyy-MM-dd");
- }
- });
- }, 1000);
- },
- cancelLoading() {
- setTimeout(() => {
- this.loading = false;
- }, 1000);
- },
- GetOrderDetail() {
- axios.post("/api/dt_WorkOrder/getWorkOrderInfo", 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.OrderCreator = res.data.data;
- 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>'
- ],
- data: arr,
- waitTime: 10000,
- rowNum: 15,
- columnWidth: [75, 150, 110, 110],
- align: ["center", "center", "center", "center"]
- };
- } else {
- this.$refs["scrollBoard"].updateRows(arr)
- }
- if (this.IsDetail) {
- setInterval(() => {
- this.GetOrderDetail();
- }, 10000);
- this.IsDetail = false;
- }
+ this.currentTime = `${year}-${month}-${day} ${weekday} ${hours}:${minutes}:${seconds}`;
+ },
+ //鍒锋柊鏃堕棿
+ timeFn() {
+ this.timing = setInterval(() => {
+ axios.post("/api/dt_WorkOrder/GetCurrentTime", null, "").then((x) => {
+ if (x.data.status) {
+ var data = x.data.data;
+ this.dateDay = formatTime(data, "HH: mm: ss");
+ this.dateYear = formatTime(data, "yyyy-MM-dd");
+ }
+ });
+ }, 1000);
+ },
+ cancelLoading() {
+ setTimeout(() => {
+ this.loading = false;
+ }, 1000);
+ },
+ GetOrderDetail() {
+ axios.post("/api/OutLineView/GetOutLineView", null, "").then((res) => {
+ if (res.data.status) {
+ if (res.data.data == null) {
+ return;
+ }
+ this.showMsg=res.data.message
+
+ // 1. 鎸夌焊鍗锋潯鐮佸垎缁�
+ const groupedData = {};
+ res.data.data.forEach((x) => {
+ if (!groupedData[x.palletCode]) {
+ groupedData[x.palletCode] = [];
+ }
+ groupedData[x.palletCode].push(x);
+ });
+
+ // 2. 澶勭悊鏁版嵁锛氬皢姣忕粍鐩稿悓绾稿嵎鏉＄爜鐨勮褰曞悎骞朵负涓�鏉�
+ var arr = [];
+ Object.keys(groupedData).forEach((palletCode) => {
+ const group = groupedData[palletCode];
+ if (group.length === 0) return;
+
+ // 鍙栫涓�鏉¤褰曠殑鍩烘湰淇℃伅
+ const firstItem = group[0];
+ let totalOrderQuantity = 0;
+
+ // 缁熻鎸夌焊鍗锋潯鐮佸幓閲嶅悗鐨勫悎骞跺嵎鏁�
+ const uniquePalletCodes = new Set();
+ res.data.data.forEach((item) => {
+ if (item.palletCode) {
+ uniquePalletCodes.add(item.palletCode);
+ }
+ });
+ this.showMsg = uniquePalletCodes.size;
+
+ // 鐩存帴澶勭悊姣忔潯璁板綍锛屼笉杩涜鍒嗙粍
+ group.forEach((item) => {
+ totalOrderQuantity += parseFloat(item.orderQuantity) || 0;
+ });
+
+ // 澶勭悊涓婃満浣嶏細鍙樉绀烘渶鍚庝竴浣�
+ const machineName = firstItem.machineName;
+ const machineLastChar = machineName ? machineName.slice(-3) : '';
+
+ // 澶勭悊鏁板�硷細鍘婚櫎灏忔暟鐐�
+ const materialWide = parseInt(firstItem.materialWide) || 0;
+ const originalQuantity = parseInt(firstItem.originalQuantity) || 0;
+
+ // 鍚堝苟宸ュ崟鍙凤細鐢ㄩ�楀彿鍒嗛殧鏄剧ず鎵�鏈夊伐鍗曞彿
+ const orderNos = group.map(item => item.orderNo).join(', ');
+
+ // 鍒涘缓鍚堝苟鍚庣殑鍗曟潯璁板綍
+ var item = [
+ '<span style="color:#FF4500; font-size:85px;">' + 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>',
+ ];
+ arr.push(item);
+ });
+ if (this.IsDetail) {
+ this.config = {
+ header: [
+ '<span style="font-size:63px;">绾稿嵎鏉＄爜</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>'
+ ],
+ data: arr,
+ 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: [550, 200, 250, 250, 250, 300],
+ rowNum: 10,
+ align: ["center", "center", "center", "center", "center", "center", "center"],
+ };
+ } else {
+ this.$refs["scrollBoard"].updateRows(arr)
+ }
+ if (this.IsDetail) {
+ this.timeRequest = setInterval(() => {
+ this.GetOrderDetail();
+ }, 10000);
+ this.IsDetail = false;
+ }
+ }
+ });
}
- });
- }
- },
+ },
};
</script>
@@ -274,60 +269,59 @@
<style lang="css" scoped>
.myhead {
- position: absolute;
- width: 100%;
- height: 100px;
- /* background-color: red; */
- top: 0;
- left: 0;
- z-index: 999;
- background-image: url("../assets/head_bg1.png");
- background-size: cover;
- background-position: center center;
+ position: absolute;
+ width: 100%;
+ height: 100px;
+ /* background-color: red; */
+ top: 0;
+ left: 0;
+ z-index: 999;
+ background-size: cover;
+ background-position: center center;
}
.b-color {
- width: 1420px;
+ width: 1420px;
}
.boxOrderHeight {
- height: 40px;
- line-height: 40px;
- width: 400px;
- display: flex;
+ height: 40px;
+ line-height: 40px;
+ width: 400px;
+ display: flex;
}
.body-box {
- display: flex;
- flex-direction: column;
- gap: 20px;
- padding: 0 20px;
+ display: flex;
+ flex-direction: column;
+ gap: 20px;
+ padding: 0 20px;
}
.content-box {
- width: 100%;
+ width: 100%;
}
.rows {
- display: flex;
- background-color: rgb(0, 0, 0);
- color: #fff;
- height: 30px;
- line-height: 30px;
- font-size: 18px;
+ display: flex;
+ background-color: rgb(0, 0, 0);
+ color: #fff;
+ height: 30px;
+ line-height: 30px;
+ font-size: 18px;
}
.cell {
- width: 160px;
- border-right: #fff 1px solid;
- text-align: center;
+ width: 160px;
+ border-right: #fff 1px solid;
+ text-align: center;
}
.bodys {
- display: flex;
- background-color: rgb(0, 59, 81);
- color: #fff;
- height: 32px;
- line-height: 40px;
+ display: flex;
+ background-color: rgb(0, 59, 81);
+ color: #fff;
+ height: 32px;
+ line-height: 40px;
}
</style>
\ No newline at end of file
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;
}
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