From c6a9d92199d79100781a8c85cec045a778e648c2 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 10 五月 2024 09:30:04 +0800
Subject: [PATCH] 组合
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index 8566355..1e82264 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -348,11 +348,7 @@
if (res.data !== null && (res.data.content != null)) {
this.dataForm = res.data
this.diagramJson = JSON.parse(this.dataForm.content)
- if (this.diagramJson.cells.length !== 0) {
this.graph.fromJSON(this.diagramJson)
- } else {
- this.graph.fromJSON(RBDDefault)
- }
this.isFirstLoad = false;
console.log(this.diagramJson.cells.length, 'this.diagramJson.cells.length')
@@ -360,7 +356,7 @@
// this.graph.centerContent()
// this.graph.zoomToFit()
} else {
- await this.clearDiagram()
+ this.graph.fromJSON(RBDDefault)
}
},
async clearDiagram() {
@@ -1141,7 +1137,7 @@
}
if (startNode && endNode) {
let centerY = graphNode.position().y
- let result = this.addNodeAndConnect(graphNode, dragNode, dragNode.position().x, centerY)
+ let result = this.addNodeAndConnect(graphNode, dragNode, dragNode.position().x - dragNode.size().width/2, centerY)
if (!result){
dragNode.remove()
return
@@ -1200,8 +1196,10 @@
width =100
height = 60
} else if (dragNodeType === 'bridgeConnection') {
- width =450
- height = 160
+ width =550
+ height = 115
+ leftTopX = leftX - width/2
+ leftTopY = centerY - height/2
// leftTopY = 240/2
} else {
width =270
@@ -1216,9 +1214,9 @@
dragNode.position(leftX, centerY)
return {newStartNode: dragNode, newEndNode: dragNode}
} else if (dragNodeType === 'bridgeConnection') {
- return this.createBridgeConnection(leftX, centerY, dragNode)
+ return this.createBridgeConnection(leftTopX, leftTopY, dragNode)
} else {
- return this.createParallelBrach(leftX, centerY, dragNode)
+ return this.createParallelBrach(leftTopX, leftTopY, dragNode)
}
},
// 鐩镐氦鐨勮竟
@@ -1327,15 +1325,16 @@
})*/
},
createBridgeConnection(x, y, dragNode) {
- const leftTopDashedBox = this.createDashedBox(x + 120, y)
- const rightTopDashedBox = this.createDashedBox(x + 400, y)
+ console.log(x,y,'leftX centerY')
+ const leftTopDashedBox = this.createDashedBox(x + 40, y)
+ const rightTopDashedBox = this.createDashedBox(x + 380, y)
- const leftConnectNode = this.createConnectNode(x + 50, y + 80)
- const alignCenterDashedBox = this.createDashedBox(x + 260, y + 80)
- const rightConnectNode = this.createBridgeNode(x + 550, y + 80)
+ const leftConnectNode = this.createConnectNode(x, y + 87)
+ const alignCenterDashedBox = this.createDashedBox(x+ 210, y + 87)
+ const rightConnectNode = this.createBridgeNode(x + 530, y + 87)
- const leftBottomDashedBox = this.createDashedBox(x + 120, y + 160)
- const rightBottomDashedBox = this.createDashedBox(x + 400, y + 160)
+ const leftBottomDashedBox = this.createDashedBox(x+ 50, y + 160)
+ const rightBottomDashedBox = this.createDashedBox(x + 370 , y + 160)
rightConnectNode.setData({startNodeId: leftConnectNode.id})
leftConnectNode.setData({endNodeId: rightConnectNode.id})
@@ -1445,7 +1444,6 @@
const dragNodeId = getUUID().toString()
let connectNode = this.graph.addNode({
shape: 'image',
- // imageUrl: require('/public/modelImg/' + item.imgPath + '.png'),
width: 10,
height: 10,
id: connectId,
--
Gitblit v1.9.1