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/vciWebReferTable.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Source/ProjectWeb/src/components/refer/vciWebReferTable.vue b/Source/ProjectWeb/src/components/refer/vciWebReferTable.vue
index d6b6eef..4771f2f 100644
--- a/Source/ProjectWeb/src/components/refer/vciWebReferTable.vue
+++ b/Source/ProjectWeb/src/components/refer/vciWebReferTable.vue
@@ -1,9 +1,10 @@
<template>
<div>
<el-dialog v-dialogDrag
- :height="height|| 'auto'" :title="title"
+ :title="title"
:visible.sync="visible"
:width="width"
+ :style="'height:'+height || 'auto'"
:append-to-body="true"
class="avue-dialog avue-dialog--top"
@close="dialogClose">
@@ -70,12 +71,14 @@
referType: {
type: String,
default:''
- }, width: {
+ },
+ width: {
type: String,
default:'70%'
- }, height: {
+ },
+ height: {
type: String,
- default:'60%'
+ default:'500px'
},
reloadFormKey: {
type: String,
@@ -110,6 +113,7 @@
option: {
addBtn: false,
columnBtn: false,
+ height:this.height,
calcHeight: 30,
tip: false,
menu: false,
--
Gitblit v1.9.3