From f770e36d5ec735f53df298445a6940daa20d0bfa Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 18 十一月 2024 11:12:05 +0800
Subject: [PATCH] 修复bug：1）一键排版时不要自动保存； 2）无论设备数量多少，deviceNo统一改成从1开始。
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index 90d93d2..079cc4c 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -18,7 +18,7 @@
<el-button type="primary" @click="saveDiagram()">鏆傚瓨</el-button>
<el-button type="primary" @click="analyzeDiagram()">鎻愪氦</el-button>
<el-button type="primary" @click="clearDiagram()">娓呯┖鍥惧舰</el-button>
- <el-checkbox style="margin: 0 10px 0 10px" v-model="dataForm.autoLayout" true-label="1" false-label="0">
+ <el-checkbox style="margin: 0 10px 0 10px" v-model="dataForm.autoLayout" :true-label="1" :false-label="0">
鏄惁寮�鍚竴閿帓鐗�
</el-checkbox>
<el-button type="primary" @click="layoutDiagram()" :disabled="!dataForm.autoLayout">涓�閿帓鐗�</el-button>
@@ -758,7 +758,7 @@
}
let res = await this.$http.get(`/taskReliability/ModelLine/getDiagram`, {params: params})
this.dataForm = res.data
- this.dataForm.autoLayout = parseInt(this.dataForm.autoLayout) == 1
+ this.dataForm.autoLayout = parseInt(this.dataForm.autoLayout)
if (res.data.content != null) {
console.log(this.dataForm, 'getDiagram datafrom')
console.log(res.data, 'getDiagram res.data')
@@ -935,9 +935,11 @@
for (let i = 1; i <= node.getData().basicUnitNum; i++) {
if (deviceNoArr.findIndex(item => item === i) === -1) {
no = i
- if (node.getData().basicUnitNum > 1) {
+ if (node.getData().basicUnitNum >= 1) {
node.getData().deviceNo = i
- node.attr('text/text', node.attr('text/text') + '-' + i)
+ if(node.getData().deviceNo > 1){
+ node.attr('text/text', node.attr('text/text') + '-' + i)
+ }
}
break
}
@@ -1038,7 +1040,7 @@
type: 'imageNodes2',
dataId: item.dataId,
basicUnitNum: item.basicUnitNum,
- deviceNo: 0,
+ deviceNo: 1,
nodeType: item.nodeType,
nodeTypeExt: item.nodeTypeExt,
productType: item.productType,
--
Gitblit v1.9.1