From dea248c9da9f82e4032b6ab4a8ce0a6422a5c2cc Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 13 九月 2024 16:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 71 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 21 deletions(-)
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index 6b71cbf..c7f5609 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -16,8 +16,9 @@
</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 type="primary" @click="layoutDiagram()">涓�閿帓鐗�</el-button>
<el-button @click="leftAlign()">
<i style="font-size: 1rem;" class="wt-iconfont icon-zuoduiqi"></i>
</el-button>
@@ -588,10 +589,12 @@
productType: '',
voteNum: '',
repairMttcr: '',
- repairMttcrOther: '',
+ repairMttcrOtherParams2: '',
+ repairMttcrOtherParams3: '',
repairDistribType: '',
reliabDistribType: '',
- taskMtbcfOther: '',
+ taskMtbcfOtherParams2: '',
+ taskMtbcfOtherParams3: '',
isRepair: 0,
taskMtbcf: '',
numberInputValue: '',
@@ -1006,12 +1009,15 @@
reliabDistribType: item.reliabDistribType ? item.reliabDistribType : 1,
taskMtbcf: item.taskMtbcf,
- taskMtbcfOther: item.taskMtbcfOther,
+ taskMtbcfOther2: item.taskMtbcfOtherParams2,
+ taskMtbcfOther3: item.taskMtbcfOtherParams3,
isRepair: item.isRepair,
repairDistribType: item.repairDistribType ? item.repairDistribType : 1,
repairMttcr: item.repairMttcr,
- repairMttcrOther: item.repairMttcrOther,
+ repairMttcrOther2: item.repairMttcrOtherParams2,
+ repairMttcrOther3: item.repairMttcrOtherParams3,
+ successRate:item.successRate,
imgHeight: item.imgHeight,
imgWidth: item.imgWidth,
@@ -1442,16 +1448,8 @@
},
async saveDiagram() {
console.log(JSON.stringify(this.graph.toJSON()), 'graph.toJSON()')
- const nodes = this.graph.getNodes()
- let nodeArr2 = []
- // 妫�鏌ラ櫎褰撳墠鑺傜偣涔嬪鐨勬墍鏈夎妭鐐圭殑鍖呭洿妗嗘槸鍚︾浉浜�
- for (const node of nodes) {
- console.log(node, 'saveDiagram node')
- if (node.getData().nodeType == 'node' && node.getData().productType != 'product_xdy' && node.getData().dataId) {
- nodeArr2.push(node.getData().dataId)
- }
- }
- this.dataForm.nodeArr = nodeArr2
+ // 鑾峰彇鎵�鏈夊瓙鑺傜偣
+ this.getNodeArr()
this.dataForm.content = JSON.stringify(this.graph.toJSON())
this.dataForm.urlPref = window.SITE_CONFIG['apiURL']
console.log(this.dataForm, 'dataFrom')
@@ -1464,11 +1462,24 @@
}
})
},
- async analyzeDiagram() {
- console.log(JSON.stringify(this.graph.toJSON()), 'graph.toJSON()')
+ getNodeArr(){
const nodes = this.graph.getNodes()
let nodeArr2 = []
// 妫�鏌ラ櫎褰撳墠鑺傜偣涔嬪鐨勬墍鏈夎妭鐐圭殑鍖呭洿妗嗘槸鍚︾浉浜�
+ for (const node of nodes) {
+ console.log(node, 'saveDiagram node')
+ if (node.getData().nodeType == 'node' && node.getData().dataId) {
+ nodeArr2.push(node.getData().dataId)
+ }
+ }
+ this.dataForm.nodeArr = nodeArr2
+ },
+ async analyzeDiagram() {
+ console.log(JSON.stringify(this.graph.toJSON()), 'graph.toJSON()')
+ // 妫�鏌ラ櫎褰撳墠鑺傜偣涔嬪鐨勬墍鏈夎妭鐐圭殑鍖呭洿妗嗘槸鍚︾浉浜�
+ // 鑾峰彇鎵�鏈夊瓙鑺傜偣
+ this.getNodeArr()
+ const nodes = this.graph.getNodes()
for (const node of nodes) {
if(node.getData().nodeType === 'dashedBox'){
this.$message({message: '璇ユā鍨嬩腑瀛樺湪铏氭锛屾棤娉曚繚瀛�', type: 'warning'})
@@ -1481,11 +1492,7 @@
return false; // 鍙栨秷娣诲姞鑺傜偣鎿嶄綔
}
}
- if (node.getData().nodeType === 'node' && node.getData().productType !== 'product_xdy' && node.getData().dataId) {
- nodeArr2.push(node.getData().dataId)
- }
}
- this.dataForm.nodeArr = nodeArr2
this.dataForm.content = JSON.stringify(this.graph.toJSON())
this.dataForm.urlPref = window.SITE_CONFIG['apiURL']
await this.$http['post'](`/taskReliability/ModelLine/analyze`, this.dataForm).then(async res => {
@@ -1497,6 +1504,28 @@
}
})
},
+ async layoutDiagram() {
+ console.log(JSON.stringify(this.graph.toJSON()), 'graph.toJSON()')
+ this.dataForm.content = JSON.stringify(this.graph.toJSON())
+ this.dataForm.urlPref = window.SITE_CONFIG['apiURL']
+ await this.$http['post'](`/taskReliability/ModelLine/layout`, this.dataForm).then(async res => {
+ if (res.msg === 'success') {
+ // this.$emit('refreshDataList')
+ // this.$alert('瑙ｆ瀽鎴愬姛', '鎻愮ず', {
+ // confirmButtonText: '纭畾'
+ // })
+ console.log(res.data, 'layoutDiagram res.data')
+ this.dataForm.content = res.data.content
+ console.log(this.dataForm.content, 'layoutDiagram dataForm.content')
+ this.diagramJson = JSON.parse(this.dataForm.content)
+ this.graph.fromJSON(this.diagramJson)
+ this.isFirstLoad = false;
+ // console.log(this.diagramJson.cells.length, 'this.diagramJson.cells.length')
+
+ this.graph.positionContent('left')
+ }
+ })
+ },
leftAlign() {
const NODE = this.graph.getSelectedCells()
let leftX = null
--
Gitblit v1.9.1