From 6e5cfe44f7d621a64ced0121d8fcb499c1db5e89 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期六, 12 十月 2024 10:34:33 +0800
Subject: [PATCH] 修改RBD识别算法

---
 web/src/views/modules/taskReliability/RBD-edit-img.vue |   57 +++++++++++++++++++++++++--------------------------------
 1 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index 8eb84ff..925aada 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -109,7 +109,7 @@
                 "text": {
                   "refY": "100%",
                   "textVerticalAnchor": "top",
-                  "text": "start",
+                  "text": "",
                   "refY2": 4
                 },
                 "image": {
@@ -232,7 +232,7 @@
                 "text": {
                   "refY": "100%",
                   "textVerticalAnchor": "top",
-                  "text": "dashedBox",
+                  "text": "",
                   "refY2": 4
                 },
                 "image": {
@@ -354,7 +354,7 @@
                 "text": {
                   "refY": "100%",
                   "textVerticalAnchor": "top",
-                  "text": "end",
+                  "text": "",
                   "refY2": 4
                 },
                 "image": {
@@ -528,26 +528,26 @@
         imagesList: [
           {
             imgPath: 'switch',
-            imgName: 'switch',
+            imgName: '',
             nodeType: 'switch',
-            imgWidth: 50,
-            imgHeight: 50,
-            imgId: '5',
-            data: {}
-          },
-          {imgPath: 'vote', imgName: 'vote', nodeType: 'vote', imgWidth: 50, imgHeight: 50, imgId: '6', data: {}},
-          {
-            imgPath: 'parallel',
-            imgName: 'parallel',
-            nodeType: 'parallel',
             imgWidth: 50,
             imgHeight: 50,
             imgId: '9',
             data: {}
           },
+          {imgPath: 'vote', imgName: '', nodeType: 'vote', imgWidth: 50, imgHeight: 50, imgId: '6', data: {}},
+          {
+            imgPath: 'parallel',
+            imgName: '',
+            nodeType: 'parallel',
+            imgWidth: 50,
+            imgHeight: 50,
+            imgId: '5',
+            data: {}
+          },
           {
             imgPath: 'bridgeConnection',
-            imgName: 'bridgeConnection',
+            imgName: '',
             nodeType: 'bridgeConnection',
             imgWidth: 50,
             imgHeight: 50,
@@ -1926,6 +1926,12 @@
       createParallelBrach(x, y, dragNode) {
         dragNode.position(x + 320, y - dragNode.size().height / 2)
         const connectNode = this.createConnectNode(x + 50, y)
+        this.createBrach(dragNode,connectNode,x,y-50)
+        this.createBrach(dragNode,connectNode,x,y+50)
+
+        return {newStartNode: connectNode, newEndNode: dragNode}
+      },
+      createBrach(dragNode,connectNode,x,y){
         const dashedBox = this.createDashedBox(x + 150, y)
         dragNode.setData({startNodeId: connectNode.id})
 
@@ -1935,7 +1941,7 @@
           router: {
             name: 'manhattan',
             args: {
-              startDirections: ['right'], // 浠庝笅鏂瑰紑濮�
+              startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
               endDirections: ['left'],      // 鍚戝乏鏂圭粨鏉�
             },
           },
@@ -1949,25 +1955,12 @@
             name: 'manhattan',
             args: {
               startDirections: ['right'], // 浠庝笅鏂瑰紑濮�
-              endDirections: ['left'],      // 鍚戝乏鏂圭粨鏉�
+              endDirections: ['top','bottom'],      // 鍚戝乏鏂圭粨鏉�
             },
           },
           connector: {name: 'rounded'},
           zIndex: -1
         })
-        return {newStartNode: connectNode, newEndNode: dragNode}
-        /*        this.graph.addEdge({
-                  source: {cell: startNode, port: 'right1'},
-                  target: {cell: connectNode, port: 'left1'},
-                  router: {name: 'manhattan'},
-                  connector: {name: 'rounded'}
-                })
-                this.graph.addEdge({
-                  source: {cell: dragNode, port: 'right1'},
-                  target: {cell: endNode, port: 'left1'},
-                  router: {name: 'manhattan'},
-                  connector: {name: 'rounded'}
-                })*/
       },
       createBridgeConnection(x, y, dragNode) {
         console.log(x, y, 'leftX centerY')
@@ -2126,7 +2119,7 @@
               'xlink:href': '/modelImg/dashedBox.svg',
             },
             text: {
-              text: 'dashedBox',
+              text: '',
               fontSize: 14,
               refX: 0.5,
               refY: '100%',
@@ -2162,7 +2155,7 @@
               'xlink:href': '/modelImg/connect.svg',
             },
             text: {
-              text: 'connect',
+              text: '',
               fontSize: 14,
               refX: 0.5,
               refY: '100%',

--
Gitblit v1.9.1