From 43a85ad899a3b0b27b50967ff7e11f25d93edd4b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 24 七月 2024 10:41:17 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 117 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 61 insertions(+), 56 deletions(-)
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index e3050f4..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>
@@ -63,7 +63,7 @@
import {setHartBeat} from '@/commonJS/common';
import Cookies from 'js-cookie'
import {getUUID} from '../../../../packages/utils'
- import Mousetrap from 'mousetrap'
+ // import Mousetrap from 'mousetrap'
// var Mousetrap = require('mousetrap');
// import RBDDefault from './RBD-default.json'
@@ -588,10 +588,12 @@
productType: '',
voteNum: '',
repairMttcr: '',
- repairMttcrOther: '',
+ repairMttcrOtherParams2: '',
+ repairMttcrOtherParams3: '',
repairDistribType: '',
reliabDistribType: '',
- taskMtbcfOther: '',
+ taskMtbcfOtherParams2: '',
+ taskMtbcfOtherParams3: '',
isRepair: 0,
taskMtbcf: '',
numberInputValue: '',
@@ -1006,12 +1008,14 @@
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,
- repairMttcrOther: item.repairMttcrOther,
+ repairMttcrOther2: item.repairMttcrOtherParams2,
+ repairMttcrOther3: item.repairMttcrOtherParams3,
imgHeight: item.imgHeight,
imgWidth: item.imgWidth,
@@ -1064,40 +1068,40 @@
// 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.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) {
@@ -1442,16 +1446,8 @@
},
async saveDiagram() {
console.log(JSON.stringify(this.graph.toJSON()), 'graph.toJSON()')
- const nodes = this.graph.getNodes()
- let nodeArr2 = []
- // 妫�鏌ラ櫎褰撳墠鑺傜偣涔嬪鐨勬墍鏈夎妭鐐圭殑鍖呭洿妗嗘槸鍚︾浉浜�
- for (const node of nodes) {
- console.log(node, 'saveDiagram node')
- if (node.getData().nodeType == 'node' && node.getData().productType != 'product_xdy' && node.getData().dataId) {
- nodeArr2.push(node.getData().dataId)
- }
- }
- this.dataForm.nodeArr = nodeArr2
+ // 鑾峰彇鎵�鏈夊瓙鑺傜偣
+ this.getNodeArr()
this.dataForm.content = JSON.stringify(this.graph.toJSON())
this.dataForm.urlPref = window.SITE_CONFIG['apiURL']
console.log(this.dataForm, 'dataFrom')
@@ -1464,11 +1460,24 @@
}
})
},
- async analyzeDiagram() {
- console.log(JSON.stringify(this.graph.toJSON()), 'graph.toJSON()')
+ 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'})
@@ -1481,11 +1490,7 @@
return false; // 鍙栨秷娣诲姞鑺傜偣鎿嶄綔
}
}
- if (node.getData().nodeType === 'node' && node.getData().productType !== 'product_xdy' && node.getData().dataId) {
- nodeArr2.push(node.getData().dataId)
- }
}
- this.dataForm.nodeArr = nodeArr2
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 => {
--
Gitblit v1.9.1