From 5eeac2be08383953337d3789a8d442c21303bb54 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 28 八月 2023 15:25:05 +0800
Subject: [PATCH] 周六的代码更新对比 合并 2023-8-28
---
public/confirm3.png | 0
src/views/visualization.vue | 20 ++++++++++++++------
src/components/AddIssue.vue | 7 +++++--
3 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/public/confirm3.png b/public/confirm3.png
index 8c37905..59acad2 100644
--- a/public/confirm3.png
+++ b/public/confirm3.png
Binary files differ
diff --git a/src/components/AddIssue.vue b/src/components/AddIssue.vue
index ae10aa1..734943d 100644
--- a/src/components/AddIssue.vue
+++ b/src/components/AddIssue.vue
@@ -167,6 +167,7 @@
showBtn:1,
num:0,
timer:null,
+
};
},
mounted() {
@@ -200,8 +201,10 @@
this.shutdown();
},
getInfo() {
- if (Object.keys(this.taskData).length > 0 && this.taskData.Procedure.ID) {
- this.islook=true
+ if (Object.keys(this.taskData).length > 0 && this.taskData.Procedure.ID && this.taskData.Procedure.Status == 1) {
+ this.num=0;
+ this.showBtn= 1;
+ this.islook=true;
}else{
this.islook=false;
}
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 9697ba8..25dbbbf 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -531,6 +531,9 @@
countDownHour:0,
countDownMinute:0,
Arr:[],
+ // 璁板綍瀹氭椂鍣ㄧ姸鎬�
+ procInfoTimer:null,
+ cutdownTimer: null
};
},
mounted() {
@@ -695,9 +698,11 @@
}
});
this.getProgressInfo();
- setInterval(() => {
- this.getProgressInfo();
- }, 6000);
+ if (!this.procInfoTimer) {
+ this.procInfoTimer = setInterval(() => {
+ this.getProgressInfo();
+ }, 6000);
+ }
}
console.log(this.procedureList, "===1111procedureList");
// setTimeout(() => {
@@ -708,9 +713,12 @@
}
if(res.code!=200||!this.taskData.Procedure.ID){
this.getcountdown();
- setInterval(() => {
- this.getcountdown();
- }, 60000);
+ // 鎺у埗閲嶆柊璇锋眰getTaskInfo, 鍙紑鍚竴涓畾鏃跺櫒
+ if (!this.cutdownTimer) {
+ this.cutdownTimer = setInterval(() => {
+ this.getcountdown();
+ }, 60000);
+ }
}
});
},
--
Gitblit v1.8.0