From 21dff46677c9172c98d38192bc2982a8764f65fc Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 26 三月 2024 08:37:15 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 25 ++++++++++++++++---------
1 files changed, 16 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 71b9059..b4b9bf1 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -3,7 +3,7 @@
<el-row :gutter="[8,8]">
<el-col :span="4">
<div :style="'height:' +left_p+'px'">
- <div class="fa-card-a" style="height: 100%">
+ <div style="height: 100%">
<div id="stencilImg"></div>
</div>
</div>
@@ -184,7 +184,8 @@
id: '',
graph: null,
globalGridAttr: {
- voteNum: '',
+ productType:'',
+ voteNum: null,
repairMttcr: '',
repairMttcrOther: '',
repairDistribType: '',
@@ -339,10 +340,12 @@
}
let res = await this.$http.get(`/taskReliability/ModelLine/getDiagram`, {params: params})
console.log(res, 'async getDiagram( res')
- if (res.data !== null && res.data.content != null) {
+ 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)
+ if(this.dataForm.content!=''){
+ this.diagramJson = JSON.parse(this.dataForm.content)
+ }
// console.log(this.dataForm.content,'this.Diagram content')
console.log(this.diagramJson, 'this.Diagram json')
this.graph.fromJSON(this.diagramJson)
@@ -493,6 +496,7 @@
})
this.graph.centerContent()
const stencil = new Addon.Stencil({
+ getDragNode: (node) => node.clone({ keepId: true }),
getDropNode(node) {
let {width, height} = node.size()
if (node.getData().imgWidth) {
@@ -501,9 +505,11 @@
if (node.getData().imgHeight) {
height = node.getData().imgHeight
}
- console.log(node.getData().imgWidth, node.getData().imgHeight, 'node.size()')
- return node.clone().size(width, height)
+ return node.clone({ keepId: true }).size(width, height)
},
+ validateNode(node){
+ console.log(node.id)
+ },
title: '',
target: this.graph,
stencilGraphWidth: 200,
@@ -541,7 +547,7 @@
dataId: '',
nodeType: item.nodeType,
nodeTypeExt: '',
- voteNum:''
+ voteNum:null
},
attrs: {
text: {
@@ -572,6 +578,7 @@
imageUrl: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getProductImg?token=${Cookies.get('token')}&id=${item.imgPath}`,
width: 60,
height: 60,
+ id: item.dataId, // 鎵嬪姩璁剧疆鑺傜偣鐨� ID
data: {
isRepair: item.isRepair,
dataId: item.dataId,
@@ -587,7 +594,7 @@
taskMtbcfOther: item.taskMtbcfOther,
imgHeight: item.imgHeight,
imgWidth: item.imgWidth,
- voteNum:'',
+ voteNum:null,
},
attrs: {
text: {
@@ -727,7 +734,7 @@
this.id = cell.id
if (this.type === 'node') {
this.nodeType = cell.getData().nodeType
- console.log(this.nodeType, 'this.nodeType')
+ console.log(this.nodeType,cell.id,'this.nodeType')
}
console.log(this.shape, 'this.shape')
// this.nodeOpt(this.id, this.globalGridAttr)
--
Gitblit v1.9.1