From b0f14528e49fcfb6d486bf1e920f0457cbac6049 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期六, 18 十一月 2023 14:32:43 +0800
Subject: [PATCH] 没有任务的时候如果plc有数据也需要显示百分比和老看板保持一致

---
 src/views/dashboard/components/ProcessingInfo.vue |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/dashboard/components/ProcessingInfo.vue b/src/views/dashboard/components/ProcessingInfo.vue
index a466947..155eb59 100644
--- a/src/views/dashboard/components/ProcessingInfo.vue
+++ b/src/views/dashboard/components/ProcessingInfo.vue
@@ -92,19 +92,18 @@
  * 璁$畻瀹屾垚杩涘害, 浠诲姟鐘舵�佹湭鐢熶骇鍥哄畾涓� 0% 宸插畬鎴愬浐瀹氫负 100% 鐢熶骇涓垯浠巔lc鑾峰彇
  */
 const processingPercent = computed(() => {
-  if (task?.value?.Procedure?.Status === 1) {
-    return 0
-  }
+  // if (task?.value?.Procedure?.Status === 1) {
+  //   return 0
+  // }
 
   if (task?.value?.Procedure?.Status === 3) {
     return 100
   }
-
-  if (task?.value?.Procedure?.Status === 2) {
+  if (task?.value?.Procedure?.Status === 2 || task?.value?.Procedure?.Status === 1) {
     return calculateProgress(plcStore.plcInfo as Statistics)
   }
 
-  return 0
+  return calculateProgress(plcStore.plcInfo as Statistics)
 })
 
 /**

--
Gitblit v1.8.0