From f7cf5c4efc4024f4a998dffa1d4c11075c3f7f19 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 05 三月 2024 16:11:00 +0800
Subject: [PATCH] 修改RBD解析
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index cd32c6f..df2d1ef 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -12,10 +12,13 @@
<div class="fa-card-a">
<el-form :inline="true">
<el-form-item>
+ modelId
+ <el-input placeholder="鎼滅储鏂藉伐鍐呭" v-model="dataForm.modelId" clearable class="input-with-select">
+ <el-button slot="append" icon="el-icon-search" @click="search()"></el-button>
+ </el-input>
+
<el-button type="primary" @click="saveDiagram()">淇濆瓨</el-button>
- <!-- <zt-button type="primary" v-show="pageCode === 'wlt_sp' && flowInfo.myStatus ===1" @click="reject()">椹冲洖</zt-button>-->
- <el-button v-show="pageCode === 'wlt_pz' && flowInfo.myStatus ===1" type="warning" @click="finish">瀹屾垚
- </el-button>
+ <el-button type="primary" @click="analyzeDiagram()">瑙ｆ瀽</el-button>
</el-form-item>
<el-form-item>
<el-tooltip class="item" effect="dark" content="宸﹀榻�" placement="left">
@@ -65,6 +68,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"/>
@@ -112,13 +116,14 @@
{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:'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:{}},
+ {imgPath:'parallelRight',imgName:'parallel',nodeType:'parallel',imgWidth:60,imgHeight:60,imgId:'4',data:{}},
+ {imgPath:'switchRight',imgName:'switch',nodeType:'switch',imgWidth:60,imgHeight:60,imgId:'5',data:{}},
+ {imgPath:'voteRight',imgName:'vote',nodeType:'vote',imgWidth:60,imgHeight:60,imgId:'6',data:{}},
],
imgsList2:[
- {imgPath:'logo',imgName:'logo',nodeType:'node',imgWidth:60,imgHeight:60,imgId:'100',data:{dataId:'123456',nodeTypeExt:'aaa'}},
+ {imgPath:'logo',imgName:'logo',nodeType:'node',imgWidth:60,imgHeight:60,imgId:'100',data:{dataId:'123456',nodeTypeExt:''}},
],
+ nodeType:'',
first: true,
shape: '',
projectList: [],
@@ -134,7 +139,7 @@
content: null,
publishContent: null,
hasPublish: 0,
- modelId: 1,
+ modelId: '1',
},
flowInfo: {
bizId: '',
@@ -388,10 +393,13 @@
this.getDiagram()
},*/
async getDiagram() {
- let params = {}
+ let params = {
+ modelId : this.dataForm.modelId
+ }
let res = await this.$http.get(`/taskReliability/ModelLine/getDiagram`, {params: params})
if (res.data !== null && res.data.content != null) {
this.dataForm = res.data
+ console.log(this.dataForm, 'this.dataForm in getDiagram')
this.diagramJson = JSON.parse(this.dataForm.content)
// console.log(this.dataForm.content,'this.Diagram content')
console.log(this.diagramJson, 'this.Diagram json')
@@ -990,6 +998,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)
})
@@ -1153,6 +1163,9 @@
// }
// return this.curCel;
// },
+ async search() {
+ await this.getDiagram();
+ },
async saveDiagram() {
console.log(JSON.stringify(this.graph.toJSON()), 'graph.toJSON()')
this.dataForm.content = JSON.stringify(this.graph.toJSON())
@@ -1165,6 +1178,18 @@
}
})
},
+ async analyzeDiagram() {
+ console.log(JSON.stringify(this.graph.toJSON()), 'graph.toJSON()')
+ this.dataForm.content = JSON.stringify(this.graph.toJSON())
+ console.log(this.dataForm, 'dataFrom')
+ await this.$http['post'](`/taskReliability/ModelLine/analyze`, this.dataForm).then(async res => {
+ if (res.msg === 'success') {
+ this.$alert('瑙ｆ瀽鎴愬姛', '鎻愮ず', {
+ confirmButtonText: '纭畾'
+ })
+ }
+ })
+ },
// AlignmentsChanges(val){
// console.log(val,'align.value')
// if(val ==='閫夐」1'){
--
Gitblit v1.9.1