From e6814c5f045563d45308bce9efd4d4590a5ebd2a Mon Sep 17 00:00:00 2001 From: Zhao Zhao Shen Date: Mon, 10 Mar 2025 15:10:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=82=B9=E6=A3=80=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E5=88=A4=E6=96=AD=20&=20=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Dashboard/index.vue | 4 ++-- src/views/Inspection/index.vue | 24 +++++++++++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/views/Dashboard/index.vue b/src/views/Dashboard/index.vue index c164729..466520c 100644 --- a/src/views/Dashboard/index.vue +++ b/src/views/Dashboard/index.vue @@ -64,7 +64,7 @@ {{ processForm_uht.mixerStep }} -
+
累计流量: {{ processForm_uht.totalTraffic }} @@ -144,7 +144,7 @@ {{ processForm_pulp.mixerStep }}
-
+
累计流量: {{ processForm_pulp.totalTraffic }} diff --git a/src/views/Inspection/index.vue b/src/views/Inspection/index.vue index ad28371..fec0cd9 100644 --- a/src/views/Inspection/index.vue +++ b/src/views/Inspection/index.vue @@ -58,7 +58,10 @@
- +
{{ item.label }} {{ item.unit || '--' }} @@ -144,7 +147,7 @@ const hours = computed(() => { hours.push(`${i < 10 ? '0' : ''}${i}:00`); // 白班 07:00-18:00 } } else { - for (let i = 19; i <= 23; i++) { + for (let i = 19; i <= 23;i++) { hours.push(`${i}:00`); // 晚班 19:00-23:00 } for (let i = 0; i <= 6; i++) { @@ -183,7 +186,14 @@ const handleInspection = (hour, index) => { // 校验是否已经确认异常数据 if (hourCheckValid.value[hour] !== 1) { console.log("🚀 ~ handleInspection ~ hourCheckValid.value[hour]:", hourCheckValid.value[hour]) - showWarningMessage('存在异常数据,无法执行点检操作!'); + showWarningMessage('存在设备异常,无法执行点检操作!'); + return; + } + + console.log("🚀 ~ handleInspection ~ inspectionItems.value:", inspectionItems.value) + // 校验这个时刻这一列有咩有报警未处理的数据,也就是checkStatus为0的数据 + if (inspectionItems.value.some(item => item.data[hour]?.checkStatus === 0)) { + showWarningMessage('存在报警数据未处理,无法执行点检操作!'); return; } @@ -566,6 +576,7 @@ onUnmounted(() => { /* 这里是因为它tm组件里的,还用的好像是webcomponent,但是tmd不对外提供修改的东西,好在有个css颜色变量可以修改 */ --theme-event-item--background: #23233C; /* --theme-event-item--background--hover: blue; */ + /* --theme-color-success */ } .testbg1 { @@ -616,4 +627,11 @@ onUnmounted(() => { background-color: red; cursor: pointer; } + +.highlight-cell-title { + --theme-color-success: orange; +} +.alarm-cell-title { + --theme-color-success: red; +}