From 532ffadcae3ea0ebdde66f038d351a01f2fb503a Mon Sep 17 00:00:00 2001 From: xyc <jc_xiong@hotmail.com> Date: 星期三, 06 三月 2024 11:01:25 +0800 Subject: [PATCH] 合并前端 --- web/src/views/modules/taskReliability/RBD-edit-img.vue | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue index bcba72a..60d4d7e 100644 --- a/web/src/views/modules/taskReliability/RBD-edit-img.vue +++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue @@ -12,7 +12,10 @@ <div class="fa-card-a"> <el-form :inline="true"> <el-form-item> - <el-input placeholder="鎼滅储鏂藉伐鍐呭" v-model="dataForm.modelId" clearable class="input-with-select"> + 妯″瀷ID + </el-form-item> + <el-form-item> + <el-input placeholder="鎼滅储妯″瀷ID" v-model="dataForm.modelId" clearable class="input-with-select"> <el-button slot="append" icon="el-icon-search" @click="search()"></el-button> </el-input> </el-form-item> @@ -20,6 +23,7 @@ <el-form-item> <el-button type="primary" @click="saveDiagram()">淇濆瓨</el-button> <el-button type="primary" @click="analyzeDiagram()">瑙f瀽</el-button> + <el-button type="primary" @click="clearDiagram()">娓呯┖鍥惧舰</el-button> </el-form-item> <el-form-item> <el-tooltip class="item" effect="dark" content="宸﹀榻�" placement="left"> @@ -116,13 +120,14 @@ 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:'connect',imgName:'connect',nodeType:'connect',imgWidth:30,imgHeight:30,imgId:'3',data:{}}, // {imgPath:'parallelLeft',imgName:'parallelLeft',nodeType:'parallelLeft',imgWidth:60,imgHeight:60,imgId:'3',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',statusImg:'',imgWidth:60,imgHeight:60,imgId:'100',data:{dataId:'123456',nodeTypeExt:'aaa'}}, + {imgPath:'logo',imgName:'logo',nodeType:'node',statusImg:'',imgWidth:60,imgHeight:60,imgId:'100',data:{dataId:'123456',nodeTypeExt:''}}, ], nodeType:'', first: true, @@ -395,6 +400,14 @@ // this.diagramIdChange(this.diagramId) this.getDiagram() },*/ + async clearDiagram() { + this.dataForm.id = null + // this.graph.fromJSON(this.emptyJson) + this.graph.fromJSON('') + this.graph.centerContent() + this.graph.zoomToFit() + // this.graph.freeze() + }, async getDiagram() { let params = { modelId : this.dataForm.modelId @@ -410,11 +423,7 @@ this.graph.centerContent() this.graph.zoomToFit() } else { - this.dataForm.id = null - // this.graph.fromJSON(this.emptyJson) - this.graph.centerContent() - this.graph.zoomToFit() - // this.graph.freeze() + await this.clearDiagram() } }, -- Gitblit v1.9.1