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/OperatConditModel.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/web/src/views/modules/taskReliability/OperatConditModel.vue b/web/src/views/modules/taskReliability/OperatConditModel.vue
index 78e4fd2..1a763c3 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">
@@ -33,9 +33,9 @@
</template>
</el-table-column>
</el-table>
- <el-dialog v-dialogDrag :title="title" top="1vh" width='95%' :visible.sync="dialogVisible2" v-if="dialogVisible2">
- <model-view ref="modelView"></model-view>
- </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>
@@ -144,15 +144,15 @@
}
},
drawRBD(row) {
- this.dialogVisible2 = true
- this.title=row.modelName + '妯″瀷璁捐'
let param = {
id: row.modelId,
modelName: row.modelName,
+ collapseTransition:0,
+ title:row.modelName + '妯″瀷璁捐'
}
- this.$nextTick(() => {
- this.$refs.modelView.init(param)
- })
+ this.$emit('collapseTransitionChange', param)
+
+
}
}
}
--
Gitblit v1.9.1