修改

jinlin

2024-09-27 27bf11e737fa1434d234e39db282ab52f3a32114

修改

 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; // 如果找到就退出循环
                    }
                }

 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>

 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">

 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"

 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)