From 2d0b8ecd8f3586326a3786914f94fd9008f773fd Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期六, 12 十月 2024 09:23:36 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 23 ++++++++---------------
web/src/views/modules/taskReliability/ConfigNode/configNode.vue | 8 +++++---
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/web/src/views/modules/taskReliability/ConfigNode/configNode.vue b/web/src/views/modules/taskReliability/ConfigNode/configNode.vue
index c96307c..c1da7d3 100644
--- a/web/src/views/modules/taskReliability/ConfigNode/configNode.vue
+++ b/web/src/views/modules/taskReliability/ConfigNode/configNode.vue
@@ -8,11 +8,12 @@
<el-form-item v-show="shape!=='custom-circle1'" label="鑺傜偣鍚嶇О" prop="nodeText" label-width="80px">
<el-input v-model="globalGridAttr.nodeText" style="width:100%" @change="onTextChange"></el-input>
</el-form-item>
- <el-form-item v-show="nodeType=='vote' || (nodeType=='node' && showNumberInput)" label="琛ㄥ喅鏁伴噺" prop="voteNum"
+ <el-form-item v-show="showNumberInput" :label='nodeType=="vote"?"琛ㄥ喅鏁伴噺":"澶囦唤鏁伴噺"' prop="voteNum"
label-width="80px">
<el-input type="number" v-model="globalGridAttr.voteNum" @change="onNumberInputValue"
placeholder="璇疯緭鍏ユ暟瀛�"></el-input>
</el-form-item>
+
<div v-show="globalGridAttr.productType!=='product_xdy'">
<el-form-item v-show="nodeType=='node'" label="鍙潬鎬у垎甯冪被鍨�" prop="reliabDistribType" label-width="125px">
<zt-dict style="width: 100%" v-model="globalGridAttr.reliabDistribType" @input="onReliabDistribType"
@@ -175,7 +176,8 @@
this.curCel.attr('text/text', this.text)
},
onNodeTypeExtChange(e) {
- if (this.globalGridAttr.nodeTypeExt === 'vote') {
+ alert(this.globalGridAttr.nodeTypeExt)
+ if (this.globalGridAttr.nodeTypeExt === 'vote' || this.globalGridAttr.nodeTypeExt === 'switch') {
this.showNumberInput = true;
} else {
this.showNumberInput = false;
@@ -406,7 +408,7 @@
this.globalGridAttr.successRate = cell.getData().successRate
this.globalGridAttr.simulatTimes = cell.getData().simulatTimes
this.globalGridAttr.successTimes = cell.getData().successTimes
- if (this.nodeType === 'vote' || this.globalGridAttr.nodeTypeExt === 'vote' || (cell.getData().voteNum !== undefined && cell.getData().voteNum !== '')) {
+ if (this.nodeType === 'vote' || this.nodeType === 'switch') {
console.log(cell.getData().voteNum, 'cell.getData().voteNum')
this.showNumberInput = true
}
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index df81713..925aada 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -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')
--
Gitblit v1.9.1