From 291067c13bfe8fb9c876e3764a828dc3ddd22f99 Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期一, 17 十一月 2025 16:50:12 +0800
Subject: [PATCH] 监控优化，代码功能优化
---
代码管理/WCS/WIDESEAWCS_Client/src/views/deviceMonitoring/InkWarehouse.vue | 296 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 223 insertions(+), 73 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/deviceMonitoring/InkWarehouse.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/deviceMonitoring/InkWarehouse.vue"
index dbc0396..e0072ba 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/deviceMonitoring/InkWarehouse.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/deviceMonitoring/InkWarehouse.vue"
@@ -1,95 +1,127 @@
<template>
<div id="title">
<div id="bkuang" style="border-top: none">
+ <!-- YM浠撳爢鍨涙満鐘舵�侀潰鏉� -->
<div class="skuang">
<div class="zhuname">娌瑰ⅷ浠撳爢鍨涙満</div>
<div class="zhankuang">
<div class="xname">鍫嗗灈鏈虹姸鎬�:</div>
- <div class="xzhi" :title="data.R_YM_Status">{{ data.R_YM_Status }}</div>
+ <div class="xzhi" :title="ymData.R_YM_Status">{{ ymData.R_YM_Status || '-' }}</div>
</div>
<div class="zhankuang">
<div class="xname">鍫嗗灈鏈烘墜鑷姩鐘舵��:</div>
- <div class="xzhi" :title="data.R_YM_AutoStatus">{{ data.R_YM_AutoStatus }}</div>
+ <div class="xzhi" :title="ymData.R_YM_AutoStatus">{{ ymData.R_YM_AutoStatus || '-' }}</div>
</div>
<div class="zhankuang">
<div class="xname">姝ｅ湪鎵ц鐨勪换鍔″彿:</div>
- <div class="xzhi" :title="data.R_YM_TaskNum">{{ data.R_YM_TaskNum }}</div>
+ <div class="xzhi" :title="ymData.R_YM_TaskNum">{{ ymData.R_YM_TaskNum || '-' }}</div>
</div>
<div class="zhankuang">
<div class="xname">鍫嗗灈鏈哄伐浣滅姸鎬�:</div>
- <div class="xzhi" :title="data.R_YM_WorkStatus">{{ data.R_YM_WorkStatus }}</div>
+ <div class="xzhi" :title="ymData.R_YM_WorkStatus">{{ ymData.R_YM_WorkStatus || '-' }}</div>
</div>
<div class="zhankuang">
<div class="xname">浣滀笟绫诲瀷:</div>
- <div class="xzhi" :title="data.R_YM_WorkType">{{ data.R_YM_WorkType }}</div>
+ <div class="xzhi" :title="ymData.R_YM_WorkType">{{ ymData.R_YM_WorkType || '-' }}</div>
</div>
<div class="zhankuang">
<div class="xname">鎵樼洏绫诲瀷:</div>
- <div class="xzhi" :title="data.R_YM_TrayType">{{ data.R_YM_TrayType }}</div>
+ <div class="xzhi" :title="ymData.R_YM_TrayType">{{ ymData.R_YM_TrayType || '-' }}</div>
+ </div>
+ <!-- 鏂板锛氬綋鍓嶆墍鍦ㄥ垪鏄剧ず -->
+ <div class="zhankuang">
+ <div class="xname">褰撳墠鎵�鍦ㄥ垪:</div>
+ <div class="xzhi" :title="ymData.R_YM_Column">{{ ymData.R_YM_Column || '鏈煡' }}</div>
</div>
</div>
+
+ <!-- YM鍏宠仈绔欏彴锛堝嚭鍏ュ簱9001锛� -->
<div class="skuang">
<div class="zhuname">鍑哄叆搴�9001绔欏彴</div>
<div class="zhankuang">
<div class="xname">鏈夎揣(璇�):</div>
- <div class="xzhi" :title="data.R_YM_Tray1">{{ data.R_YM_Tray1 }}</div>
+ <div class="xzhi" :title="ymData.R_YM_Tray1">{{ ymData.R_YM_Tray1 || '-' }}</div>
</div>
<div class="zhankuang">
<div class="xname">鍏ュ簱鎵ц涓�(璇�):</div>
- <div class="xzhi" :title="data.R_YM_Inbounding1">{{ data.R_YM_Inbounding1 }}</div>
+ <div class="xzhi" :title="ymData.R_YM_Inbounding1">{{ ymData.R_YM_Inbounding1 || '-' }}</div>
</div>
<div class="zhankuang">
<div class="xname">鎻愬崌鏈虹┖闂�(璇�):</div>
- <div class="xzhi" :title="data.R_YM_Leisure1">{{ data.R_YM_Leisure1 }}</div>
+ <div class="xzhi" :title="ymData.R_YM_Leisure1">{{ ymData.R_YM_Leisure1 || '-' }}</div>
</div>
<div class="zhankuang">
<div class="xname">鍑哄簱鎵ц涓�(璇�):</div>
- <div class="xzhi" :title="data.R_YM_Outbounding1">{{ data.R_YM_Outbounding1 }}</div>
+ <div class="xzhi" :title="ymData.R_YM_Outbounding1">{{ ymData.R_YM_Outbounding1 || '-' }}</div>
</div>
<div class="zhankuang">
<div class="xname">鐢宠鍏ュ簱(鍐�):</div>
- <div class="xzhi" :title="data.W_YM_RequestIn1">{{ data.W_YM_RequestIn1 }}</div>
+ <div class="xzhi" :title="ymData.W_YM_RequestIn1">{{ ymData.W_YM_RequestIn1 || '-' }}</div>
</div>
<div class="zhankuang">
<div class="xname">鐢宠鍑哄簱(鍐�):</div>
- <div class="xzhi" :title="data.W_YM_RequestOut1">{{ data.W_YM_RequestOut1 }}</div>
+ <div class="xzhi" :title="ymData.W_YM_RequestOut1">{{ ymData.W_YM_RequestOut1 || '-' }}</div>
</div>
</div>
-
+
+ <!-- YM鍏宠仈绔欏彴锛堝嚭鍏ュ簱9002锛� -->
<div class="skuang">
<div class="zhuname">鍑哄叆搴�9002绔欏彴</div>
<div class="zhankuang">
<div class="xname">鏈夎揣(璇�):</div>
- <div class="xzhi" :title="data.R_YM_Tray2">{{ data.R_YM_Tray2 }}</div>
+ <div class="xzhi" :title="ymData.R_YM_Tray2">{{ ymData.R_YM_Tray2 || '-' }}</div>
</div>
<div class="zhankuang">
<div class="xname">鍏ュ簱鎵ц涓�(璇�):</div>
- <div class="xzhi" :title="data.R_YM_Inbounding2">{{ data.R_YM_Inbounding2 }}</div>
+ <div class="xzhi" :title="ymData.R_YM_Inbounding2">{{ ymData.R_YM_Inbounding2 || '-' }}</div>
</div>
<div class="zhankuang">
<div class="xname">鎻愬崌鏈虹┖闂�(璇�):</div>
- <div class="xzhi" :title="data.R_YM_Leisure2">{{ data.R_YM_Leisure2 }}</div>
+ <div class="xzhi" :title="ymData.R_YM_Leisure2">{{ ymData.R_YM_Leisure2 || '-' }}</div>
</div>
<div class="zhankuang">
<div class="xname">鍑哄簱鎵ц涓�(璇�):</div>
- <div class="xzhi" :title="data.R_YM_Outbounding2">{{ data.R_YM_Outbounding2 }}</div>
+ <div class="xzhi" :title="ymData.R_YM_Outbounding2">{{ ymData.R_YM_Outbounding2 || '-' }}</div>
</div>
<div class="zhankuang">
<div class="xname">鐢宠鍏ュ簱(鍐�):</div>
- <div class="xzhi" :title="data.W_YM_RequestIn2">{{ data.W_YM_RequestIn2 }}</div>
+ <div class="xzhi" :title="ymData.W_YM_RequestIn2">{{ ymData.W_YM_RequestIn2 || '-' }}</div>
</div>
<div class="zhankuang">
<div class="xname">鐢宠鍑哄簱(鍐�):</div>
- <div class="xzhi" :title="data.W_YM_RequestOut2">{{ data.W_YM_RequestOut2 }}</div>
+ <div class="xzhi" :title="ymData.W_YM_RequestOut2">{{ ymData.W_YM_RequestOut2 || '-' }}</div>
</div>
</div>
</div>
+
+ <!-- 鏂板锛氬爢鍨涙満褰撳墠鍒楁枃瀛楁樉绀� -->
+ <div id="ym-nowcolumn" :class="{ 'abnormal-column': ymData.R_YM_Status !== '姝ｅ父' }">
+ <div>娌瑰ⅷ鍫嗗灈鏈哄綋鍓嶆墍鍦ㄥ垪:
+ <span :title="ymData.R_YM_Column">{{ ymData.R_YM_Column || '鏈煡' }}</span>
+ </div>
+ </div>
+ <!-- 鏂板锛氬垪鏂规牸灞曠ず鍖哄煙 -->
+ <div class="ym-column-container" :class="{ 'pp-status-abnormal': ymData.R_YM_Status !== '姝ｅ父' }">
+ <!-- 涓婃柟1-24鍒� -->
+ <div class="column-grid-container">
+ <div
+ v-for="num in 32"
+ :key="num"
+ class="column-grid-item"
+ :class="{ 'active': num == ymData.R_YM_Column }"
+ :title="`鍒楀彿: ${num}`"
+ >
+ {{ num }}
+ </div>
+ </div>
+
+ </div>
</div>
</template>
<script>
-import { ref, nextTick } from "vue";
+import { ref, nextTick, watch, onUnmounted } from "vue";
import { useStore } from "vuex";
import { onMounted } from "vue";
@@ -99,18 +131,20 @@
xuan: 0
};
},
- methods: {
- },
setup() {
const store = useStore();
- const data = ref({});
+ const ymData = ref({});
- // 1. 瀹氫箟鏅�氬瓧娈电殑鏄犲皠瑙勫垯
- const statusMap = {
+ const UPDATE_DELAY = 300;
+ let updateTimer = null;
+
+ // YM鏁版嵁鏄犲皠瑙勫垯锛堟柊澧炲垪鍙峰鐞嗭級
+ const ymStatusMap = {
R_YM_Status: {
- 1: "姝ｅ父",
- 2: "鏁呴殰",
- 3: "鎬ュ仠",
+ 0: "姝ｅ父",
+ 1: "鏁呴殰",
+ 2: "鎬ュ仠",
+ 3: "鏈煡"
},
R_YM_AutoStatus: {
0: "缁翠慨",
@@ -139,71 +173,115 @@
2: "涓墭鐩�(2)",
3: "澶ф墭鐩�(3)",
4: "鐗瑰ぇ鎵樼洏(4)",
+ },
+ // 鏂板锛氬垪鍙锋槧灏勫鐞�
+ R_YM_Column: (val) => val !== undefined ? val : "鏈煡"
+ };
+
+ // YM瀛楁鍒嗙粍
+ const ymFieldGroups = {
+ statusFields: {
+ keys: [
+ "R_YM_Tray1", "R_YM_Inbounding1", "R_YM_Leisure1", "R_YM_Outbounding1",
+ "R_YM_Tray2", "R_YM_Inbounding2", "R_YM_Leisure2", "R_YM_Outbounding2"
+ ],
+ map: { true: "鏄�", false: "鍚�" }
+ },
+ requestFields: {
+ keys: [
+ "W_YM_RequestIn1", "W_YM_RequestOut1",
+ "W_YM_RequestIn2", "W_YM_RequestOut2"
+ ],
+ map: { true: "鏄�", false: "鍚�" }
}
};
- // 2. 瀹氫箟闇�瑕佸叡鐢ㄦ槧灏勮鍒欑殑瀛楁鍒楄〃鍜屽搴旂殑鏄犲皠瑙勫垯
- const booleanFields = [
- "R_YM_Tray1", "R_YM_Inbounding1",
- "R_YM_Leisure1", "R_YM_Outbounding1",
- "W_YM_RequestIn1", "W_YM_RequestOut1",
- "R_YM_Tray2", "R_YM_Inbounding2",
- "R_YM_Leisure2", "R_YM_Outbounding2",
- "W_YM_RequestIn2", "W_YM_RequestOut2",
- ];
- const booleanMap = {
- true: "鏄�",
- false: "鍚�"
+ // 澶勭悊YM鍘熷鏁版嵁锛堝寘鍚垪鍙峰鐞嗭級
+ const processYMData = (rawData) => {
+ if (!rawData) return {};
+ const processedData = { ...rawData };
+
+ // 澶勭悊鏍稿績鐘舵�佸瓧娈�
+ Object.keys(ymStatusMap).forEach(key => {
+ if (processedData.hasOwnProperty(key)) {
+ const mapper = ymStatusMap[key];
+ processedData[key] = typeof mapper === 'function'
+ ? mapper(processedData[key])
+ : (mapper[processedData[key]] || processedData[key]);
+ }
+ });
+
+ // 澶勭悊鍒嗙粍瀛楁
+ Object.values(ymFieldGroups).forEach(group => {
+ group.keys.forEach(key => {
+ if (processedData.hasOwnProperty(key)) {
+ processedData[key] = group.map[processedData[key]] || processedData[key];
+ }
+ });
+ });
+
+ return processedData;
};
- // 澶勭悊鏁版嵁锛屽厛澶勭悊鏅�氭槧灏勶紝鍐嶆壒閲忓鐞嗗叡鐢ㄦ槧灏勭殑瀛楁
- const processData = (rawData) => {
- if (!rawData) return {};
- const processed = { ...rawData };
+ // 寤惰繜鏇存柊YM鏁版嵁
+ const delayedUpdateYMData = (newRawData) => {
+ if (updateTimer) {
+ clearTimeout(updateTimer);
+ }
- // 澶勭悊鏅�氬瓧娈垫槧灏�
- Object.keys(statusMap).forEach(key => {
- if (processed.hasOwnProperty(key)) {
- const map = statusMap[key];
- processed[key] = map[processed[key]] || processed[key];
+ updateTimer = setTimeout(() => {
+ if (newRawData && newRawData.R_YM_Status !== undefined) {
+ ymData.value = processYMData(newRawData);
+
+ // 鏇存柊鏍峰紡
+ nextTick(() => {
+ const valueElements = document.getElementsByClassName("xzhi");
+ for (let i = 0; i < valueElements.length; i++) {
+ if (valueElements[i].innerHTML === "鏄�") {
+ valueElements[i].style.color = "yellow";
+ } else if (valueElements[i].innerHTML === "鍚�") {
+ valueElements[i].style.color = "red";
+ }
+ }
+ });
}
- });
-
- // 鎵归噺澶勭悊鍏辩敤鏄犲皠瑙勫垯鐨勫瓧娈�
- booleanFields.forEach(key => {
- if (processed.hasOwnProperty(key)) {
- processed[key] = booleanMap[processed[key]] || processed[key];
- }
- });
-
- return processed;
+ }, UPDATE_DELAY);
};
onMounted(() => {
- nextTick(() => {
- setInterval(() => {
- const rawData = store.state.homedata;
- data.value = processData(rawData);
- const xian = document.getElementsByClassName("xzhi");
- for (let i = 0; i < xian.length; i++) {
- if (xian[i].innerHTML === "鏄�") {
- xian[i].style.color = "yellow";
- } else if (xian[i].innerHTML === "鍚�") {
- xian[i].style.color = "red";
- }
+ const initialData = store.state.homedata;
+ if (initialData && initialData.R_YM_Status !== undefined) {
+ ymData.value = processYMData(initialData);
+ }
+
+ const unwatch = watch(
+ () => store.state.homedata,
+ (newData) => {
+ if (newData && newData.R_YM_Status !== undefined) {
+ delayedUpdateYMData(newData);
}
- });
+ },
+ { deep: true }
+ );
+
+ // 缁勪欢鍗歌浇鏃舵竻鐞�
+ onUnmounted(() => {
+ unwatch();
+ if (updateTimer) {
+ clearTimeout(updateTimer);
+ }
});
});
return {
- data,
+ ymData
};
}
};
</script>
<style scoped>
+/* 鍘熸湁鏍峰紡淇濇寔涓嶅彉 */
.ding {
float: left;
width: 20px;
@@ -340,4 +418,76 @@
margin-left: 1.7%;
border-radius: 10px;
}
-</style>
+
+/* 鏂板锛歒M鍫嗗灈鏈哄綋鍓嶅垪鏍峰紡 */
+#ym-nowcolumn {
+ width: 100%;
+ height: 70px;
+ float: left;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 1.5cqw;
+ font-weight: bold;
+ color: #00ff4c;
+}
+
+/* 寮傚父鐘舵�佹枃瀛楀彉鑹� */
+#ym-nowcolumn.abnormal-column {
+ color: red !important;
+}
+#ym-nowcolumn.abnormal-column span {
+ color: red !important;
+}
+
+/* 鍒楀鍣ㄦ牱寮� */
+.ym-column-container {
+ width: 95%;
+ margin: 0 auto;
+ position: relative;
+ clear: both;
+ padding-top: 15px;
+}
+
+/* 鏂规牸瀹瑰櫒鏍峰紡 */
+.column-grid-container {
+ width: 100%;
+ display: flex;
+ flex-wrap: nowrap;
+ justify-content: space-between;
+ align-items: center;
+ gap: 2px;
+ position: relative;
+ z-index: 2;
+ margin-bottom: 10px;
+ padding: 0 2px;
+}
+
+/* 鏂规牸鏍峰紡 */
+.column-grid-item {
+ flex: 1;
+ min-width: 24px;
+ max-width: 60px;
+ height: 30px;
+ border: 1px solid #fff;
+ border-radius: 8px 8px 0 0;
+ color: white;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: clamp(8px, 1vw, 14px);
+ box-sizing: border-box;
+ transition: background-color 0.3s ease;
+}
+
+/* 褰撳墠鍒楅珮浜� */
+.column-grid-item.active {
+ background-color: green;
+ font-weight: bold;
+}
+
+/* 寮傚父鐘舵�佷笅褰撳墠鍒楃孩鑹查珮浜� */
+.pp-status-abnormal .column-grid-item.active {
+ background-color: red !important;
+}
+</style>
\ No newline at end of file
--
Gitblit v1.9.3