From a86c2eb2db34d2d350e5c2eb72bf6416ec89c0d2 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 19 十一月 2024 11:43:03 +0800
Subject: [PATCH] 1）可靠性评定时新增模型检查处理； 2）获取任务二项分布参数时，去掉模型的匹配。
---
web/src/views/modules/taskReliability/OperatCondit.vue | 75 +++++++++++++++++++++++++++++--------
1 files changed, 58 insertions(+), 17 deletions(-)
diff --git a/web/src/views/modules/taskReliability/OperatCondit.vue b/web/src/views/modules/taskReliability/OperatCondit.vue
index e776ece..f5ed568 100644
--- a/web/src/views/modules/taskReliability/OperatCondit.vue
+++ b/web/src/views/modules/taskReliability/OperatCondit.vue
@@ -1,28 +1,31 @@
<template>
<div>
- <el-row :gutter="16">
- <el-col :span="14">
+ <el-row>
+ <el-col :span="collapseTransition">
<div class="mod-taskReliability-operatCondit}">
<div class="fa-card-a">
- <div>
- 浜у搧鑺傜偣锛�
- <zt-select v-model="dataForm.productId" :datas="productList" @change="onProductSelected"/>
+ <div style="margin-top: 10px">
+ <zt-select v-model="dataForm.productId" placeholder="璇烽�夋嫨浜у搧鑺傜偣" :datas="productList"
+ @change="onProductSelected"/>
</div>
- <zt-table-wraper ref="tableObj" query-url="/taskReliability/OperatCondit/page" defaultNotQuery="true" delete-url="/taskReliability/OperatCondit"
+ <zt-table-wraper ref="tableObj" query-url="/taskReliability/OperatCondit/page" defaultNotQuery="true"
+ delete-url="/taskReliability/OperatCondit/"
v-slot="{ table }" :paging='false'>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
- <zt-button type="query" @click="table.query()"/>
- <zt-button type="add" @click="add()"/>
- <zt-button type="delete" @click="table.deleteHandle()"/>
+ <!--<zt-button v-if="dataForm.productId" type="query" @click="table.query()"/>-->
+ <zt-button v-if="dataForm.productId" type="add" @click="add()"/>
+ <zt-button v-if="dataForm.productId" type="delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
- v-adaptive="{bottomOffset:70}"
+ :row-class-name="tableRowClassName"
+ v-adaptive="{bottomOffset:30}"
border @row-click="selectOperatCondit" @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="name" label="宸ュ喌鍚嶇О"/>
- <el-table-column prop="remark" label="澶囨敞"/>
+ <el-table-column prop="remark" label="澶囨敞"
+ />
<zt-table-column-handle :table="table"
delete-perm="taskReliability::delete"/>
</el-table>
@@ -34,24 +37,34 @@
</el-col>
<el-col :span="10">
<div class="fa-card-a">
- <opera-condit-model ref="model"/>
+ <opera-condit-model ref="model" @collapseTransitionChange="collapseTransitionChange"/>
</div>
</el-col>
+ <el-col :span="14 - collapseTransition">
+ <div class="fa-card-a">
+ <model-view ref="modelView" @closeWindow="closeWindow"></model-view>
+ </div>
+ </el-col>
+
</el-row>
</div>
</template>
<script>
import AddOrUpdate from './OperatCondit-AddOrUpdate'
+ import ModelView from "./ModelView";
import OperaConditModel from "./OperatConditModel";
export default {
data() {
return {
+ collapseTransition:14,
productList: [],
dataForm: {
productId: '',
- }
+ },
+ isSelect: false,
+ currentId: ''
}
},
mounted() {
@@ -59,15 +72,14 @@
},
components: {
OperaConditModel,
- AddOrUpdate
+ AddOrUpdate,
+ ModelView
},
-
methods: {
add() {
- this.$refs.AddOrUpdate.$refs.dialog.init(null,{productId: this.dataForm.productId})
+ this.$refs.AddOrUpdate.$refs.dialog.init(null, {productId: this.dataForm.productId})
},
onProductSelected(data) {
- console.log(data, ' onProductSelected(data)')
this.dataForm.productId = data.id
this.$refs.tableObj.query()
},
@@ -75,8 +87,14 @@
let res = await this.$http.get('/basicInfo/XhProductModel/getTaskProductList')
this.productList = res.data
console.log(this.productList, ' async getTaskProductList()')
+ this.onProductSelected(this.productList[0])
},
selectOperatCondit(row) {
+ if (this.$refs.model.isChange) {
+ this.$alert("鏈夋湭淇濆瓨鐨勫伐鍐垫ā鍨�")
+ return;
+ }
+ this.currentId = row.id
this.$emit('selectOperatCondit', row)
let param = {
row: row,
@@ -84,6 +102,29 @@
}
this.$refs.model.init(param)
},
+ tableRowClassName({row, rowIndex}) {
+ if (row.id === this.currentId) {
+ return 'select-row';
+ } else {
+ return 'not-select-row';
+ }
+ },
+ collapseTransitionChange(param){
+ console.log(param,'collapseTransition')
+ this.collapseTransition = param.collapseTransition
+ this.$nextTick(() => {
+ this.$refs.modelView.init(param)
+ })
+ },
+ closeWindow(collapseTransition){
+ this.collapseTransition = collapseTransition
+ this.$refs.tableObj.query()
+ }
}
}
</script>
+<style>
+ .el-table .select-row {
+ background: rgba(23, 179, 163, 0.2) !important;
+ }
+</style>
--
Gitblit v1.9.1