From 09e513df72e71ed8e960132be4175b69ee6fce25 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期一, 04 三月 2024 15:32:52 +0800
Subject: [PATCH] 新增nodeTypeExt
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 4 ++++
web/src/views/modules/taskReliability/ConfigNode/index.vue | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/web/src/views/modules/taskReliability/ConfigNode/index.vue b/web/src/views/modules/taskReliability/ConfigNode/index.vue
index ebf59e9..e051a27 100644
--- a/web/src/views/modules/taskReliability/ConfigNode/index.vue
+++ b/web/src/views/modules/taskReliability/ConfigNode/index.vue
@@ -27,6 +27,19 @@
<el-input v-model="globalGridAttr.nodeText" style="width:100%" @change="onTextChange"></el-input>
</el-col>
</el-row>
+ <el-row :gutter="5" v-show="nodeType=='node'" align="middle" style="margin-top:20px;">
+ <el-col :span=8 style="font-size: 16px;line-height: 32px">鍏崇郴</el-col>
+ <el-col :span=16>
+ <el-select style="width: 100%" v-model="globalGridAttr.nodeTypeExt" @change="onNodeTypeExtChange">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-col>
+ </el-row>
<el-row v-show="shape!=='custom-text'" :gutter="5" align="middle" style="margin-top:20px">
<el-col :span=8 style="font-size: 16px;line-height: 32px">鏃ユ湡</el-col>
<el-col :span=16 >
@@ -77,6 +90,19 @@
finishDate: '',
inspectName:''
},
+ options: [{
+ value: '',
+ label: '鏃�'
+ }, {
+ value: 'parallel',
+ label: '鏃佽繛'
+ },{
+ value: 'switch',
+ label: '骞惰仈'
+ }, {
+ value: 'vote',
+ label: '琛ㄥ喅'
+ }],
date:'',
text:'',
dateId:'',
@@ -111,6 +137,9 @@
type: String,
},
diagramId:{
+ type: String,
+ },
+ nodeType:{
type: String,
}
},
@@ -194,6 +223,14 @@
this.curCel = this.nodeOpt(this.id,this.globalGridAttr)
},
+ onNodeTypeExtChange(e){
+ this.globalGridAttr.nodeTypeExt = e
+ let nodeTypeExt={
+ nodeTypeExt:this.globalGridAttr.nodeTypeExt
+ }
+ this.curCel.setData(nodeTypeExt)
+ this.curCel = this.nodeOpt(this.id,this.globalGridAttr)
+ },
onDateChange(e){
this.date =e
this.globalGridAttr.nodeDate = this.date
@@ -235,6 +272,7 @@
globalGridAttr.nodeDate = cell.attr('title/text')
globalGridAttr.dataId = cell.getData().dataId
globalGridAttr.inspectName =cell.getData().inspectName
+ globalGridAttr.nodeTypeExt=cell.getData().nodeTypeExt
// console.log(globalGridAttr.inspectName,globalGridAttr.dataId,globalGridAttr.nodeDate,'globalGridAttr.inspectName,globalGridAttr.dataId,globalGridAttr.nodeDate 789')
cell.getData()
// console.log( cell.getData(),' cell.getData() 909')
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index cd32c6f..1b11702 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -65,6 +65,7 @@
</div>
<config-node v-show="type === 'node'" :id="id" :diagramId="diagramId" :globalGridAttr="globalGridAttr"
:graph="graph"
+ :nodeType="nodeType"
:projectId="projectId"
:shape="shape"/>
<config-edge v-show="type === 'edge'" :id="id" :globalGridAttr="globalGridAttr" :graph="graph"/>
@@ -119,6 +120,7 @@
imgsList2:[
{imgPath:'logo',imgName:'logo',nodeType:'node',imgWidth:60,imgHeight:60,imgId:'100',data:{dataId:'123456',nodeTypeExt:'aaa'}},
],
+ nodeType:'',
first: true,
shape: '',
projectList: [],
@@ -990,6 +992,8 @@
this.type = cell.isNode() ? 'node' : 'edge'
this.shape = cell.shape
this.id = cell.id
+ this.nodeType = cell.getData().nodeType
+ console.log(this.nodeType, 'this.nodeType')
console.log(this.shape, 'this.shape')
// this.nodeOpt(this.id, this.globalGridAttr)
})
--
Gitblit v1.9.1