From 850e7419884976da2361e626a4318270ff959075 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 22 三月 2024 10:45:03 +0800
Subject: [PATCH] 一个设备只能拖一次
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 19 ++++++---
web/src/views/modules/taskReliability/ConfigNode/index.vue | 57 +++++++++++++++-------------
2 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/web/src/views/modules/taskReliability/ConfigNode/index.vue b/web/src/views/modules/taskReliability/ConfigNode/index.vue
index 0ba5b6f..1bce12e 100644
--- a/web/src/views/modules/taskReliability/ConfigNode/index.vue
+++ b/web/src/views/modules/taskReliability/ConfigNode/index.vue
@@ -20,35 +20,37 @@
<el-form-item v-show="nodeType=='vote' || (nodeType=='node' && showNumberInput)" label="琛ㄥ喅鏁伴噺" prop="voteNum" label-width="80px">
<el-input type="number" v-model="globalGridAttr.voteNum" @change="onNumberInputValue" placeholder="璇疯緭鍏ユ暟瀛�"></el-input>
</el-form-item>
- <el-form-item v-show="nodeType=='node'" label="鍙潬鎬у垎甯冪被鍨�" prop="reliabDistribType" label-width="125px">
- <zt-dict style="width: 100%" v-model="globalGridAttr.reliabDistribType" @input="onReliabDistribType" dict="ReliabDistribType" placeholder="鍙潬鎬у垎甯冪被鍨�" clearable/>
- </el-form-item>
- <el-form-item v-show="nodeType=='node'" label="MTBCF" prop="taskMtbcf" label-width="80px">
- <el-input v-model="globalGridAttr.taskMtbcf" @change="onTaskMtbcfChange"></el-input>
- </el-form-item>
- <el-form-item v-show="nodeType=='node'" label="鍙傛暟2" prop="taskMtbcfOther" label-width="80px">
- <el-input v-model="globalGridAttr.taskMtbcfOther" @change="onTaskMtbcfOtherChange"></el-input>
- </el-form-item>
- <el-form-item v-show="nodeType=='node'" label="鏄惁鍙淮淇�" prop="isRepair" label-width="100px">
- <el-select style="width: 100%" v-model="globalGridAttr.isRepair" @change="onIsRepairChange">
- <el-option
- v-for="item in isRepair"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <div v-show="nodeType=='node' && showRepairInput">
- <el-form-item label="鍙淮淇�у垎甯冪被鍨�" prop="repairDistribType" label-width="140px">
- <zt-dict v-model="globalGridAttr.repairDistribType" dict="RepairDistribType" @input="onRepairDistribTypeChange" placeholder="缁翠慨鎬у垎甯冪被鍨�" clearable/>
+ <div v-show="globalGridAttr.productType!=='product_xdy'">
+ <el-form-item v-show="nodeType=='node'" label="鍙潬鎬у垎甯冪被鍨�" prop="reliabDistribType" label-width="125px">
+ <zt-dict style="width: 100%" v-model="globalGridAttr.reliabDistribType" @input="onReliabDistribType" dict="ReliabDistribType" placeholder="鍙潬鎬у垎甯冪被鍨�" clearable/>
</el-form-item>
- <el-form-item label="MTTCR" prop="repairMttcr" label-width="80px">
- <el-input v-model="globalGridAttr.repairMttcr" @change="onRepairMttcrChange"></el-input>
+ <el-form-item v-show="nodeType=='node'" label="MTBCF" prop="taskMtbcf" label-width="80px">
+ <el-input v-model="globalGridAttr.taskMtbcf" @change="onTaskMtbcfChange"></el-input>
</el-form-item>
- <el-form-item label="鍙傛暟2" prop="repairMttcrOther" label-width="80px">
- <el-input v-model="globalGridAttr.repairMttcrOther" @change="onRepairMttcrOtherChange"></el-input>
+ <el-form-item v-show="nodeType=='node'" label="鍙傛暟2" prop="taskMtbcfOther" label-width="80px">
+ <el-input v-model="globalGridAttr.taskMtbcfOther" @change="onTaskMtbcfOtherChange"></el-input>
</el-form-item>
+ <el-form-item v-show="nodeType=='node'" label="鏄惁鍙淮淇�" prop="isRepair" label-width="100px">
+ <el-select style="width: 100%" v-model="globalGridAttr.isRepair" @change="onIsRepairChange">
+ <el-option
+ v-for="item in isRepair"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <div v-show="nodeType=='node' && showRepairInput">
+ <el-form-item label="鍙淮淇�у垎甯冪被鍨�" prop="repairDistribType" label-width="140px">
+ <zt-dict v-model="globalGridAttr.repairDistribType" dict="RepairDistribType" @input="onRepairDistribTypeChange" placeholder="缁翠慨鎬у垎甯冪被鍨�" clearable/>
+ </el-form-item>
+ <el-form-item label="MTTCR" prop="repairMttcr" label-width="80px">
+ <el-input v-model="globalGridAttr.repairMttcr" @change="onRepairMttcrChange"></el-input>
+ </el-form-item>
+ <el-form-item label="鍙傛暟2" prop="repairMttcrOther" label-width="80px">
+ <el-input v-model="globalGridAttr.repairMttcrOther" @change="onRepairMttcrOtherChange"></el-input>
+ </el-form-item>
+ </div>
</div>
</el-form>
<!-- <el-row :gutter="5" v-show="shape!=='custom-circle1'" align="middle" style="margin-top:20px">-->
@@ -461,8 +463,9 @@
globalGridAttr.taskMtbcfOther = cell.getData().taskMtbcfOther
globalGridAttr.isRepair = cell.getData().isRepair
globalGridAttr.voteNum = cell.getData().voteNum
+ globalGridAttr.productType= cell.getData().productType
console.log(cell.getData().voteNum,'cell.getData().voteNum')
- if(cell.getData().voteNum!==undefined || this.globalGridAttr.nodeTypeExt === 'vote' || this.nodeType==='vote'){
+ if(cell.getData().voteNum!==undefined || cell.getData().voteNum!=='' || this.globalGridAttr.nodeTypeExt === 'vote' || this.nodeType==='vote'){
this.showNumberInput = true
}
console.log(this.showNumberInput,'this.showNumberInput')
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index 71b9059..3d2640f 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: '',
@@ -493,6 +494,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 +503,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 +545,7 @@
dataId: '',
nodeType: item.nodeType,
nodeTypeExt: '',
- voteNum:''
+ voteNum:null
},
attrs: {
text: {
@@ -572,6 +576,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 +592,7 @@
taskMtbcfOther: item.taskMtbcfOther,
imgHeight: item.imgHeight,
imgWidth: item.imgWidth,
- voteNum:'',
+ voteNum:null,
},
attrs: {
text: {
@@ -727,7 +732,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