From 195bb5267a6ece13363303e177fee7d1fa3941aa Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 19 十一月 2024 15:25:25 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/taskReliability/OperatConditModel.vue | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/web/src/views/modules/taskReliability/OperatConditModel.vue b/web/src/views/modules/taskReliability/OperatConditModel.vue
index 5d30233..81f7506 100644
--- a/web/src/views/modules/taskReliability/OperatConditModel.vue
+++ b/web/src/views/modules/taskReliability/OperatConditModel.vue
@@ -9,7 +9,7 @@
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px"
- v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle"
+ v-adaptive="{bottomOffset:30}" border @selection-change="table.selectionChangeHandle"
row-key="iid"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:default-expand-all="true">
@@ -18,7 +18,7 @@
<template slot-scope="scope">
<el-select v-model="scope.row.modelId" :disabled="scope.row.isDisabled == 1" placeholder="璇烽�夋嫨"
style="width:100%" @change="modelChanged(scope.row)">
- <el-option on
+ <el-option
v-for="item in scope.row.modelList"
:key="item.id"
:label="item.modelName"
@@ -27,21 +27,21 @@
</el-select>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="100px">
+ <el-table-column label="鎿嶄綔" width="105px">
<template v-slot="{ row }">
<el-button v-if="row.modelId" type="primary" size="small" @click="drawRBD(row)">鏌ョ湅妯″瀷</el-button>
</template>
</el-table-column>
</el-table>
- <el-dialog v-dialogDrag title="妯″瀷璁捐" top="1vh" width='95%' :visible.sync="dialogVisible2" v-if="dialogVisible2">
- <RBDEditImg ref="rbdEditImg"></RBDEditImg>
- </el-dialog>
+<!-- <el-dialog v-dialogDrag :title="title" top="1vh" width='95%' :visible.sync="dialogVisible2" v-if="dialogVisible2">-->
+<!-- <model-view ref="modelView"></model-view>-->
+<!-- </el-dialog>-->
</zt-table-wraper>
</div>
</template>
<script>
- import RBDEditImg from './RBD-edit-img'
+ import ModelView from "./ModelView";
import cloneDeep from 'lodash/cloneDeep'
export default {
@@ -57,10 +57,11 @@
modelList: [],
dialogVisible2: false,
isChange: false,
+ title: ''
}
},
components: {
- RBDEditImg
+ ModelView
},
mounted() {
this.getModelNodes()
@@ -110,8 +111,8 @@
console.log(row.children, 'row.children')
for (let subRow of row.children) {
- console.log(subRow,'subRow')
- console.log(subRow.productId,'subRow.productId')
+ console.log(subRow, 'subRow')
+ console.log(subRow.productId, 'subRow.productId')
if (modelNodes.indexOf(subRow.productId) != -1) {
subRow.isDisabled = 0
if (subRow.modelList.length == 1) {
@@ -143,15 +144,13 @@
}
},
drawRBD(row) {
- this.dialogVisible2 = true
let param = {
id: row.modelId,
modelName: row.modelName,
- productId: row.productId
+ collapseTransition:0,
+ title:row.modelName + '妯″瀷璁捐'
}
- this.$nextTick(() => {
- this.$refs.rbdEditImg.init(param)
- })
+ this.$emit('collapseTransitionChange', param)
}
}
}
--
Gitblit v1.9.1