From f8d966a211fdbc55b485b11f27013b1ba0ecabba Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 26 九月 2023 15:37:27 +0800
Subject: [PATCH] 下发参数 提示成功样式改版 增加倒计时3s自动关闭弹框+错误提示 限制3s 关闭+工序完成不可操作

---
 src/views/visualization.vue |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 476ee6c..aa8ee94 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -1,8 +1,8 @@
 
 <template>
   <div class="home">
-    <!--  -->
-    <template v-if="Tasks&&Tasks.length>0">
+    <!-- v-if="Tasks&&Tasks.length>0" -->
+    <template >
       <div class="left">
         <p class="title">
           <template v-if="Number(ChannelAmount)>1">
@@ -312,7 +312,7 @@
                       </div>
                       <div class="card_top-2">
                         <div style="line-height: 45px; text-align: center">
-                          鐢熶骇涓�
+                          {{ taskData.Procedure.Status==3?'鐢熶骇瀹屾垚':'鐢熶骇涓�' }}
                         </div>
                         <!-- <span class="card-top-r-t">瀹屾垚杩涘害锛�50%</span>
                           <span class="card-top-r-b">12鏈�28鏃� 08:24</span> -->
@@ -359,6 +359,7 @@
                     <el-button
                       type="primary"
                       size="mini"
+                      :disabled="taskData.Procedure.Status==3?true:false"
                       class="color_f70f83"
                       @click="finishClick(index, taskData)"
                     >
@@ -512,7 +513,7 @@
       </div>
     </template>
     <!--  -->
-    <template v-else>
+    <!-- <template v-else>
       <div class="home-img-box">
         <div class="bg-title">
           <img src="../../public/bg-title.png" />
@@ -543,7 +544,7 @@
         </div>
       </div>
       
-    </template>
+    </template> -->
     <!-- 鎺у埗鐨勫脊妗� -->
     <AddControl ref="control" :Arr="Arr" />
     <!-- 鎺у埗鐨勫脊妗� -->
@@ -716,7 +717,11 @@
         this.getStartArr()
         this.$refs.control.islook=true
       }else{
-        this.$message.error('鐩墠娌℃湁浠诲姟锛�')
+        this.$message({
+          message:'鐩墠娌℃湁浠诲姟锛�',
+          type: 'error',
+          duration: 3 * 1000
+        })
       }
     },
     isTip(val){
@@ -958,15 +963,15 @@
                 }, 3000);
           }
         }
-        if (res.code != 200 || this.TasksCopy.length == 0) {
-          this.getcountdown();
-          // 鎺у埗閲嶆柊璇锋眰getTaskInfo, 鍙紑鍚竴涓畾鏃跺櫒
-          if (!this.cutdownTimer) {
-            this.cutdownTimer = setInterval(() => {
-              this.getcountdown();
-            }, 60000);
-          }
-        }
+        // if (res.code != 200 || this.TasksCopy.length == 0) {
+        //   this.getcountdown();
+        //   // 鎺у埗閲嶆柊璇锋眰getTaskInfo, 鍙紑鍚竴涓畾鏃跺櫒
+        //   if (!this.cutdownTimer) {
+        //     this.cutdownTimer = setInterval(() => {
+        //       this.getcountdown();
+        //     }, 60000);
+        //   }
+        // }
         this.cutClick(1)
       });
       // this.TasksCopy.push(object)

--
Gitblit v1.8.0