From e21c05d2c0d67629c81e5cc54238e6678a055055 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 17 七月 2024 09:00:22 +0800
Subject: [PATCH] 修改模型提交功能
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 6 +++---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java | 2 +-
web/src/views/modules/taskReliability/OperatConditModel.vue | 7 ++++++-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java
index 9c43647..84fe38d 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ModelLineController.java
@@ -140,7 +140,7 @@
@ApiOperation("瑙ｆ瀽")
@LogOperation("瑙ｆ瀽")
public Result analyze(@RequestBody ModelRbd modelRbd) {
- modelLineService.update(modelRbd);
+ update(modelRbd);
boolean result = modelLineService.analyze(modelRbd);
return result ? Result.ok() : Result.error("瑙ｆ瀽澶辫触");
}
diff --git a/web/src/views/modules/taskReliability/OperatConditModel.vue b/web/src/views/modules/taskReliability/OperatConditModel.vue
index af60490..e49e22e 100644
--- a/web/src/views/modules/taskReliability/OperatConditModel.vue
+++ b/web/src/views/modules/taskReliability/OperatConditModel.vue
@@ -106,12 +106,17 @@
let modelNodes = this.mapModelNodes[modelId]
console.log(modelId, 'modelChanged modelId')
console.log(modelNodes, 'modelChanged modelNodes')
+ console.log(row.children, 'row.children')
for (let subRow of row.children) {
- if (modelNodes.indexOf(subRow.productId)) {
+ console.log(subRow,'subRow')
+ console.log(subRow.productId,'subRow.productId')
+ if (modelNodes.indexOf(subRow.productId) != -1) {
subRow.isDisabled = 0
if (subRow.modelList.length == 1) {
subRow.modelId = subRow.modelList[0].id
+ console.log(subRow.modelId, 'subRow.modelId 111')
+ console.log(this.mapModelNodes[subRow.modelId], 'this.mapModelNodes[subRow.modelId] 111')
} else {
//subRow.modelId = null
}
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index a30b513..db1bed4 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -16,7 +16,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" @click="saveDiagram()">鏆傚瓨</el-button>
- <el-button type="primary" @click="analyzeDiagram()">淇濆瓨</el-button>
+ <el-button type="primary" @click="analyzeDiagram()">鎻愪氦</el-button>
<el-button type="primary" @click="clearDiagram()">娓呯┖鍥惧舰</el-button>
<el-button @click="leftAlign()">
<i style="font-size: 1rem;" class="wt-iconfont icon-zuoduiqi"></i>
@@ -1451,7 +1451,7 @@
// 妫�鏌ラ櫎褰撳墠鑺傜偣涔嬪鐨勬墍鏈夎妭鐐圭殑鍖呭洿妗嗘槸鍚︾浉浜�
for (const node of nodes) {
console.log(node, 'saveDiagram node')
- if (node.getData().nodeType == 'node' && node.getData().productType != 'product_xdy' && node.getData().dataId) {
+ if (node.getData().nodeType == 'node' && node.getData().dataId) {
nodeArr2.push(node.getData().dataId)
}
}
@@ -1485,7 +1485,7 @@
return false; // 鍙栨秷娣诲姞鑺傜偣鎿嶄綔
}
}
- if (node.getData().nodeType === 'node' && node.getData().productType !== 'product_xdy' && node.getData().dataId) {
+ if (node.getData().nodeType === 'node' && node.getData().dataId) {
nodeArr2.push(node.getData().dataId)
}
}
--
Gitblit v1.9.1