From f76e09f832e71b29c7b7771c1d0aaa5858f9a20f Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 09 十月 2024 15:49:37 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 7 ++++++-
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/TimeDiagramDto.java | 1 +
web/src/views/modules/taskReliability/TimeDiagram.vue | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/TimeDiagramDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/TimeDiagramDto.java
index 1f9ab9b..27b93b7 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/TimeDiagramDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dto/TimeDiagramDto.java
@@ -9,4 +9,5 @@
private double minPointNum;
private String smallDiagramJson;
private String diagramJson;
+ private String textDiagramJson;
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
index f065467..fc4a743 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
@@ -182,6 +182,9 @@
JSONObject jsonObject = new JSONObject(templetStr);
JSONArray jsonArray = jsonObject.getJSONArray("cells");
+ JSONObject jsonObject3 = new JSONObject(templetStr);
+ JSONArray jsonArray3 = jsonObject3.getJSONArray("cells");
+
this.getPetsInfo();
double x1 = 0;
double x2 = 0;
@@ -237,12 +240,13 @@
jsonArray.add(lineJson);
}
lineArray.add(statusDtoList);
+
JSONObject textJson = new JSONObject(templetsStrMap.get("text"));
JsonUtils2.setJsonValueByPath(textJson, "id".split("/"), UUIDUtil.generateId().toString());
JsonUtils2.setJsonValueByPath(textJson, "attrs/label/textWrap/text".split("/"), dto.getName());
JsonUtils2.setJsonValueByPath(textJson, "position/x".split("/"), 20);
JsonUtils2.setJsonValueByPath(textJson, "position/y".split("/"), y - 15);
- jsonArray.add(textJson);
+ jsonArray3.add(textJson);
}
//闃舵妯″瀷鍙婂埢搴�
@@ -407,6 +411,7 @@
}
timeDiagramDto.setDiagramJson(jsonObject.toString());
timeDiagramDto.setSmallDiagramJson(jsonObject2.toString());
+ timeDiagramDto.setTextDiagramJson(jsonObject3.toString());
return timeDiagramDto;
}
diff --git a/web/src/views/modules/taskReliability/TimeDiagram.vue b/web/src/views/modules/taskReliability/TimeDiagram.vue
index bb2e113..0505f72 100644
--- a/web/src/views/modules/taskReliability/TimeDiagram.vue
+++ b/web/src/views/modules/taskReliability/TimeDiagram.vue
@@ -549,7 +549,7 @@
this.dataForm.simulatFrequency = result.data.simulatFrequency
},
async onTreeSelected(data) {
- this.getDiagram(data.id)
+ await this.getDiagram(data.id)
},
async getDiagram(productId) {
this.graph.unfreeze()
--
Gitblit v1.9.1