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 | 64 ++++++++------------------------
1 files changed, 16 insertions(+), 48 deletions(-)
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index 1991943..1b11702 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -11,20 +11,6 @@
<el-col :span="19">
<div class="fa-card-a">
<el-form :inline="true">
- <el-form-item prop="projectId" style="margin-left:10px;width: 180px;">
- <zt-select v-model="projectId" :datas="projectList" clearable placeholder="宸ョ▼椤圭洰"
- @change="projectChange"></zt-select>
- </el-form-item>
- <el-form-item>
- <el-select v-model="diagramId" :disabled="diagramIdDisabled" placeholder="璇烽�夋嫨"
- @change="diagramIdChanges">
- <el-option v-for="item in diagramList"
- :key="item.diagramId"
- :label="item.diagramName"
- :value="item.diagramId">
- </el-option>
- </el-select>
- </el-form-item>
<el-form-item>
<el-button type="primary" @click="saveDiagram()">淇濆瓨</el-button>
<!-- <zt-button type="primary" v-show="pageCode === 'wlt_sp' && flowInfo.myStatus ===1" @click="reject()">椹冲洖</zt-button>-->
@@ -79,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"/>
@@ -125,7 +112,7 @@
imgsList:[
{imgPath:'start',imgName:'start',nodeType:'start',imgWidth:60,imgHeight:60,imgId:'1',data:{}},
{imgPath:'end',imgName:'end',nodeType:'end',imgWidth:60,imgHeight:60,imgId:'2',data:{}},
- {imgPath:'parallelLeft',imgName:'parallelLeft',nodeType:'parallelLeft',imgWidth:60,imgHeight:60,imgId:'3',data:{}},
+ // {imgPath:'parallelLeft',imgName:'parallelLeft',nodeType:'parallelLeft',imgWidth:60,imgHeight:60,imgId:'3',data:{}},
{imgPath:'parallelRight',imgName:'parallelRight',nodeType:'parallelRight',imgWidth:60,imgHeight:60,imgId:'4',data:{}},
{imgPath:'switchRight',imgName:'switchRight',nodeType:'switchRight',imgWidth:60,imgHeight:60,imgId:'5',data:{}},
{imgPath:'voteRight',imgName:'voteRight',nodeType:'voteRight',imgWidth:60,imgHeight:60,imgId:'6',data:{}},
@@ -133,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: [],
@@ -219,7 +207,7 @@
},
isReady: false,
curCel: Cell,
- left_p: document.documentElement.clientHeight-220,
+ left_p: document.documentElement.clientHeight-100,
ports: {
groups: {
top: {
@@ -354,7 +342,7 @@
await this.projectChange2(this.diagramId)
},
- projectChange() {
+ /* projectChange() {
// alert(555)
this.projectChange2(this.projectId)
},
@@ -394,33 +382,16 @@
console.log(this.dataForm.diagramId, 'this.dataForm.diagramId.........................')
}
await this.getDiagram()
- },
+ },*/
- diagramIdChanges() {
+/* diagramIdChanges() {
this.dataForm.diagramId = this.diagramId
// this.diagramIdChange(this.diagramId)
this.getDiagram()
- },
+ },*/
async getDiagram() {
- let includeCj = false
- console.log(this.diagramList, 'this.diagramList')
- console.log(this.diagramId, 'this.diagramId')
- for (let val of this.diagramList) {
- if (val.diagramId == this.diagramId) {
- includeCj = true
- break
- }
- }
- console.log(includeCj, 'includeCj')
- if (includeCj) {
- // alert(3)
- let params = {
- projectId: this.dataForm.projectId,
- diagramId: this.dataForm.diagramId,
- isShow: 'edit'
- }
- console.log(params, 'params')
- let res = await this.$http.get(`/maintain/projectNetworkDiagram/getDiagram`, {params: params})
+ let params = {}
+ let res = await this.$http.get(`/taskReliability/ModelLine/getDiagram`, {params: params})
if (res.data !== null && res.data.content != null) {
this.dataForm = res.data
this.diagramJson = JSON.parse(this.dataForm.content)
@@ -436,14 +407,7 @@
this.graph.zoomToFit()
// this.graph.freeze()
}
- } else {
- this.dataForm.id = null
- console.log(this.data, 'this.data asdfg')
- // this.graph.fromJSON(this.emptyJson)
- this.graph.positionContent('left',{ padding: { left: 200 }})
- // this.graph.centerContent()
- // this.graph.zoomToFit()
- }
+
},
init() {
this.timer = setHartBeat(10, 240);
@@ -453,7 +417,7 @@
this.graph = new Graph({
container: document.getElementById('containerImg'),
width: document.documentElement.clientWidth,
- height: document.documentElement.clientHeight - 220,
+ height: document.documentElement.clientHeight - 100,
// async: true,
grid: {
visible: true,
@@ -1028,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)
})
@@ -1135,6 +1101,8 @@
this.graph.on('edge:mouseleave', ({cell}) => {
cell.removeTools()
})
+
+ this.getDiagram()
},
showPorts(ports, show) {
for (let i = 0, len = ports.length; i < len; i = i + 1) {
--
Gitblit v1.9.1