From 27bf11e737fa1434d234e39db282ab52f3a32114 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 27 九月 2024 14:22:19 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java | 13 +++++++------
web/src/views/modules/taskReliability/ModelRbd.vue | 2 +-
web/src/views/modules/taskReliability/TimeDiagram.vue | 8 ++++----
web/src/views/modules/basicInfo/ParamData.vue | 2 +-
web/src/views/modules/taskReliability/Task.vue | 6 +++---
5 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java
index d85417b..b38efe2 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java
@@ -1,5 +1,6 @@
package com.zt.life.modules.mainPart.taskReliability.service;
+import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.XML;
import com.zt.common.exception.RenException;
@@ -146,15 +147,15 @@
}
}
JSONObject xmlJSONObj = XML.toJSONObject(xml);
- JSONObject jsonObject = xmlJSONObj.getJSONObject("Results");
+ //JSONObject jsonObject = xmlJSONObj.getJSONObject("Results");
+ JSONArray jsonArray = xmlJSONObj.getJSONObject("Results").getJSONArray("Result");
for (ReliabilityAssess assess : list) {
Double result1 = null;
- // 閬嶅巻 JSON 瀵硅薄鐨勬墍鏈夐敭
- for (String key : jsonObject.keySet()) {
- // 妫�鏌ラ敭鏄惁鍖呭惈鐗瑰畾鐨勫瓧绗︿覆
- if (key.contains(assess.getId().toString())) {
+ for (int i = 0; i < jsonArray.size(); i++) {
+ String nameValue = (String) jsonArray.getJSONObject(i).get("name");
+ if (nameValue.contains(assess.getId().toString())) {
// 鑾峰彇瀵瑰簲鐨勫��
- result1 = (Double) jsonObject.get(key);
+ result1 = (Double) jsonArray.getJSONObject(i).get("value");
break; // 濡傛灉鎵惧埌灏遍��鍑哄惊鐜�
}
}
diff --git a/web/src/views/modules/basicInfo/ParamData.vue b/web/src/views/modules/basicInfo/ParamData.vue
index 82803bc..3b04333 100644
--- a/web/src/views/modules/basicInfo/ParamData.vue
+++ b/web/src/views/modules/basicInfo/ParamData.vue
@@ -32,7 +32,7 @@
<el-form-item>
<zt-button v-if="dataForm.srcId" type="warning" @click="handleSaveRows">淇濆瓨</zt-button>
<zt-button v-if="dataForm.srcId" type="query" @click="table.query()"/>
- <zt-button type="add" v-if="dataForm.productType==='3'" @click="add()"/>
+ <!-- <zt-button type="add" v-if="dataForm.productType==='3'" @click="add()"/>-->
<zt-button v-if="dataForm.srcId" type="delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
diff --git a/web/src/views/modules/taskReliability/ModelRbd.vue b/web/src/views/modules/taskReliability/ModelRbd.vue
index f9cee46..62e621e 100644
--- a/web/src/views/modules/taskReliability/ModelRbd.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd.vue
@@ -33,7 +33,7 @@
<el-table-column prop="modelTag" label="妯″瀷鏍囪瘑"/>
<el-table-column prop="quoteNum" label="琚紩鐢ㄦ暟" align="center"/>
<el-table-column prop="modelState" label="妯″瀷鐘舵��" align="center"/>
- <el-table-column prop="modelDataState" label="妯″瀷鏁版嵁鐘舵��" align="center"/>
+ <!-- <el-table-column prop="modelDataState" label="妯″瀷鏁版嵁鐘舵��" align="center"/>-->
<el-table-column prop="remark" label="澶囨敞"/>
<zt-table-column-handle :table="table"
delete-perm="taskReliability::delete" :has-view="false" width="180px">
diff --git a/web/src/views/modules/taskReliability/Task.vue b/web/src/views/modules/taskReliability/Task.vue
index 281a62c..7111e1b 100644
--- a/web/src/views/modules/taskReliability/Task.vue
+++ b/web/src/views/modules/taskReliability/Task.vue
@@ -20,10 +20,10 @@
@row-click="selectTask"
@selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
- <el-table-column prop="taskName" label="浠诲姟鍚嶇О" align="center" width="140"/>
+ <el-table-column prop="taskName" label="浠诲姟鍚嶇О" align="center" />
<!--<el-table-column prop="taskSort" label="浠诲姟椤哄簭" align="center"/>-->
- <el-table-column prop="taskDuration" label="浠诲姟鎬绘椂闀�" align="right" width="120"/>
- <el-table-column prop="taskStaus" label="鐘舵��" align="center" >
+ <el-table-column prop="taskDuration" label="浠诲姟鎬绘椂闀�" align="right" />
+<!-- <el-table-column prop="taskStaus" label="鐘舵��" align="center" >-->
</el-table-column>
<zt-table-column-handle :table="table"
diff --git a/web/src/views/modules/taskReliability/TimeDiagram.vue b/web/src/views/modules/taskReliability/TimeDiagram.vue
index 8901a64..ca52c0e 100644
--- a/web/src/views/modules/taskReliability/TimeDiagram.vue
+++ b/web/src/views/modules/taskReliability/TimeDiagram.vue
@@ -538,13 +538,13 @@
this.diagramJson = JSON.parse(res.data)
console.log(this.diagramJson, 'this.Diagram json')
this.graph.fromJSON(this.diagramJson)
- this.graph.centerContent()
- this.graph.zoomToFit()
+ this.graph.positionContent('left')
+ //this.graph.zoomToFit()
this.graph.freeze()
} else {
this.graph.fromJSON(this.emptyJson)
- this.graph.centerContent()
- this.graph.zoomToFit()
+ //this.graph.centerContent()
+ //this.graph.zoomToFit()
this.graph.freeze()
}
console.log(res.data)
--
Gitblit v1.9.1