From 481b82866b1714f79dc35ecf2bc26436b027954e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 30 七月 2024 16:08:51 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 1011 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 786 insertions(+), 225 deletions(-)
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index 8566355..4b5be03 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -16,7 +16,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" @click="saveDiagram()">鏆傚瓨</el-button>
- <el-button type="primary" @click="analyzeDiagram()">淇濆瓨</el-button>
+ <el-button type="primary" @click="analyzeDiagram()">鎻愪氦</el-button>
<el-button type="primary" @click="clearDiagram()">娓呯┖鍥惧舰</el-button>
<el-button @click="leftAlign()">
<i style="font-size: 1rem;" class="wt-iconfont icon-zuoduiqi"></i>
@@ -41,16 +41,15 @@
<el-button @click="undo()">鎾ら攢</el-button>
<el-button @click="redo()">閲嶅仛</el-button>
</el-form-item>
+ <el-form-item>
+ <zt-button type="delete" @click="deleteCompment()" />
+ </el-form-item>
</el-form>
<div id="containerImg" style="border: 1px solid #EAEBEE;border-radius: 6px;
box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);height: 100%">
</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"/>
+ <config-node ref="configNode" v-show="type === 'node'"/>
+ <config-edge ref="configEdge" v-show="type === 'edge'"/>
</div>
</el-col>
</el-row>
@@ -59,19 +58,17 @@
<script>
import {Graph, Shape, Addon, Cell} from '@antv/x6'
- import ConfigNode from './ConfigNode/index.vue'
- import ConfigEdge from './ConfigEdge/index.vue'
- import {removeCurrentTabHandle} from '@/commonJS/common'
+ import ConfigNode from './ConfigNode/configNode.vue'
+ import ConfigEdge from './ConfigEdge/configEdge.vue'
import {setHartBeat} from '@/commonJS/common';
import Cookies from 'js-cookie'
import {getUUID} from '../../../../packages/utils'
- import RBDDefault from './RBD-default.json'
+ // import Mousetrap from 'mousetrap'
+ // var Mousetrap = require('mousetrap');
+ // import RBDDefault from './RBD-default.json'
export default {
name: 'RBD-edit-img',
- /*props: {
-
- },*/
props: {
projectId: {
type: String
@@ -91,8 +88,429 @@
ConfigNode,
ConfigEdge
},
+ computed: {
+ RBDDefault() {
+ let url = `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getSvgImage?token=${Cookies.get('token')}&id=`
+ let result = `
+ {
+ "cells":
+ [
+ {
+ "position": {
+ "x": -600,
+ "y": 0
+ },
+ "size": {
+ "width": 60,
+ "height": 40
+ },
+ "attrs": {
+ "text": {
+ "refY": "100%",
+ "textVerticalAnchor": "top",
+ "text": "start",
+ "refY2": 4
+ },
+ "image": {
+ "xlink:href": "${url}10011"
+ }
+ },
+ "visible": true,
+ "shape": "image",
+ "id": "10000",
+ "data": {
+ "type": "imageNodes",
+ "endNodeId": "20000",
+ "dataId": "",
+ "nodeType": "start",
+ "nodeTypeExt": "",
+ "voteNum": ""
+ },
+ "ports": {
+ "groups": {
+ "top": {
+ "position": {
+ "name": "top"
+ },
+ "attrs": {
+ "circle": {
+ "r": 4,
+ "magnet": true,
+ "stroke": "#5F95FF",
+ "strokeWidth": 1,
+ "fill": "#fff",
+ "style": {
+ "visibility": "hidden"
+ }
+ }
+ }
+ },
+ "right": {
+ "position": {
+ "name": "right"
+ },
+ "attrs": {
+ "circle": {
+ "r": 4,
+ "magnet": true,
+ "stroke": "#5F95FF",
+ "strokeWidth": 1,
+ "fill": "#fff",
+ "style": {
+ "visibility": "hidden"
+ }
+ }
+ }
+ },
+ "bottom": {
+ "position": {
+ "name": "bottom"
+ },
+ "attrs": {
+ "circle": {
+ "r": 4,
+ "magnet": true,
+ "stroke": "#5F95FF",
+ "strokeWidth": 1,
+ "fill": "#fff",
+ "style": {
+ "visibility": "hidden"
+ }
+ }
+ }
+ },
+ "left": {
+ "position": {
+ "name": "left"
+ },
+ "attrs": {
+ "circle": {
+ "r": 4,
+ "magnet": true,
+ "stroke": "#5F95FF",
+ "strokeWidth": 1,
+ "fill": "#fff",
+ "style": {
+ "visibility": "hidden"
+ }
+ }
+ }
+ }
+ },
+ "items": [
+ {
+ "id": "top1",
+ "group": "top"
+ },
+ {
+ "id": "right1",
+ "group": "right"
+ },
+ {
+ "id": "bottom1",
+ "group": "bottom"
+ },
+ {
+ "id": "left1",
+ "group": "left"
+ }
+ ]
+ },
+ "zIndex": 1
+ },
+ {
+ "position": {
+ "x": 0,
+ "y": 0
+ },
+ "size": {
+ "width": 60,
+ "height": 40
+ },
+ "attrs": {
+ "text": {
+ "refY": "100%",
+ "textVerticalAnchor": "top",
+ "text": "dashedBox",
+ "refY2": 4
+ },
+ "image": {
+ "xlink:href": "${url}10015"
+ }
+ },
+ "visible": true,
+ "shape": "image",
+ "id": 15000,
+ "data": {
+ "type": "imageNodes",
+ "dataId": "",
+ "nodeType": "dashedBox",
+ "nodeTypeExt": "",
+ "voteNum": ""
+ },
+ "ports": {
+ "groups": {
+ "top": {
+ "position": {
+ "name": "top"
+ },
+ "attrs": {
+ "circle": {
+ "r": 4,
+ "magnet": true,
+ "stroke": "#5F95FF",
+ "strokeWidth": 1,
+ "fill": "#fff",
+ "style": {
+ "visibility": "hidden"
+ }
+ }
+ }
+ },
+ "right": {
+ "position": {
+ "name": "right"
+ },
+ "attrs": {
+ "circle": {
+ "r": 4,
+ "magnet": true,
+ "stroke": "#5F95FF",
+ "strokeWidth": 1,
+ "fill": "#fff",
+ "style": {
+ "visibility": "hidden"
+ }
+ }
+ }
+ },
+ "bottom": {
+ "position": {
+ "name": "bottom"
+ },
+ "attrs": {
+ "circle": {
+ "r": 4,
+ "magnet": true,
+ "stroke": "#5F95FF",
+ "strokeWidth": 1,
+ "fill": "#fff",
+ "style": {
+ "visibility": "hidden"
+ }
+ }
+ }
+ },
+ "left": {
+ "position": {
+ "name": "left"
+ },
+ "attrs": {
+ "circle": {
+ "r": 4,
+ "magnet": true,
+ "stroke": "#5F95FF",
+ "strokeWidth": 1,
+ "fill": "#fff",
+ "style": {
+ "visibility": "hidden"
+ }
+ }
+ }
+ }
+ },
+ "items": [
+ {
+ "id": "top1",
+ "group": "top"
+ },
+ {
+ "id": "right1",
+ "group": "right"
+ },
+ {
+ "id": "bottom1",
+ "group": "bottom"
+ },
+ {
+ "id": "left1",
+ "group": "left"
+ }
+ ]
+ },
+ "zIndex": 2
+ },
+ {
+ "position": {
+ "x": 600,
+ "y": 0
+ },
+ "size": {
+ "width": 60,
+ "height": 40
+ },
+ "attrs": {
+ "text": {
+ "refY": "100%",
+ "textVerticalAnchor": "top",
+ "text": "end",
+ "refY2": 4
+ },
+ "image": {
+ "xlink:href": "${url}10012"
+ }
+ },
+ "visible": true,
+ "shape": "image",
+ "id": "20000",
+ "data": {
+ "type": "imageNodes",
+ "startNodeId": "10000",
+ "dataId": "",
+ "nodeType": "end",
+ "nodeTypeExt": "",
+ "voteNum": ""
+ },
+ "ports": {
+ "groups": {
+ "top": {
+ "position": {
+ "name": "top"
+ },
+ "attrs": {
+ "circle": {
+ "r": 4,
+ "magnet": true,
+ "stroke": "#5F95FF",
+ "strokeWidth": 1,
+ "fill": "#fff",
+ "style": {
+ "visibility": "hidden"
+ }
+ }
+ }
+ },
+ "right": {
+ "position": {
+ "name": "right"
+ },
+ "attrs": {
+ "circle": {
+ "r": 4,
+ "magnet": true,
+ "stroke": "#5F95FF",
+ "strokeWidth": 1,
+ "fill": "#fff",
+ "style": {
+ "visibility": "hidden"
+ }
+ }
+ }
+ },
+ "bottom": {
+ "position": {
+ "name": "bottom"
+ },
+ "attrs": {
+ "circle": {
+ "r": 4,
+ "magnet": true,
+ "stroke": "#5F95FF",
+ "strokeWidth": 1,
+ "fill": "#fff",
+ "style": {
+ "visibility": "hidden"
+ }
+ }
+ }
+ },
+ "left": {
+ "position": {
+ "name": "left"
+ },
+ "attrs": {
+ "circle": {
+ "r": 4,
+ "magnet": true,
+ "stroke": "#5F95FF",
+ "strokeWidth": 1,
+ "fill": "#fff",
+ "style": {
+ "visibility": "hidden"
+ }
+ }
+ }
+ }
+ },
+ "items": [
+ {
+ "id": "top1",
+ "group": "top"
+ },
+ {
+ "id": "right1",
+ "group": "right"
+ },
+ {
+ "id": "bottom1",
+ "group": "bottom"
+ },
+ {
+ "id": "left1",
+ "group": "left"
+ }
+ ]
+ },
+ "zIndex": 3
+ },
+ {
+ "shape": "edge",
+ "id": "66c81c68-0827-4a3c-8343-e2c453d3e9e7",
+ "router": {
+ "name": "manhattan"
+ },
+ "connector": {
+ "name": "rounded"
+ },
+ "source": {
+ "cell": "10000",
+ "port": "right1"
+ },
+ "target": {
+ "cell": 15000,
+ "port": "left1"
+ },
+ "zIndex": 4
+ },
+ {
+ "shape": "edge",
+ "id": "a0f3cf90-6d37-4ee0-a254-90b4ec2b6a7f",
+ "router": {
+ "name": "manhattan"
+ },
+ "connector": {
+ "name": "rounded"
+ },
+ "source": {
+ "cell": 15000,
+ "port": "right1"
+ },
+ "target": {
+ "cell": "20000",
+ "port": "left1"
+ },
+ "zIndex": 5
+ }
+ ]
+ }
+ `
+ return JSON.parse(result)
+ }
+ },
data() {
return {
+ nodeX:'',
+ nodeY:'',
isFirstLoad: true,
hasMoveNode: false,
hasMoveSingleNode: null,
@@ -103,26 +521,6 @@
modelType: '',
timer: null,
imagesList: [
- // {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: 'connect',
- // imgName: 'bridge',
- // nodeType: 'bridge',
- // imgWidth: 50,
- // imgHeight: 50,
- // imgId: '12',
- // data: {}
- // },
{
imgPath: 'parallel',
imgName: 'parallel',
@@ -173,10 +571,15 @@
diagramIdDisabled: false,
dataForm: {
id: null,
+ pid: null,
+ model_tag: '',
+ model_name: '',
+ product_id: null,
content: null,
publishContent: null,
hasPublish: 0,
urlPref: '',
+ nodeArr: []
},
type: '',
id: '',
@@ -185,10 +588,12 @@
productType: '',
voteNum: '',
repairMttcr: '',
- repairMttcrOther: '',
+ repairMttcrOtherParams2: '',
+ repairMttcrOtherParams3: '',
repairDistribType: '',
reliabDistribType: '',
- taskMtbcfOther: '',
+ taskMtbcfOtherParams2: '',
+ taskMtbcfOtherParams3: '',
isRepair: 0,
taskMtbcf: '',
numberInputValue: '',
@@ -345,14 +750,12 @@
token: Cookies.get('token'),
}
let res = await this.$http.get(`/taskReliability/ModelLine/getDiagram`, {params: params})
- if (res.data !== null && (res.data.content != null)) {
- this.dataForm = res.data
+ this.dataForm = res.data
+ if (res.data.content != null) {
+ console.log(this.dataForm, 'getDiagram datafrom')
+ console.log(res.data, 'getDiagram res.data')
this.diagramJson = JSON.parse(this.dataForm.content)
- if (this.diagramJson.cells.length !== 0) {
- this.graph.fromJSON(this.diagramJson)
- } else {
- this.graph.fromJSON(RBDDefault)
- }
+ this.graph.fromJSON(this.diagramJson)
this.isFirstLoad = false;
console.log(this.diagramJson.cells.length, 'this.diagramJson.cells.length')
@@ -360,13 +763,16 @@
// this.graph.centerContent()
// this.graph.zoomToFit()
} else {
- await this.clearDiagram()
+ this.graph.fromJSON(this.RBDDefault)
+ this.isFirstLoad = false
}
},
async clearDiagram() {
- this.dataForm.id = null
// this.graph.fromJSON(this.emptyJson)
- this.graph.fromJSON('')
+ console.log(this.RBDDefault, 'clearDiagram')
+ this.graph.fromJSON(this.RBDDefault)
+ this.graph.positionContent('left')
+ this.isFirstLoad = false;
// this.graph.centerContent()
// this.graph.zoomToFit()
// this.graph.freeze()
@@ -393,9 +799,6 @@
}
},
},
- // panning: {
- // enabled: true,
- // },
scroller: {
enabled: true,
pageVisible: true,
@@ -416,9 +819,6 @@
connecting: {
router: {
name: 'manhattan',
- // args: {
- // padding: 1,
- // },
},
connector: {
name: 'rounded',
@@ -429,6 +829,7 @@
anchor: 'center',
connectionPoint: 'anchor',
allowBlank: false,
+ allowLoop:false, // 鏄惁鍏佽鍒涘缓寰幆杩炵嚎锛屽嵆杈圭殑璧峰鑺傜偣鍜岀粓姝㈣妭鐐逛负鍚屼竴鑺傜偣锛岄粯璁や负 true
snap: {
radius: 20,
},
@@ -436,9 +837,10 @@
return new Shape.Edge({
attrs: {
line: {
+ // sourceMarker: 'block', // 瀹炲績绠ご
stroke: '#A2B1C3',
strokeWidth: 2,
- targetMarker: {fill: 'none'}
+ targetMarker: null
}
},
labels: [{
@@ -501,7 +903,7 @@
getDropNode: (node) => {
const {width, height} = node.size()
if (node.getData().type && node.getData().nodeType === 'dashedBox') {
- return node.clone().size(100, 60)
+ return node.clone().size(60, 40)
}
if (node.getData().type && node.getData().type === 'imageNodes2') {
return node.clone({keepId: true})
@@ -585,33 +987,45 @@
}
let res = await this.$http.get(`/basicInfo/XhProductModel/getProduct`, {params: params})
this.imagesList2 = res.data
+ /*for(let i =0;i<this.imagesList2.length;i++){
+
+ }*/
console.log(this.imagesList2, 'getProduct(productId)234567890')
const imageNodes2 = this.imagesList2.map((item) =>
this.graph.createNode({
shape: 'image',
- imageUrl: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getProductImg?token=${Cookies.get('token')}&id=${item.imgPath}`,
+ //imageUrl: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getProductImg?token=${Cookies.get('token')}&id=${item.imgPath}`,
width: 60,
height: 60,
id: item.dataId, // 鎵嬪姩璁剧疆鑺傜偣鐨� ID
data: {
type: 'imageNodes2',
- isRepair: item.isRepair,
dataId: item.dataId,
nodeType: item.nodeType,
nodeTypeExt: item.nodeTypeExt,
productType: item.productType,
statusImg: item.statusImg,
- reliabDistribType: item.reliabDistribType,
- repairDistribType: item.repairDistribType,
- repairMttcr: item.repairMttcr,
- repairMttcrOther: item.repairMttcrOther,
+
+ reliabDistribType: item.reliabDistribType ? item.reliabDistribType : 1,
taskMtbcf: item.taskMtbcf,
- taskMtbcfOther: item.taskMtbcfOther,
+ taskMtbcfOther2: item.taskMtbcfOtherParams2,
+ taskMtbcfOther3: item.taskMtbcfOtherParams3,
+
+ isRepair: item.isRepair,
+ repairDistribType: item.repairDistribType ? item.repairDistribType : 1,
+ repairMttcr: item.repairMttcr,
+ repairMttcrOther2: item.repairMttcrOtherParams2,
+ repairMttcrOther3: item.repairMttcrOtherParams3,
+
imgHeight: item.imgHeight,
imgWidth: item.imgWidth,
voteNum: '',
},
attrs: {
+ image: {
+ 'xlink:href': `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getSvgImage?token=${Cookies.get('token')}&id=${item.imgPath}`,
+ //'xlink:href': urlObject.createObjectURL(new Blob([item.svgContent])),
+ },
text: {
text: item.imgName,
fontSize: 14,
@@ -652,6 +1066,42 @@
stencil.load(imageNodes, 'group1')
stencil.load(imageNodes2, 'group2')
+// konami code!
+ // 鍗曞嚮node鑺傜偣
+ // this.graph.on('node:click', ({ e, x, y, node, view}) => {
+ // Mousetrap.bind('up', function(e) {
+ // e.preventDefault();
+ // node.getBBox().x
+ // node.getBBox().y
+ // setTimeout(()=>{
+ // node.position(node.getBBox().x,node.getBBox().y -0.5)
+ // console.log(x,y,'鎸変笅浜嗏啈閿� up');
+ // },100)
+ // })
+ // Mousetrap.bind('down', function(e) {
+ // e.preventDefault();
+ // setTimeout(()=>{
+ // node.position(node.getBBox().x,node.getBBox().y+0.5)
+ // console.log(x,y,'鎸変笅浜嗏啌閿� down');
+ // },100)
+ //
+ // })
+ // Mousetrap.bind('left', function(e) {
+ // e.preventDefault();
+ // setTimeout(()=>{
+ // node.position(node.getBBox().x-0.5,node.getBBox().y)
+ // console.log(x,y,'鎸変笅浜嗏啇閿� left');
+ // },100)
+ //
+ // })
+ // Mousetrap.bind('right', function(e) {
+ // e.preventDefault();
+ // setTimeout(()=>{
+ // node.position(node.getBBox().x+0.5,node.getBBox().y)
+ // console.log(x,y,'鎸変笅浜嗏啋閿� right');
+ // },100)
+ // })
+ // })
this.graph.bindKey(['meta+c', 'ctrl+c'], () => {
const cells = this.graph.getSelectedCells()
if (cells.length) {
@@ -684,85 +1134,7 @@
})
//delete
this.graph.bindKey('delete', () => {
- const cells = this.graph.getSelectedCells()
- console.log(cells, 'cells')
- if (cells.length === 1) {
- let node = cells[0]
- if (!node.isNode()) {
- this.$message({message: '璇烽�変腑鑺傜偣', type: 'warning'})
- return false; // 鍙栨秷鎿嶄綔
- }
- let nodeType = node.getData().nodeType
- let deleteType = 0
- if (nodeType === 'node' || nodeType === 'dashedBox') {
- deleteType = 1
- } else if ('parallel,switch,vote,bridge'.indexOf(nodeType) > -1) {
- deleteType = 2
- }
- let canDelete = false
- if (nodeType === 'start' || nodeType === 'end') {
- this.$message({message: '鏃犳硶鍒犻櫎璧峰鍜岀粨鏉熻妭鐐�', type: 'warning'})
- return false; // 鍙栨秷鎿嶄綔
- }
- if (deleteType > 0) {
- let startNode = null
- if (deleteType === 1) {
- startNode = node
- } else if (deleteType === 2) {
- startNode = this.graph.getCellById(node.getData().startNodeId)
- }
- let isSeriesNode = this.isSeriesNode(startNode, node)
- if (isSeriesNode) {
- let inLine = this.getInLinesOfNode(startNode)
- let outLine = this.getOutLinesOfNode(node)
- let inLineIsToLine = this.hasOtherLineToMyLine(inLine[0].id)
- let inNode = isSeriesNode.inNode
- let outNode = isSeriesNode.outNode
- console.log(inLine, outLine, 'inLine,outLine')
- console.log(inNode, outNode, 'inNode,outNode')
- if (inLineIsToLine) {
- inLine[0].target = {cell: outNode.id, port: 'left1'}
- } else {
- outLine[0].source = {cell: inNode.id, port: 'right1'}
- }
- //鎻愮ず鏄惁瑕佸垹闄�
- this.$confirm('鏄惁鍒犻櫎璇ヨ妭鐐�?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- if (deleteType === 1){
- node.remove()
- }
- else{
- this.deleteCombination(node)
- }
- this.$message({
- type: 'success',
- message: '鍒犻櫎鎴愬姛!'
- })
- }).catch(() => {
- this.$message({
- type: 'info',
- message: '宸插彇娑堝垹闄�'
- })
- })
- }
- if (this.isMultipleBrach(node)) {
- //鎻愮ず鏄惁瑕佸垹闄�
- if (deleteType === 1)
- node.remove()
- else
- this.deleteCombination(node)
- return
- }
- }
- //鎻愮ず涓嶈兘鍒犻櫎
- } else {
- //鎻愮ず涓嶈兘鍒犻櫎
- this.$message({message: '鍙兘閫変腑涓�涓妭鐐�', type: 'warning'})
- return false; // 鍙栨秷鎿嶄綔
- }
+ this.deleteCompment()
})
// zoom
this.graph.bindKey(['ctrl+1', 'meta+1'], () => {
@@ -780,7 +1152,7 @@
})
this.graph.on('blank:click', ({cell}) => {
- this.reset()
+ // this.reset()
// this.type.value = "grid"
this.type = 'grid'
// this.id = cell.id
@@ -817,41 +1189,33 @@
}
}
node.remove()
-
- /*//濡傛灉鑺傜偣涓庤妭鐐圭浉浜�
- console.log(node.position().x, node.position().x, 'node.position().x')
- if (nodeType === 'bridgeConnection') {
- this.getBridgeConnection()
- }*/
});
this.graph.on('cell:contextmenu', ({cell}) => {
// this.type.value = cell.isNode() ? "node" : "edge"
this.type = cell.isNode() ? 'node' : 'edge'
- this.shape = cell.shape
- this.id = cell.id
+ /* this.shape = cell.shape
+ this.id = cell.id*/
if (this.type === 'node') {
- this.nodeType = cell.getData().nodeType
- // console.log(this.nodeType, cell.id, 'this.nodeType')
+ //this.nodeType = cell.getData().nodeType
+ this.$refs.configNode.loadData(cell)
+ } else {
+ this.$refs.configNode.loadData(cell)
}
- // console.log(this.shape, 'this.shape')
- // this.nodeOpt(this.id, this.globalGridAttr)
})
//鍗曞嚮杈硅妭鐐�
this.graph.on('edge:click', ({edge}) => {
- this.reset()
- edge.attr('line/stroke', 'orange')
- edge.prop('labels/0', {
- attrs: {
- body: {
- stroke: 'orange',
- },
- },
+ // this.reset()
+ // edge.attr('line/stroke', 'orange')
+ // edge.prop('labels/0', {
+ // attrs: {
+ // body: {
+ // stroke: 'orange',
+ // },
+ // },
+ //
+ // })
+ })
- })
- })
- // 鍗曞嚮node鑺傜偣
- this.graph.on('node:click', ({node}) => {
- })
// 鎺у埗杩炴帴妗╂樉绀�/闅愯棌
this.graph.on('node:delete', ({view, e}) => {
e.stopPropagation()
@@ -953,28 +1317,185 @@
})
})
},
+ deleteCompment() {
+ const cells = this.graph.getSelectedCells()
+ console.log(cells, 'cells')
+ if (cells.length === 1) {
+ let node = cells[0]
+ if (!node.isNode()) {
+ this.$confirm('鏄惁鍒犻櫎璇ヨ繛鎺ョ嚎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ node.remove()
+ this.$message({
+ type: 'success',
+ message: '鍒犻櫎鎴愬姛!'
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ })
+ })
+ // this.$message({message: '璇烽�変腑鑺傜偣', type: 'warning'})
+ return false; // 鍙栨秷鎿嶄綔
+ }
+ let nodeType = node.getData().nodeType
+ let deleteType = 0
+ if (nodeType === 'node' || nodeType === 'dashedBox') {
+ deleteType = 1
+ } else if ('parallel,switch,vote,bridge'.indexOf(nodeType) > -1) {
+ deleteType = 2
+ }
+
+ let canDelete = false
+ if (nodeType === 'start' || nodeType === 'end') {
+ this.$message({message: '涓嶅厑璁稿垹闄よ捣濮嬪拰缁撴潫鑺傜偣', type: 'warning'})
+ return false; // 鍙栨秷鎿嶄綔
+ }
+ if (deleteType > 0) {
+ let startNode = null
+ if (deleteType === 1) {
+ startNode = node
+ } else if (deleteType === 2) {
+ startNode = this.graph.getCellById(node.getData().startNodeId)
+ }
+
+ let isSeriesNode = this.isSeriesNode(startNode, node)
+ let isMultipleBrach = this.isMultipleBrach(node)
+ if (isSeriesNode) {
+ //涓茶仈
+ let inLine = this.getInLinesOfNode(startNode)
+ let outLine = this.getOutLinesOfNode(node)
+ let inLineIsToLine = this.hasOtherLineToMyLine(inLine[0].id)
+ let inNode = isSeriesNode.inNode
+ let outNode = isSeriesNode.outNode
+ console.log(inLine, outLine, 'inLine,outLine')
+ console.log(inNode, outNode, 'inNode,outNode')
+ //鎻愮ず鏄惁瑕佸垹闄�
+ this.$confirm('鏄惁鍒犻櫎璇ヨ妭鐐�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ if (inLineIsToLine) {
+ inLine[0].target = {cell: outNode.id, port: 'left1'}
+ } else {
+ outLine[0].source = {cell: inNode.id, port: 'right1'}
+ }
+ if (deleteType === 1) {
+ node.remove()
+ } else {
+ this.deleteCombination(node)
+ }
+ this.$message({
+ type: 'success',
+ message: '鍒犻櫎鎴愬姛!'
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ })
+ return false
+ })
+ }else if (this.isMultipleBrach(node)) {
+ //鎻愮ず鏄惁瑕佸垹闄�
+ this.$confirm('鏄惁鍒犻櫎璇ヨ妭鐐�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ /* if (inLineIsToLine) {
+ inLine[0].target = {cell: outNode.id, port: 'left1'}
+ } else {
+ outLine[0].source = {cell: inNode.id, port: 'right1'}
+ }*/
+ if (deleteType === 1)
+ node.remove()
+ else
+ this.deleteCombination(node)
+ this.$message({
+ type: 'success',
+ message: '鍒犻櫎鎴愬姛!'
+ })
+
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ })
+ return false
+ })
+ }else {
+ //鎻愮ず涓嶈兘鍒犻櫎
+ this.$message({message: '璇ユ潯绾胯矾涓婂彧鏈夎鑺傜偣锛屾棤娉曞垹闄�', type: 'warning'})
+ return false; // 鍙栨秷鎿嶄綔
+ }
+ }
+ } else {
+ //鎻愮ず涓嶈兘鍒犻櫎
+ this.$message({message: '鍙兘閫変腑涓�涓妭鐐�', type: 'warning'})
+ return false; // 鍙栨秷鎿嶄綔
+ }
+ },
async search() {
await this.getDiagram();
},
async saveDiagram() {
console.log(JSON.stringify(this.graph.toJSON()), 'graph.toJSON()')
+ // 鑾峰彇鎵�鏈夊瓙鑺傜偣
+ this.getNodeArr()
this.dataForm.content = JSON.stringify(this.graph.toJSON())
this.dataForm.urlPref = window.SITE_CONFIG['apiURL']
console.log(this.dataForm, 'dataFrom')
await this.$http[this.dataForm.id === null ? 'post' : 'put'](`/taskReliability/ModelLine/`, this.dataForm).then(async res => {
if (res.msg === 'success') {
+ this.$emit('refreshDataList')
this.$alert('淇濆瓨鎴愬姛', '鎻愮ず', {
confirmButtonText: '纭畾'
})
}
})
},
+ getNodeArr(){
+ const nodes = this.graph.getNodes()
+ let nodeArr2 = []
+ // 妫�鏌ラ櫎褰撳墠鑺傜偣涔嬪鐨勬墍鏈夎妭鐐圭殑鍖呭洿妗嗘槸鍚︾浉浜�
+ for (const node of nodes) {
+ console.log(node, 'saveDiagram node')
+ if (node.getData().nodeType == 'node' && node.getData().dataId) {
+ nodeArr2.push(node.getData().dataId)
+ }
+ }
+ this.dataForm.nodeArr = nodeArr2
+ },
async analyzeDiagram() {
console.log(JSON.stringify(this.graph.toJSON()), 'graph.toJSON()')
+ // 妫�鏌ラ櫎褰撳墠鑺傜偣涔嬪鐨勬墍鏈夎妭鐐圭殑鍖呭洿妗嗘槸鍚︾浉浜�
+ // 鑾峰彇鎵�鏈夊瓙鑺傜偣
+ this.getNodeArr()
+ const nodes = this.graph.getNodes()
+ for (const node of nodes) {
+ if(node.getData().nodeType === 'dashedBox'){
+ this.$message({message: '璇ユā鍨嬩腑瀛樺湪铏氭锛屾棤娉曚繚瀛�', type: 'warning'})
+ return false; // 鍙栨秷娣诲姞鑺傜偣鎿嶄綔
+ }
+ if(node.getData().nodeType === 'vote'){
+ const edges = this.graph.getConnectedEdges(node);
+ if(node.getData().voteNum>=edges.length){
+ this.$message({message: '琛ㄥ喅鏁伴噺涓嶈兘楂樹簬璇ヨ妭鐐圭殑杩涚嚎鏁伴噺', type: 'warning'})
+ return false; // 鍙栨秷娣诲姞鑺傜偣鎿嶄綔
+ }
+ }
+ }
this.dataForm.content = JSON.stringify(this.graph.toJSON())
this.dataForm.urlPref = window.SITE_CONFIG['apiURL']
await this.$http['post'](`/taskReliability/ModelLine/analyze`, this.dataForm).then(async res => {
if (res.msg === 'success') {
+ this.$emit('refreshDataList')
this.$alert('瑙ｆ瀽鎴愬姛', '鎻愮ず', {
confirmButtonText: '纭畾'
})
@@ -1119,12 +1640,14 @@
let dragNodeType = dragNode.getData().nodeType
let offHeight = 50
if (dragNodeType === 'node') {
- offHeight = 50
+ offHeight = 60
} else if (dragNodeType === 'bridgeConnection') {
- offHeight = 230
+ offHeight = 175
} else {
offHeight = 70
}
+ let centerX = 0, centerY = 0;
+
if (graphNodeType === 'dashedBox') { //铏氭
const edges = this.graph.getConnectedEdges(graphNode); // 鑾峰彇鐢诲竷涓婂師鏈夌殑鑺傜偣鎵�鏈夎繘鏉ョ殑绾�
let inEdges = edges.filter(edge => edge.target.cell === graphNode.id)
@@ -1140,14 +1663,24 @@
endNode = this.graph.getCellById(endNodeId)
}
if (startNode && endNode) {
- let centerY = graphNode.position().y
- let result = this.addNodeAndConnect(graphNode, dragNode, dragNode.position().x, centerY)
- if (!result){
+ centerX = graphNode.position().x + graphNode.getBBox().width / 2
+ centerY = graphNode.position().y + graphNode.getBBox().height / 2
+ let result = this.addNodeAndConnect(graphNode, dragNode, centerX, centerY)
+ if (!result) {
dragNode.remove()
+ this.$message({message: '娌℃湁瓒冲鐨勭┖闂存斁缃鑺傜偣锛岃鎵╁ぇ鍓╀綑绌洪棿', type: 'warning'})
return
}
- inEdges[0].target = {cell: result.newStartNode.id, port: 'left1'}
- outEdges[0].source = {cell: result.newEndNode.id, port: 'right1'}
+
+ let startPort = 'right1'
+ let endPort = 'left1'
+ if ((inEdges[0].target.port == 'top1' || outEdges[0].source.port == 'bottom1') && ('parallel,switch,vote,bridge'.indexOf(dragNodeType)) == -1) {
+ startPort = 'bottom1'
+ endPort = 'top1'
+ }
+
+ inEdges[0].target = {cell: result.newStartNode.id, port: endPort}
+ outEdges[0].source = {cell: result.newEndNode.id, port: startPort}
graphNode.remove()
}
} else { //骞惰缁撴瀯
@@ -1158,22 +1691,24 @@
let maxY = graphNode.position().y + graphNode.getBBox().height
const edges = this.graph.getConnectedEdges(graphNode); // 鑾峰彇鐢诲竷涓婂師鏈夌殑鑺傜偣鎵�鏈夎繘鏉ョ殑绾�
+ // 鑾峰彇杩炴帴绾跨殑璺緞鏁版嵁
let inEdges = edges.filter(edge => edge.target.cell === graphNode.id)
//閬嶅巻杩欎釜缁勫悎閲岄潰鎵�鏈夎妭鐐癸紝 淇敼minY锛宮axY
-
let pointXY = {minY: minY, maxY: maxY}
console.log(pointXY, 'old')
this.getYRange(inEdges, graphNodeStartNode, pointXY)
console.log(pointXY, 'new')
- let minX = graphNodeStartNode.position().x + graphNodeStartNode.getBBox().width
+ let minX = graphNodeStartNode.position().x + graphNode.getBBox().width + 15
let maxX = graphNode.position().x
let centerX = minX + (maxX - minX) / 2
- let centerY = graphNodeY - pointXY.minY > pointXY.maxY - graphNodeY ? pointXY.maxY + 30 : pointXY.minY - offHeight - 30
+ let centerY = graphNodeY + graphNode.getBBox().height / 2 - pointXY.minY > pointXY.maxY - (graphNodeY + graphNode.getBBox().height / 2) ?
+ pointXY.maxY + offHeight / 2 + 30 : pointXY.minY - offHeight / 2 - 30
let result = this.addNodeAndConnect(null, dragNode, minX, centerY)
- if (!result){
+ if (!result) {
dragNode.remove()
+ this.$message({message: '娌℃湁瓒冲鐨勭┖闂存斁缃鑺傜偣锛岃鎵╁ぇ鍓╀綑绌洪棿', type: 'warning'})
return
}
this.graph.addEdge({
@@ -1190,45 +1725,69 @@
})
}
},
- addNodeAndConnect(targetNode, dragNode, leftX, centerY) { // graphCell鏄敾甯冧笂鍘熸湁鐨勮妭鐐广�俤ragNode鏄綋鍓嶆嫋鎷界殑鑺傜偣
- let width =100, height = 80, leftTopX = leftX , leftTopY = centerY
+ addNodeAndConnect(targetNode, dragNode, centerX, centerY) { // graphCell鏄敾甯冧笂鍘熸湁鐨勮妭鐐广�俤ragNode鏄綋鍓嶆嫋鎷界殑鑺傜偣
+ let width = 100,
+ height = 80,
+ leftTopX = centerX,
+ leftTopY = centerY
let dragNodeType = dragNode.getData().nodeType
if (dragNodeType === 'node') {
- width =60
+ width = 60
height = 60
- }else if (dragNodeType === 'dashedBox') {
- width =100
- height = 60
+ } else if (dragNodeType === 'dashedBox') {
+ width = 60
+ height = 40
} else if (dragNodeType === 'bridgeConnection') {
- width =450
- height = 160
- // leftTopY = 240/2
+ width = 550
+ height = 175
} else {
- width =270
+ width = 270
height = 60
}
-
- if (!this.canPlace(targetNode,dragNode,{leftTopX, leftTopY, width, height})){
+ leftTopX = centerX - width / 2
+ leftTopY = centerY - height / 2
+ if (!this.canPlace(targetNode, dragNode, {leftTopX, leftTopY, width, height})) {
return false
}
if (dragNodeType === 'node' || dragNodeType === 'dashedBox') {
- dragNode.position(leftX, centerY)
+ dragNode.position(leftTopX, leftTopY)
return {newStartNode: dragNode, newEndNode: dragNode}
} else if (dragNodeType === 'bridgeConnection') {
- return this.createBridgeConnection(leftX, centerY, dragNode)
+ return this.createBridgeConnection(leftTopX, leftTopY, dragNode)
} else {
- return this.createParallelBrach(leftX, centerY, dragNode)
+ return this.createParallelBrach(leftTopX, centerY, dragNode)
}
},
// 鐩镐氦鐨勮竟
addNodeAndInsertEdge(graphEdge, dragNode) {
+ const source = graphEdge.getSourceCell()
+ const target = graphEdge.getTargetCell()
+
+ let centerX = 0
+ let centerY = 0
+ if (!source.isNode() || !target.isNode()) {
+ if (source.isNode()) {
+ centerX = source.position().x + source.getBBox().width / 2
+ centerY = dragNode.position().y + dragNode.getBBox().height / 2
+ } else {
+ centerX = target.position().x + target.getBBox().width / 2
+ centerY = dragNode.position().y + dragNode.getBBox().height / 2
+ }
+ } else {
+ centerX = dragNode.position().x + dragNode.getBBox().width / 2
+ centerY = source.position().y + source.getBBox().height / 2
+ if (target.getData().nodeType === 'node') {
+ centerY = target.position().y + target.getBBox().height / 2
+ }
+ }
+
let startNodeId = graphEdge.source.cell
let startNode = this.graph.getCellById(startNodeId)
let endNodeId = graphEdge.target.cell
let endNode = this.graph.getCellById(endNodeId)
+
if (startNode && endNode) {
- let centerY = dragNode.position().y
let isRight = true;
let startPort = 'right1'
let endPort = 'left1'
@@ -1236,17 +1795,20 @@
startPort = 'bottom1'
endPort = 'top1'
}
+
if (this.hasOtherLineToMyLine(graphEdge.id)) {
let leftX = startNode.position().x + startNode.getBBox().width
let rightX = endNode.position().x
- let centerX = dragNode.position().x + dragNode.getBBox().width / 2
+ // let centerX = dragNode.position().x + dragNode.getBBox().width / 2
if (centerX - leftX < rightX - centerX) {
isRight = false
}
}
- let result = this.addNodeAndConnect(null, dragNode, dragNode.position().x, centerY)
- if (!result){
+
+ let result = this.addNodeAndConnect(null, dragNode, centerX, centerY)
+ if (!result) {
dragNode.remove()
+ this.$message({message: '娌℃湁瓒冲鐨勭┖闂存斁缃鑺傜偣锛岃鎵╁ぇ鍓╀綑绌洪棿', type: 'warning'})
return
}
if (isRight) {
@@ -1257,7 +1819,6 @@
router: {name: 'manhattan'},
connector: {name: 'rounded'}
})
-
} else {
this.graph.addEdge({
source: {cell: startNode, port: startPort},
@@ -1327,15 +1888,16 @@
})*/
},
createBridgeConnection(x, y, dragNode) {
- const leftTopDashedBox = this.createDashedBox(x + 120, y)
- const rightTopDashedBox = this.createDashedBox(x + 400, y)
+ console.log(x, y, 'leftX centerY')
+ const leftTopDashedBox = this.createDashedBox(x + 40, y)
+ const rightTopDashedBox = this.createDashedBox(x + 380, y)
- const leftConnectNode = this.createConnectNode(x + 50, y + 80)
- const alignCenterDashedBox = this.createDashedBox(x + 260, y + 80)
- const rightConnectNode = this.createBridgeNode(x + 550, y + 80)
+ const leftConnectNode = this.createConnectNode(x, y + 87)
+ const alignCenterDashedBox = this.createDashedBox(x + 209, y + 87)
+ const rightConnectNode = this.createBridgeNode(x + 530, y + 87)
- const leftBottomDashedBox = this.createDashedBox(x + 120, y + 160)
- const rightBottomDashedBox = this.createDashedBox(x + 400, y + 160)
+ const leftBottomDashedBox = this.createDashedBox(x + 40, y + 160)
+ const rightBottomDashedBox = this.createDashedBox(x + 380, y + 160)
rightConnectNode.setData({startNodeId: leftConnectNode.id})
leftConnectNode.setData({endNodeId: rightConnectNode.id})
@@ -1355,39 +1917,39 @@
source: {cell: leftConnectNode, port: 'right1'},
target: {cell: leftTopDashedBox, port: 'left1'},
router: {name: 'manhattan'},
- connector: {name: 'rounded'}
+ connector: {name: 'rounded'},
})
this.graph.addEdge({
source: {cell: leftConnectNode, port: 'right1'},
target: {cell: leftBottomDashedBox, port: 'left1'},
router: {name: 'manhattan'},
- connector: {name: 'rounded'}
+ connector: {name: 'rounded'},
})
let edgeTop = this.graph.addEdge({
source: {cell: leftTopDashedBox, port: 'right1'},
target: {cell: rightTopDashedBox, port: 'left1'},
router: {name: 'manhattan'},
- connector: {name: 'rounded'}
+ connector: {name: 'rounded'},
})
let edgeBottom = this.graph.addEdge({
source: {cell: leftBottomDashedBox, port: 'right1'},
target: {cell: rightBottomDashedBox, port: 'left1'},
router: {name: 'manhattan'},
- connector: {name: 'rounded'}
+ connector: {name: 'rounded'},
})
this.graph.addEdge({
source: {cell: rightTopDashedBox, port: 'right1'},
target: {cell: rightConnectNode, port: 'left1'},
router: {name: 'manhattan'},
- connector: {name: 'rounded'}
+ connector: {name: 'rounded'},
})
this.graph.addEdge({
source: {cell: rightBottomDashedBox, port: 'right1'},
target: {cell: rightConnectNode, port: 'left1'},
router: {name: 'manhattan'},
- connector: {name: 'rounded'}
+ connector: {name: 'rounded'},
})
this.graph.addEdge({
@@ -1410,8 +1972,8 @@
let dashedBox = this.graph.addNode({
shape: 'image',
// imageUrl: require('/public/modelImg/' + item.imgPath + '.png'),
- width: 100,
- height: 60,
+ width: 60,
+ height: 40,
id: dashId,
data: {
isSelfCreated: true,
@@ -1445,7 +2007,6 @@
const dragNodeId = getUUID().toString()
let connectNode = this.graph.addNode({
shape: 'image',
- // imageUrl: require('/public/modelImg/' + item.imgPath + '.png'),
width: 10,
height: 10,
id: connectId,
@@ -1657,30 +2218,30 @@
console.log(edges, '鑾峰彇鐢诲竷涓婄殑缁撴潫鑺傜偣鎵�鏈夌殑绾� edges')
return edges.filter(edge => edge.source.cell === node.id)
},
- canPlace(targetNode,dragNode,box2){
+ canPlace(targetNode, dragNode, box2) {
const nodes = this.graph.getNodes()
let intersectNodes = []
// 妫�鏌ラ櫎褰撳墠鑺傜偣涔嬪鐨勬墍鏈夎妭鐐圭殑鍖呭洿妗嗘槸鍚︾浉浜�
for (const otherNode of nodes) {
if (otherNode === dragNode || otherNode === targetNode) continue;
- const bbox1 = otherNode.getBBox();
- if (bbox1.x < box2.leftTopX + box2.width &&
- bbox1.x + bbox1.width > box2.leftTopX &&
- bbox1.y < box2.leftTopY + box2.height &&
- bbox1.y + bbox1.height > box2.leftTopY) {
- intersectNodes.push(otherNode);
- }
+ const bbox1 = otherNode.getBBox();
+ if (bbox1.x < box2.leftTopX + box2.width &&
+ bbox1.x + bbox1.width > box2.leftTopX &&
+ bbox1.y < box2.leftTopY + box2.height &&
+ bbox1.y + bbox1.height > box2.leftTopY) {
+ intersectNodes.push(otherNode);
+ }
}
- console.log(box2,'box2')
- console.log(intersectNodes,'intersectNodes')
+ console.log(box2, 'box2')
+ console.log(intersectNodes, 'intersectNodes')
return intersectNodes.length <= 0;
},
- undo(){
+ undo() {
if (this.graph.history.canUndo()) {
this.graph.history.undo()
}
},
- redo(){
+ redo() {
if (this.graph.history.canRedo()) {
this.graph.history.redo()
}
--
Gitblit v1.9.1