From e051f5c497e691bcd97c81dffa97f7946fd197b1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 06 十一月 2018 16:32:24 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/batt-fault-manage.jsp |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index e807bd8..383010c 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -192,6 +192,7 @@
 					area: ['1200px', '660px'],
 					fixed: false, //涓嶅浐瀹�
 					resize: true,
+					maxHeight: 660,
 					maxmin: true,
 					content: 'iframe/batt-fault-manage-details.html'
 				});

--
Gitblit v1.9.1