From c400e8082b202fbf20ea0e740a306aa3c62e8fb5 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 12 三月 2024 14:18:46 +0800
Subject: [PATCH] 修改

---
 web/src/views/modules/taskReliability/RBD-edit-img.vue                                     |    6 ++----
 web/src/views/modules/basicInfo/XhProductModel.vue                                         |    3 ++-
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java |   34 +++++++++++++++++-----------------
 web/src/views/modules/basicInfo/ParamData.vue                                              |    2 +-
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java
index 50221c1..f8732be 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java
@@ -34,49 +34,49 @@
     private String actualRunTime;
 
     @ApiModelProperty(value = "鍙傚姞璁＄畻")
-    private Integer joinCompute;
+    private Integer basicJoinCompute;
 
     @ApiModelProperty(value = "瑙勫畾MTBF")
-    private String regulateMtbf;
+    private String basicMtbfRegulate;
 
     @ApiModelProperty(value = "鍙帴鍙楃殑MTBF")
-    private String acceptMtbf;
+    private String basicMtbfAccept;
 
     @ApiModelProperty(value = "MTBF瑙勫畾鎴愬姛鐜�")
-    private String regulSuccRateMtbf;
+    private String basicMtbfRegulSuccRate;
 
     @ApiModelProperty(value = "MTBF鍙帴鍙楁垚鍔熺巼")
-    private String acceptSuccRateMtbf;
+    private String basicMtbfAcceptSuccRate;
 
     @ApiModelProperty(value = "鍗曞厓鏁伴噺")
-    private Integer unitNum;
+    private Integer basicUnitNum;
 
     @ApiModelProperty(value = "杩愯娆℃暟")
-    private Integer runsNum;
+    private Integer basicRunsNum;
 
     @ApiModelProperty(value = "MTBF杩愯姣�")
-    private String operatingRatioMtbf;
+    private String basicMtbfOperatingRatio;
 
     @ApiModelProperty(value = "鍗曟杩愯鏃堕棿")
-    private String singleRunTime;
+    private String basicSingleRunTime;
 
     @ApiModelProperty(value = "瑙勫畾MTBCF")
-    private String regulateMtbcf;
+    private String taskMtbcfRegulate;
 
     @ApiModelProperty(value = "鍙帴鍙楃殑MTBCF")
-    private String acceptMtbcf;
+    private String taskMtbcfAccept;
 
     @ApiModelProperty(value = "MTBCF瑙勫畾鎴愬姛鐜�")
-    private String regulSuccRateMtbcf;
+    private String taskMtbcfRegulSuccRate;
 
     @ApiModelProperty(value = "MTBCF鍙帴鍙楁垚鍔熺巼")
-    private String acceptSuccRateMtbcf;
+    private String taskMtbcfAcceptSuccRate;
 
     @ApiModelProperty(value = "MTBCF杩愯姣�")
-    private String operatingRatioMtbcf;
+    private String taskMtbcfOperatingRatio;
 
     @ApiModelProperty(value = "MTBCF鍏朵粬鍙傛暟")
-    private String otherParamsMtbcf;
+    private String taskMtbcfOtherParams;
 
     @ApiModelProperty(value = "鍙淮淇�")
     private Integer repairable;
@@ -85,10 +85,10 @@
     private Integer repairDistribType;
 
     @ApiModelProperty(value = "MTTCR")
-    private String mttcr;
+    private String repairMttcr;
 
     @ApiModelProperty(value = "MTTCR鍏朵粬鍙傛暟")
-    private String otherParamsMttcr;
+    private String repairMttcrOtherParams;
 
     @ApiModelProperty(value = "鍙潬鎬у垎甯冪被鍨�")
     private Integer reliabDistribType;
diff --git a/web/src/views/modules/basicInfo/ParamData.vue b/web/src/views/modules/basicInfo/ParamData.vue
index 5cd384f..0756990 100644
--- a/web/src/views/modules/basicInfo/ParamData.vue
+++ b/web/src/views/modules/basicInfo/ParamData.vue
@@ -365,7 +365,7 @@
       // },
       onProductSelected(data) {
         this.dataForm.srcId = data.id
-        this.dataForm.nodeType = data.nodeType
+        this.dataForm.nodeType = data.productType
         console.log(data, 'onProductSelected(data)')
         this.$refs.tableObj.query()
       },
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index 052fc11..30c7c5e 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -107,8 +107,9 @@
         return `${window.SITE_CONFIG['apiURL']}/sys/oss/content2?fileId=${id}`
       },
       onProductSelected(data) {
+        console.log(data)
         this.dataForm.pid = data.id
-        this.dataForm.type = data.nodeType
+        this.dataForm.type = data.productType
         this.$refs.tableObj.query()
       }
     }
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index e1ba1be..0665c19 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -301,12 +301,10 @@
     methods: {
       init(row){
         this.modelName = row.modelName
-        let modelId = row.id
-        this.dataForm.id = modelId
+        this.dataForm.id = row.id
         // this.productId = row.productId
         // this.getProduct(row.productId)
         this.initDigram(row.productId)
-        this.getDiagram(modelId)
         console.log(this.dataForm,'init(row){')
       },
       async getDiagram(modelId) {
@@ -1067,7 +1065,7 @@
           cell.removeTools()
         })
 
-        this.getDiagram()
+        await this.getDiagram(this.dataForm.id)
       },
       showPorts(ports, show) {
         for (let i = 0, len = ports.length; i < len; i = i + 1) {

--
Gitblit v1.9.1