From d8cb08ce6b68b50d2475b70eb522ea6bbbb17686 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 24 七月 2024 15:26:12 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java | 6 +++---
web/src/views/modules/taskReliability/SimulatAssess.vue | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
index b12fc35..fa81fd7 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
@@ -45,7 +45,7 @@
@Api(tags = "simulat_assess")
public class SimulatAssessController {
private static final Logger logger = LoggerFactory.getLogger(SimulatAssessController.class);
- private static final String taskTypeProgress = "calcreq";
+ private static final String taskTypeProgress = "calcprog";
@Autowired
private RedisTemplate redisTemplate;
@@ -117,11 +117,11 @@
}
@GetMapping("getCalcProgress")
- public String getCalcProgress(Long taskId) {
+ public Result getCalcProgress(Long taskId) {
String key = taskId.toString() + taskTypeProgress;
String progress = (String)redisTemplate.opsForValue().get(key);
if (progress==null) progress = "0";
- return progress;
+ return Result.ok(progress);
}
@PutMapping
diff --git a/web/src/views/modules/taskReliability/SimulatAssess.vue b/web/src/views/modules/taskReliability/SimulatAssess.vue
index 6bf4ed9..55d2a39 100644
--- a/web/src/views/modules/taskReliability/SimulatAssess.vue
+++ b/web/src/views/modules/taskReliability/SimulatAssess.vue
@@ -123,7 +123,8 @@
//console.log('getStroke2')
this.$http.get(`/taskReliability/SimulatAssess/getCalcProgress?taskId=${this.dataForm.id}`).then(
res => {
- if (res.success) {
+ // console.log(res.data, 'res.data')
+ if (res.data) {
this.percentage = parseFloat(res.data)
}
}
--
Gitblit v1.9.1