From 9ccfd089b6cac9f8ba0cb7cadfee01857a715f0d Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期六, 12 十月 2024 10:34:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/SimulatAssess.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/web/src/views/modules/taskReliability/SimulatAssess.vue b/web/src/views/modules/taskReliability/SimulatAssess.vue
index 692e6b2..752e256 100644
--- a/web/src/views/modules/taskReliability/SimulatAssess.vue
+++ b/web/src/views/modules/taskReliability/SimulatAssess.vue
@@ -118,12 +118,9 @@
this.taskList = res.data
},
getStroke() {
- //console.log('getStroke:',this.progress.start,"锛�",this.progress.speed)
if (this.percentage < 100) {
- //console.log('getStroke2')
this.$http.get(`/taskReliability/SimulatAssess/getCalcProgress?taskId=${this.dataForm.id}`).then(
res => {
- // console.log(res.data, 'res.data')
if (res.data) {
this.percentage = parseFloat(res.data)
}
@@ -140,7 +137,11 @@
this.dataForm.id = result.data
let res = await this.$http.post('/taskReliability/SimulatAssess/analyze', this.dataForm)
if (res.success) {
- this.timers = window.setInterval(this.getStroke, 1000)
+ let chkResult = res.data
+ console.log(chkResult)
+ if (chkResult.length == 0) {
+ this.timers = window.setInterval(this.getStroke, 1000)
+ }
}
}
}
--
Gitblit v1.9.1