From 769ba15e9071b01cb53a65e8fdf4c8f37ac005b9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 07 十一月 2024 17:15:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/OperatCondit.vue | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/web/src/views/modules/taskReliability/OperatCondit.vue b/web/src/views/modules/taskReliability/OperatCondit.vue
index f968740..e30ce91 100644
--- a/web/src/views/modules/taskReliability/OperatCondit.vue
+++ b/web/src/views/modules/taskReliability/OperatCondit.vue
@@ -1,7 +1,7 @@
<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 style="margin-top: 10px">
@@ -20,7 +20,7 @@
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
:row-class-name="tableRowClassName"
- v-adaptive="{bottomOffset:70}"
+ 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="宸ュ喌鍚嶇О"/>
@@ -35,22 +35,30 @@
</div>
</div>
</el-col>
- <el-col :span="10">
+ <el-col :span="8">
<div class="fa-card-a">
- <opera-condit-model ref="model"/>
+ <opera-condit-model ref="model" @collapseTransitionChange="collapseTransitionChange"/>
</div>
</el-col>
+ <el-col :span="16 - 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:16,
productList: [],
dataForm: {
productId: '',
@@ -64,7 +72,8 @@
},
components: {
OperaConditModel,
- AddOrUpdate
+ AddOrUpdate,
+ ModelView
},
methods: {
add() {
@@ -99,6 +108,17 @@
} 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()
}
}
}
--
Gitblit v1.9.1