From cffbff8eb7af88fb4d8f9d3f6ce77f46e97ddf39 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 28 六月 2024 15:39:37 +0800
Subject: [PATCH] 修改
---
/dev/null | 514 ---------------------------------------------------------
web/src/views/modules/taskReliability/RBD-edit-img.vue | 2
web/src/views/modules/taskReliability/ModelRbd.vue | 2
web/src/views/modules/taskReliability/TaskBinoParam.vue | 11
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskBinoParamService.java | 4
5 files changed, 11 insertions(+), 522 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskBinoParamService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskBinoParamService.java
index 7beb8dc..51464d0 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskBinoParamService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskBinoParamService.java
@@ -25,7 +25,8 @@
* @return
*/
public List<TaskBinoParam> page(QueryFilter queryFilter) {
- return baseDao.getList(queryFilter.getQueryParams());
+ List<TaskBinoParam> page = baseDao.getList(queryFilter.getQueryParams());
+ return queryFilter.getPageList(page);
}
/**
@@ -37,4 +38,5 @@
super.deleteLogic(ids);
}
+
}
diff --git a/web/src/views/modules/taskReliability/ConfigNode/index.vue b/web/src/views/modules/taskReliability/ConfigNode/index.vue
deleted file mode 100644
index af74726..0000000
--- a/web/src/views/modules/taskReliability/ConfigNode/index.vue
+++ /dev/null
@@ -1,514 +0,0 @@
-<template>
- <div style="position: absolute;top:0;right:0;background:#cccccc;width: 400px;" :style="'height:'+ left_p + 'px'">
- <el-card style="height: 100%">
- <el-tabs v-model="activeName" id="tabPane">
- <el-tab-pane label="灞炴��" name="first">
- <el-form :model="globalGridAttr">
- <el-form-item v-show="shape!=='custom-circle1'" label="鑺傜偣鍚嶇О" prop="nodeText" label-width="80px">
- <el-input v-model="globalGridAttr.nodeText" style="width:100%" @change="onTextChange"></el-input>
- </el-form-item>
- <el-form-item v-show="nodeType=='node'" label="杩炴帴鍏崇郴" prop="nodeTypeExt" label-width="80px">
- <el-select style="width: 100%" v-model="globalGridAttr.nodeTypeExt" @change="onNodeTypeExtChange">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <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>
- <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 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/>
- </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">-->
-<!-- <el-col :span=8 style="font-size: 16px;line-height: 32px">鑺傜偣鍚嶇О</el-col>-->
-<!-- <el-col :span=16 >-->
-<!-- <el-input v-model="globalGridAttr.nodeText" style="width:100%" @change="onTextChange"></el-input>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- <el-row :gutter="5" v-show="nodeType=='node'" align="middle" style="margin-top:20px;">-->
-<!-- <el-col :span=8 style="font-size: 16px;line-height: 32px">杩炴帴鍏崇郴</el-col>-->
-<!-- <el-col :span=16>-->
-<!-- <el-select style="width: 100%" v-model="globalGridAttr.nodeTypeExt" @change="onNodeTypeExtChange">-->
-<!-- <el-option-->
-<!-- v-for="item in options"-->
-<!-- :key="item.value"-->
-<!-- :label="item.label"-->
-<!-- :value="item.value">-->
-<!-- </el-option>-->
-<!-- </el-select>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- <el-row :gutter="5" v-show="nodeType=='node' && showNumberInput" align="middle" style="margin-top:20px;">-->
-<!-- <el-col :span=8 style="font-size: 16px;line-height: 32px">琛ㄥ喅鏁伴噺</el-col>-->
-<!-- <el-col :span=16>-->
-<!-- <el-input type="number" v-model="globalGridAttr.voteNum" @change="onNumberInputValue" placeholder="璇疯緭鍏ユ暟瀛�"></el-input>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- <el-row :gutter="5" v-show="nodeType=='node'" align="middle" style="margin-top:20px;">-->
-<!-- <el-col :span=8 style="font-size: 16px;line-height: 32px">鐘舵��</el-col>-->
-<!-- <el-col :span=16>-->
-<!-- <el-select style="width: 100%" v-model="globalGridAttr.statusImg" @change="onStatusImgChange">-->
-<!-- <el-option-->
-<!-- v-for="item in options1"-->
-<!-- :key="item.value"-->
-<!-- :label="item.label"-->
-<!-- :value="item.value">-->
-<!-- </el-option>-->
-<!-- </el-select>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- <el-row :gutter="5" v-show="nodeType=='node'" align="middle" style="margin-top:20px;">-->
-<!-- <el-col :span=8 style="font-size: 16px;line-height: 32px">鍙潬鎬у垎甯冪被鍨�</el-col>-->
-<!-- <el-col :span=16>-->
-<!-- <zt-dict v-model="globalGridAttr.reliabDistribType" @input="onReliabDistribType" dict="ReliabDistribType" placeholder="鍙潬鎬у垎甯冪被鍨�" clearable/>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- <el-row :gutter="5" v-show="nodeType=='node'" align="middle" style="margin-top:20px;">-->
-<!-- <el-col :span=8 style="font-size: 16px;line-height: 32px">MTBCF</el-col>-->
-<!-- <el-col :span=16>-->
-<!-- <el-input v-model="globalGridAttr.taskMtbcf" @change="onTaskMtbcfChange"></el-input>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- <el-row :gutter="5" v-show="nodeType=='node'" align="middle" style="margin-top:20px;">-->
-<!-- <el-col :span=8 style="font-size: 16px;line-height: 32px">鍙傛暟2</el-col>-->
-<!-- <el-col :span=16>-->
-<!-- <el-input v-model="globalGridAttr.taskMtbcfOther" @change="onTaskMtbcfOtherChange"></el-input>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- <el-row :gutter="5" v-show="nodeType=='node'" align="middle" style="margin-top:20px;">-->
-<!-- <el-col :span=8 style="font-size: 16px;line-height: 32px">鏄惁鍙淮淇�</el-col>-->
-<!-- <el-col :span=16>-->
-<!-- <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-col>-->
-<!-- </el-row>-->
-<!-- <div v-show="nodeType=='node' && showRepairInput">-->
-<!-- <el-row :gutter="5" align="middle" style="margin-top:20px;">-->
-<!-- <el-col :span=8 style="font-size: 16px;line-height: 32px">鍙淮淇�у垎甯冪被鍨�</el-col>-->
-<!-- <el-col :span=16>-->
-<!-- <zt-dict v-model="globalGridAttr.repairDistribType" dict="RepairDistribType" @input="onRepairDistribTypeChange" placeholder="缁翠慨鎬у垎甯冪被鍨�" clearable/>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- <el-row :gutter="5" align="middle" style="margin-top:20px;">-->
-<!-- <el-col :span=8 style="font-size: 16px;line-height: 32px">MTTCR</el-col>-->
-<!-- <el-col :span=16>-->
-<!-- <el-input v-model="globalGridAttr.repairMttcr" @change="onRepairMttcrChange"></el-input>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- <el-row :gutter="5" align="middle" style="margin-top:20px;">-->
-<!-- <el-col :span=8 style="font-size: 16px;line-height: 32px">鍙傛暟2</el-col>-->
-<!-- <el-col :span=16>-->
-<!-- <el-input v-model="globalGridAttr.repairMttcrOther" @change="onRepairMttcrOtherChange"></el-input>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- </div>-->
- </el-tab-pane>
- <el-tab-pane label="鏍峰紡" name="second">
- <el-row :gutter="5" align="middle" style="margin-top:20px">
- <el-col :span=8 style="font-size: 16px;line-height: 38px">鏂囨湰澶у皬</el-col>
- <el-col :span=16>
- <el-slider :min=8 :max=20 :step=1 v-model="globalGridAttr.nodeFontSize" @change="onFontSizeChange"></el-slider>
- </el-col>
- </el-row>
- <el-row :gutter="5" align="middle" style="margin-top:20px">
- <el-col :span=8 style="font-size: 16px;line-height: 40px">瀛椾綋棰滆壊</el-col>
- <el-col :span=16>
- <el-color-picker v-model="globalGridAttr.nodeColor" style="width: 100%" @change="onColorChange"></el-color-picker>
- </el-col>
- </el-row>
- </el-tab-pane>
- </el-tabs>
- </el-card>
- </div>
-</template>
-
-<script>
-import { Graph, Shape, Node, Addon, Cell,FunctionExt} from '@antv/x6';
-// const {inject} = require("vue");
-export default {
- name: "index",
- data(){
- return{
- data:{
- dataId:'',
- finishDate: '',
- inspectName:''
- },
- showNumberInput:false,
- showRepairInput:false,
- options: [{
- value: '',
- label: '鏃�'
- },{
- value: 'switch',
- label: '鏃佽繛'
- }, {
- value: 'vote',
- label: '琛ㄥ喅'
- }],
- isRepair:[
- {
- value: 0,
- label: '鍚�'
- }, {
- value: 1,
- label: '鏄�'
- }
- ],
- options1: [{
- value: '',
- label: '鏃�'
- }, {
- value: 'https://gw.alipayobjects.com/mdn/rms_43231b/afts/img/A*evDjT5vjkX0AAAAAAAAAAAAAARQnAQ',
- label: '璁剧疆'
- },{
- value:'https://gw.alipayobjects.com/zos/antfincdn/FLrTNDvlna/antv.png',
- label: 'antv'
- }],
- text:'',
- dialogVisible:false,
- activeName: 'first',
- // globalGridAttr:{},
- curCel:Cell,
- left_p:document.documentElement.clientHeight* 0.75,
- }
- },
- components:{
- },
- props:{
- id: {
- type: String,
- },
- shape:{
- type: String
- },
- refY2:{
- type: Number
- },
- globalGridAttr:{
- type: Object,
- },
- graph:{
- type: String,
- },
- projectId:{
- type: String,
- },
- diagramId:{
- type: String,
- },
- nodeType:{
- type: String,
- }
- },
- watch:{
- 'id'(val,oldVal){
- this.curCel = this.nodeOpt(this.id,this.globalGridAttr)
- }
- },
- mounted() {
- // this.curCel = this.nodeOpt(this.id,this.globalGridAttr)
- },
- methods:{
- showDialog() {
- let param = {projectId:this.projectId,diagramId:this.diagramId}
- console.log(param, 'dialog init param')
- this.dialogVisible = true;
- this.$nextTick(()=>{
- this.$refs.inspectionNode.init(param)
- })
- },
- // 鏀瑰彉瀛椾綋澶у皬
- onFontSizeChange(e){
- let val =e
- this.globalGridAttr.nodeFontSize = val
- this.curCel.attr('text/fontSize', val)
- this.curCel.attr('title/fontSize', val)
- },
- // 鏀瑰彉瀛椾綋棰滆壊
- onColorChange(e){
- let val =e
- this.globalGridAttr.nodeColor = val
- this.curCel.attr('text/fill', val)
- this.curCel.attr('title/fill', val)
- this.curCel.attr('text/style/color', val)
- this.curCel.attr('title/style/color', val)
- this.curCel = this.nodeOpt(this.id,this.globalGridAttr)
- },
- // 鏀瑰彉鏂囨湰
- onTextChange(e){
- this.text =e
- this.globalGridAttr.nodeText = this.text
- this.curCel.attr('text/text', this.text)
- this.curCel = this.nodeOpt(this.id,this.globalGridAttr)
-
- },
- onNodeTypeExtChange(e){
- if (this.globalGridAttr.nodeTypeExt === 'vote') {
- this.showNumberInput = true;
- } else {
- this.showNumberInput = false;
- this.globalGridAttr.numberInputValue = '';
- }
- this.globalGridAttr.nodeTypeExt = e
- let nodeTypeExt={
- nodeTypeExt:this.globalGridAttr.nodeTypeExt
- }
- this.curCel.setData(nodeTypeExt)
- this.curCel = this.nodeOpt(this.id,this.globalGridAttr)
- },
- // 琛ㄥ喅鏁伴噺
- onNumberInputValue(e){
- this.globalGridAttr.voteNum = e
- let voteNum={
- voteNum:this.globalGridAttr.voteNum
- }
- this.curCel.setData(voteNum)
- this.curCel = this.nodeOpt(this.id,this.globalGridAttr)
- },
- // 鍙潬鎬у垎甯冪被鍨�
- onReliabDistribType(e){
- this.globalGridAttr.reliabDistribType = e
- let reliabDistribType={
- reliabDistribType:this.globalGridAttr.reliabDistribType
- }
- this.curCel.setData(reliabDistribType)
- this.curCel = this.nodeOpt(this.id,this.globalGridAttr)
- },
- // mtbf
- onTaskMtbcfChange(e){
- const numberRegex = /^-?\d+(\.\d+)?$/
- if(numberRegex.test(e)){
- this.globalGridAttr.taskMtbcf =e
- let taskMtbcf={
- taskMtbcf:this.globalGridAttr.taskMtbcf
- }
- this.curCel.setData(taskMtbcf)
- this.curCel = this.nodeOpt(this.id,this.globalGridAttr)
- }else {
- this.$message.error('杈撳叆鏍煎紡鏈夎锛岃杈撳叆瀹炴暟')
- }
-
- },
- // 鍙傛暟2
- onTaskMtbcfOtherChange(e){
- const numberRegex = /^-?\d+(\.\d+)?$/
- console.log(e,'eeeee')
- if(numberRegex.test(e)){
- this.globalGridAttr.taskMtbcfOther = e
- let taskMtbcfOther={
- taskMtbcfOther:this.globalGridAttr.taskMtbcfOther
- }
- this.curCel.setData(taskMtbcfOther)
- this.curCel = this.nodeOpt(this.id,this.globalGridAttr)
- }else {
- this.$message.error('杈撳叆鏍煎紡鏈夎锛岃杈撳叆瀹炴暟')
- }
-
- },
- // 鏄惁鍙淮淇�
- onIsRepairChange(e){
- this.showRepairInput = this.globalGridAttr.isRepair === 1;
- this.globalGridAttr.isRepair = e
- let isRepair={
- isRepair:this.globalGridAttr.isRepair
- }
- this.curCel.setData(isRepair)
- this.curCel = this.nodeOpt(this.id,this.globalGridAttr)
- },
- // 鍙淮淇�у垎甯冪被鍨�
- onRepairDistribTypeChange(e){
- this.globalGridAttr.repairDistribType = e
- let repairDistribType={
- repairDistribType:this.globalGridAttr.repairDistribType
- }
- this.curCel.setData(repairDistribType)
- this.curCel = this.nodeOpt(this.id,this.globalGridAttr)
- },
- // Mttcr
- onRepairMttcrChange(e){
- const numberRegex = /^-?\d+(\.\d+)?$/
- if(numberRegex.test(e)){
- this.globalGridAttr.repairMttcr = e
- let repairMttcr={
- repairMttcr:this.globalGridAttr.repairMttcr
- }
- this.curCel.setData(repairMttcr)
- this.curCel = this.nodeOpt(this.id,this.globalGridAttr)
- }else {
- this.$message.error('杈撳叆鏍煎紡鏈夎锛岃杈撳叆瀹炴暟')
- }
-
- },
- // 鍙淮淇�у垎甯冪被鍨� 鍙傛暟2
- onRepairMttcrOtherChange(e){
- const numberRegex = /^-?\d+(\.\d+)?$/
- if(numberRegex.test(e)) {
- this.globalGridAttr.repairMttcrOther = e
- let repairMttcrOther = {
- repairMttcrOther: this.globalGridAttr.repairMttcrOther
- }
- this.curCel.setData(repairMttcrOther)
- this.curCel = this.nodeOpt(this.id, this.globalGridAttr)
- }else {
- this.$message.error('杈撳叆鏍煎紡鏈夎锛岃杈撳叆瀹炴暟')
- }
- },
- onStatusImgChange(e){
- this.globalGridAttr.statusImg = e
- let statusImg={
- statusImg:this.globalGridAttr.statusImg
- }
- this.curCel.setData(statusImg)
- console.log(this.globalGridAttr.statusImg,'this.globalGridAttr.statusImg')
- console.log(this.curCel,'this.curCel')
- console.log(this.curCel.attr,'this.curCel.attr')
- this.curCel.removeTools()
- this.curCel.addTools([
- {
- name: 'button',
- args: {
- markup: [
- {
- tagName: 'image',
- selector: 'icon',
- attrs: {
- // 'xlink:href': 'https://gw.alipayobjects.com/mdn/rms_43231b/afts/img/A*evDjT5vjkX0AAAAAAAAAAAAAARQnAQ',
- 'xlink:href':statusImg.statusImg,
- width: 30,
- height: 30,
- x: 0,
- y: 0
- }
- }
- ]
- }
- }
- ])
- this.curCel = this.nodeOpt(this.id,this.globalGridAttr)
- },
- nodeOpt(id, globalGridAttr){
- this.curCel=null
- if(id){
- let cell = this.graph.getCellById(id)
- // console.log(cell,'let cell 123456')
- if (!cell || !cell.isNode()) {
- return
- }
- this.showNumberInput = false
- this.curCel = cell
- globalGridAttr.nodeStroke = cell.attr('body/stroke')
- globalGridAttr.nodeStrokeWidth = cell.attr('body/strokeWidth')
- globalGridAttr.nodeFill = cell.attr('body/fill')
- // globalGridAttr.nodeFontSize = cell.attr('text/fontSize')
- // globalGridAttr.nodeFontSize = cell.attr('title/fontSize')
- globalGridAttr.nodeFontSize = cell.attr('text/fontSize')?cell.attr('text/fontSize'):cell.attr('title/fontSize')
- globalGridAttr.nodeColor = cell.attr('text/fill') ? cell.attr('text/fill'):cell.attr('title/fill')?cell.attr('title/fill'):cell.attr('label/text/fill')
- // globalGridAttr.nodeColor = cell.attr('text/fill')
- // globalGridAttr.nodeColor = cell.attr('title/fill')
- // globalGridAttr.nodeColor = cell.attr('text/style/color')
- // globalGridAttr.nodeColor = cell.attr('title/style/color')
- globalGridAttr.nodeUsers = cell.attr('approve/users')
- globalGridAttr.nodeText =cell.attr('text/text')
- globalGridAttr.nodeDate = cell.attr('title/text')
- globalGridAttr.dataId = cell.getData().dataId
- globalGridAttr.inspectName =cell.getData().inspectName
- globalGridAttr.nodeTypeExt=cell.getData().nodeTypeExt
- globalGridAttr.statusImg = cell.getData().statusImg
- globalGridAttr.reliabDistribType = cell.getData().reliabDistribType
- globalGridAttr.repairDistribType = cell.getData().repairDistribType
- globalGridAttr.repairMttcr = cell.getData().repairMttcr
- globalGridAttr.repairMttcrOther = cell.getData().repairMttcrOther
- globalGridAttr.taskMtbcf = cell.getData().taskMtbcf
- 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(this.nodeType==='vote' || this.globalGridAttr.nodeTypeExt === 'vote' || (cell.getData().voteNum!==undefined && cell.getData().voteNum!=='')){
- console.log(cell.getData().voteNum,'cell.getData().voteNum')
- this.showNumberInput = true
- }
- // console.log(this.showNumberInput,'this.showNumberInput')
- this.showRepairInput = cell.getData().isRepair
- cell.removeTools()
- cell.addTools([
- {
- name: 'button',
- args: {
- markup: [
- {
- tagName: 'image',
- selector: 'icon',
- attrs: {
- // 'xlink:href': 'https://gw.alipayobjects.com/mdn/rms_43231b/afts/img/A*evDjT5vjkX0AAAAAAAAAAAAAARQnAQ',
- 'xlink:href':globalGridAttr.statusImg,
- width: 30,
- height: 30,
- x: 0,
- y: 0
- }
- }
- ]
- }
- }
- ])
- // console.log(globalGridAttr.inspectName,globalGridAttr.dataId,globalGridAttr.nodeDate,'globalGridAttr.inspectName,globalGridAttr.dataId,globalGridAttr.nodeDate 789')
- cell.getData()
- // console.log( cell.getData(),' cell.getData() 909')
- }
- return this.curCel;
- }
- }
-}
-</script>
-
-<style >
-#tabPane .el-tabs__header.is-top .el-tabs__nav-scroll{
-width: 100% !important;
-}
-
-#tabPane .el-color-picker__trigger{
- width: 100%;
-}
-</style>
diff --git a/web/src/views/modules/taskReliability/ModelRbd.vue b/web/src/views/modules/taskReliability/ModelRbd.vue
index c085529..3b7d39b 100644
--- a/web/src/views/modules/taskReliability/ModelRbd.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd.vue
@@ -44,7 +44,7 @@
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update @refreshDataList="table.query" ref="AddOrUpdate"/>
<el-dialog v-dialogDrag title="妯″瀷璁捐" top="1vh" width='95%' :visible.sync="dialogVisible2" v-if="dialogVisible2">
- <RBDEditImg ref="rbdEditImg"></RBDEditImg>
+ <RBDEditImg ref="rbdEditImg" @refreshDataList="table.query"></RBDEditImg>
</el-dialog>
</zt-table-wraper>
</div>
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index db3555c..d5b1d01 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -1422,6 +1422,7 @@
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: '纭畾'
})
@@ -1443,6 +1444,7 @@
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: '纭畾'
})
diff --git a/web/src/views/modules/taskReliability/TaskBinoParam.vue b/web/src/views/modules/taskReliability/TaskBinoParam.vue
index 95b49a5..8501078 100644
--- a/web/src/views/modules/taskReliability/TaskBinoParam.vue
+++ b/web/src/views/modules/taskReliability/TaskBinoParam.vue
@@ -1,7 +1,7 @@
<template>
- <zt-dialog ref="dialog" column="1" title="浜岄」鍙傛暟" append-to-body :editAble="false" :hasConfirm="false">
+ <zt-dialog ref="dialog" column="3" title="浜岄」鍙傛暟" append-to-body :editAble="false" :hasConfirm="false">
<zt-table-wraper ref="tableObj" query-url="/taskReliability/TaskBinoParam/page" delete-url="/taskReliability/TaskBinoParam"
- v-slot="{ table }">
+ v-slot="{ table }" >
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<!-- <zt-button type="query" @click="table.query()"/>
@@ -10,10 +10,11 @@
<zt-button type="primary" @click="handleSaveRows">淇濆瓨</zt-button>
</el-form-item>
</el-form>
- <el-table v-loading="table.dataLoading" :data="table.dataList" height="300"
+ <el-table v-loading="table.dataLoading" :data="table.dataList"
+ height="600px"
border @selection-change="table.selectionChangeHandle" @cell-click="handleCellClick">
<!-- <el-table-column type="selection" width="40"/>-->
- <el-table-column prop="phaseName" label="闃舵" align="center"/>
+ <el-table-column prop="phaseName" label="闃舵" align="center" width="100"/>
<el-table-column prop="operatConditName" label="宸ュ喌" align="center"/>
<el-table-column prop="productName" label="浜岄」鍒嗗竷璁惧" align="center"/>
<el-table-column prop="successRate" label="鎴愬姛鐜�" align="right">
@@ -55,8 +56,6 @@
</template>
<script>
- import cloneDeep from "lodash/cloneDeep";
-
export default {
name: 'taskBinoParam',
data() {
--
Gitblit v1.9.1