From 3c08a64d7829849811ef19a0ba11d41b6268fa5e Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期二, 12 三月 2024 18:14:47 +0800
Subject: [PATCH] 新增属性
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 332 ++++++------------------------------------------------
1 files changed, 39 insertions(+), 293 deletions(-)
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index dcc05dc..e0698fb 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -124,7 +124,7 @@
{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:''}},
+ // {imgPath:'logo',imgName:'logo',nodeType:'node',,nodeTypeExt:'',productType:'',statusImg:'',imgWidth:60,imgHeight:60,imgId:'100',dataId:'123456'},
],
nodeType:'',
first: true,
@@ -167,6 +167,15 @@
id: '',
graph: null,
globalGridAttr: {
+ voteSum:'',
+ repairMttcr:'',
+ repairMttcrOther:'',
+ repairDistribType:'',
+ reliabDistribType:'',
+ taskMtbcfOther:'',
+ isRepair:0,
+ taskMtbcf:'',
+ numberInputValue:'',
statusImg:'',
nodeTypeExt:'',
type: 'mesh',
@@ -295,22 +304,25 @@
}
},
mounted() {
- this.initDigram()
+ //this.initDigram()
this.type = 'grid'
},
methods: {
init(row){
this.modelName = row.modelName
- let modelId = row.id
- this.dataForm.id = modelId
- this.getDiagram(modelId)
+ this.dataForm.id = row.id
+ // this.productId = row.productId
+ // this.getProduct(row.productId)
+ this.initDigram(row.productId)
+ console.log(this.dataForm,'init(row){')
},
async getDiagram(modelId) {
let params = {
modelId : modelId
}
let res = await this.$http.get(`/taskReliability/ModelLine/getDiagram`, {params: params})
- if (res.data !== null && res.data.content != null) {
+ console.log(res,'async getDiagram( res')
+ 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)
@@ -331,7 +343,7 @@
this.graph.zoomToFit()
// this.graph.freeze()
},
- initDigram() {
+ async initDigram(productId) {
this.timer = setHartBeat(10, 240);
console.log(document.documentElement.clientWidth, 'document.documentElement.clientWidth')
console.log(document.documentElement.clientHeight, 'document.documentElement.clientHeight')
@@ -480,287 +492,6 @@
},
})
document.getElementById('stencilImg').appendChild(stencil.container)
-
- Graph.registerNode(
- 'custom-rect',
- {
- inherit: 'rect',
- width: 86,
- height: 26,
- zIndex: 10,
- data: {
- dataId: '',
- finishDate: '',
- inspectName: ''
- },
- attrs: {
- body: {
- strokeWidth: 1,
- stroke: 'none',
- fill: 'none',
- },
- text: {
- // fontFamily: '浠垮畫',
- fontSize: 20,
- fill: '#000',
- },
- label: {
- refX: 0,
- refY: 0.5,
- textAnchor: 'start',
- textVerticalAnchor: 'middle',
- textWrap: {
- text: '鏂囧瓧妯℃澘',
- width: -10, // 瀹藉害鍑忓皯 10px
- ellipsis: false, // 鏂囨湰瓒呭嚭鏄剧ず鑼冨洿鏃讹紝鑷姩娣诲姞鐪佺暐鍙�
- breakWord: true, // 鏄惁鎴柇鍗曡瘝
- }
- },
- },
- ports: {...this.ports},
- },
- true,
- )
-
- Graph.registerNode(
- 'custom-polygon',
- {
- inherit: 'polygon',
- width: 86,
- height: 56,
- attrs: {
- body: {
- strokeWidth: 1,
- stroke: '#5F95FF',
- fill: '#EFF4FF',
- },
- // title:{
- // text:'',
- // refX: 40,
- // refY: 38,
- // fontSize: 20,
- // fill: '#262626',
- // 'text-anchor': 'start',
- // },
- text: {
- // refX: 40,
- // refY: 20,
- fontSize: 20,
- fill: '#262626',
- // 'text-anchor': 'start',
- },
- },
- // markup: [
- // {
- // tagName: 'polygon',
- // selector: 'body',
- // },
- // {
- // tagName: 'text',
- // selector: 'title',
- // },
- // {
- // tagName: 'text',
- // selector: 'text',
- // },
- // ],
- ports: {
- ...this.ports
- // items: [
- // {
- // group: 'top',
- // },
- // {
- // group: 'bottom',
- // },
- // ],
- },
- },
- true,
- )
- //
- Graph.registerNode(
- 'custom-circle',
- {
- inherit: 'ellipse',
- width: 120,
- height: 120,
- data: {
- dataId: '',
- finishDate: ''
- },
- attrs: {
- body: {
- strokeWidth: 1,
- stroke: '#5F95FF',
- fill: '#EFF4FF',
- },
- //鏃ユ湡
- title: {
- text: '',
- fontSize: 12,
- fill: '#262626',
- refX: 0.5,
- refY: '100%',
- refY2: -10,
- textAnchor: 'middle',
- textVerticalAnchor: 'bottom',
- },
- // 鍚嶇О
- text: {
- // fontFamily: '浠垮畫',
- fontSize: 20,
- fill: '#262626',
- textWrap: {
- width: 80, // 瀹藉害涓� 80px鎹㈣
- ellipsis: false, // 鏂囨湰瓒呭嚭鏄剧ず鑼冨洿鏃讹紝鑷姩娣诲姞鐪佺暐鍙�
- breakWord: true, // 鏄惁鎴柇鍗曡瘝
- }
- },
- },
- markup: [
- {
- tagName: 'ellipse',
- selector: 'body',
- },
- {
- tagName: 'text',
- selector: 'title',
- },
- {
- tagName: 'text',
- selector: 'text',
- },
- ],
- ports: {...this.ports},
- },
- true,
- )
- Graph.registerNode(
- 'custom-circle1',
- {
- inherit: 'ellipse',
- width: 65,
- height: 65,
- data: {
- dataId: '',
- finishDate: ''
- },
- attrs: {
- body: {
- strokeWidth: 1,
- stroke: '#5F95FF',
- fill: '#EFF4FF',
- },
- //鏃ユ湡
- text: {
- // fontFamily: '浠垮畫',
- fontSize: 12,
- text: '鏃ユ湡鑺傜偣',
- fill: '#262626',
- },
- },
- ports: {...this.ports},
- },
- true,
- )
- Graph.registerNode(
- 'custom-text',
- {
- inherit: 'text-block',
- width: 86,
- height: 56,
- attrs: {
- body: {
- strokeWidth: 1,
- stroke: '#5F95FF',
- fill: '#EFF4FF',
- },
- text: {
- text: '涓撲笟',
- fontSize: 20,
- style: {
- color: this.globalGridAttr.nodeColor
- },
- refX: '0',
- refY: -0.5,
- refY2: 1,
- textAnchor: 'middle',
- textVerticalAnchor: 'middle',
- },
- },
- markup: [
- {
- tagName: 'rect',
- selector: 'body',
- },
- {
- tagName: 'text',
- selector: 'text',
- },
- ],
- ports: {...this.ports},
- },
- true,
- )
- Graph.registerNode(
- 'rectangle',
- {
- width: 86,
- height: 56,
- attrs: {
- body: {
- fill: '#FFF',
- stroke: '#000',
- strokeWidth: 1,
- },
- icon: {
- class: 'el-icon-refresh', // Element UI鍥炬爣鐨刢lass鍚嶇О
- 'xlink:href': '', // 濡傛灉闇�瑕佷娇鐢⊿VG鍥炬爣锛岃璁剧疆xlink:href灞炴�ф潵寮曞叆SVG鏂囦欢
- refX: '50%',
- refY: '50%',
- yAlignment: 'middle',
- xAlignment: 'middle',
- },
- },
- markup: [
- {
- tagName: 'rect',
- selector: 'body',
- },
- {
- tagName: 'i',
- selector: 'icon',
- },
- ],
- ports: {...this.ports},
- },
- true
- )
- // 涓�绾х綉缁滃浘鐨勬棩鏈熸枃瀛楄妭鐐�
- const r5 = this.graph.createNode({
- shape: 'custom-circle',
- data: {
- dataId: '',
- finishDate: '',
- inspectName: ''
- },
- label: '闃舵',
- })
-
- // 浜岀骇缃戠粶鍥炬棩鏈熻妭鐐�
- const r6 = this.graph.createNode({
- shape: 'custom-circle1',
- data: {
- dataId: '',
- finishDate: '',
- inspectName: ''
- },
- })
- // 浜岀骇缃戠粶鍥炬枃瀛楄妭鐐�
- const r9 = this.graph.createNode({
- shape: 'custom-rect'
- })
const imageNodes = this.imgsList.map((item) =>
this.graph.createNode({
shape: 'image',
@@ -791,19 +522,34 @@
ports: {...this.ports},
}),
)
+ let params = {
+ productId : productId
+ }
+ let res = await this.$http.get(`/basicInfo/XhProductModel/getProduct`, {params: params})
+ this.imgsList2 = res.data
+ console.log(this.imgsList2 ,'getProduct(productId)234567890')
const imageNodes2 = this.imgsList2.map((item) =>
this.graph.createNode({
shape: 'image',
- imageUrl: require('/public/modelImg/'+item.imgPath+'.png'),
+ imageUrl: `${window.SITE_CONFIG['apiURL']}/sys/oss/content2?fileId=${item.imgPath}`,
width:item.imgWidth,
height:item.imgHeight,
x:item.imgWidth,
y:item.imgHeight,
data: {
- dataId: item.data.dataId,
+ isRepair:false,
+ dataId: item.dataId,
nodeType: item.nodeType,
- nodeTypeExt: item.data.nodeTypeExt,
- statusImg:item.statusImg
+ nodeTypeExt: item.nodeTypeExt,
+ productType: item.productType,
+ statusImg:item.statusImg,
+ reliabDistribType:item.reliabDistribType,
+ repairDistribType:item.repairDistribType,
+ repairMttcr:item.repairMttcr,
+ repairMttcrOther:item.repairMttcrOther,
+ taskMtbcf:item.taskMtbcf,
+ taskMtbcfOther:item.taskMtbcfOther,
+ voteSum:'',
},
attrs: {
text:{
@@ -1053,7 +799,7 @@
cell.removeTools()
})
- this.getDiagram()
+ await this.getDiagram(this.dataForm.id)
},
showPorts(ports, show) {
for (let i = 0, len = ports.length; i < len; i = i + 1) {
--
Gitblit v1.9.1