From 485125c2b5b8862a5295216b24cf28121d8ca169 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 08 四月 2024 11:32:07 +0800
Subject: [PATCH] 解决冲突
---
Source/ProjectWeb/src/components/refer/vciWebReferClassify.vue | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/Source/ProjectWeb/src/components/refer/vciWebReferClassify.vue b/Source/ProjectWeb/src/components/refer/vciWebReferClassify.vue
index 6cc1956..61847dd 100644
--- a/Source/ProjectWeb/src/components/refer/vciWebReferClassify.vue
+++ b/Source/ProjectWeb/src/components/refer/vciWebReferClassify.vue
@@ -3,7 +3,6 @@
<div>
<el-dialog
v-dialogDrag
- :height="options.height || '70vh'"
:title="title"
:visible.sync="visible"
:width="onlyTable?'60%': '80%'"
@@ -11,7 +10,7 @@
class="avue-dialog avue-dialog--top"
@close="dialogClose"
>
- <el-container>
+ <el-container :style="{ 'height': height || '60vh' }">
<el-aside width="300px" v-if="!onlyTable && classifys.length>0">
<el-tabs type="border-card" style="height: 100%" @tab-click="tabClick"
v-model="tabName">
@@ -107,12 +106,14 @@
referType: {
type: String,
default: "",
- }, width: {
+ },
+ width: {
type: String,
- default:'70%'
- }, height: {
+ default:'80%'
+ },
+ height: {
type: String,
- default:'60%'
+ default:'500px'
},
reloadFormKey: {
type: String,
@@ -532,21 +533,19 @@
},
initTreeData: function (nodes) {
let treeData = [];
- if(nodes && Array.isArray(nodes)){
- nodes.forEach((item) => {
- let children = item.children;
- if (children) {
- children = this.initTreeData(children);
- }
- treeData.push({
- label: item[this.props.label],
- value: item[this.props.value],
- leaf: !item.children,
- children: children,
- attributes: item,
- });
+ nodes.forEach((item) => {
+ let children = item.children;
+ if (children) {
+ children = this.initTreeData(children);
+ }
+ treeData.push({
+ label: item[this.props.label],
+ value: item[this.props.value],
+ leaf: !item.children,
+ children: children,
+ attributes: item,
});
- }
+ });
return treeData;
},
filterNode(value, data) {
--
Gitblit v1.9.3