From 438c05ef9f439f4d11f219fdfda17c66a32b7e6c Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期六, 03 十一月 2018 14:55:29 +0800
Subject: [PATCH] 拖动改变大小
---
gx_tieta/WebRoot/control.jsp | 2 +-
gx_tieta/WebRoot/pages/js/common.js | 7 +++++++
gx_tieta/WebRoot/batt-fault-manage.jsp | 6 +++---
gx_tieta/WebRoot/iframe/batt-fault-manage-details.html | 4 ----
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index aeae78b..e807bd8 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -189,10 +189,10 @@
layer.open({
type: 2,
title: '<span style="font-weight:bold">>>鏁呴殰璇︽儏</span>',
- area: ['700px', '660px'],
+ area: ['1200px', '660px'],
fixed: false, //涓嶅浐瀹�
- resize: false,
- maxmin: false,
+ resize: true,
+ maxmin: true,
content: 'iframe/batt-fault-manage-details.html'
});
}
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 24d373a..3e38315 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1053,7 +1053,7 @@
permits=<%=permits%>;
//console.info(json);
<% } %>
-
+ console.log(permits);
//鎷撴墤鍥剧姸鎬佸璞�
var mygraph = {
battstate:0,
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html
index 96a22f5..f7f04a8 100644
--- a/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html
@@ -10,10 +10,6 @@
<link rel="stylesheet" type="text/css" href="../src/css/layui.css">
<link rel="stylesheet" type="text/css" href="../pages/css/mylayui.css">
<style type="text/css">
- html, body {
- width: 700px;
- min-width: 700px;
- }
#imgCarousel .carousel-item div {
text-align: center;
}
diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index a690ea9..7e48252 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -521,4 +521,11 @@
}
//var str = page+'?province='+province+'&city='+city+'&county='+county+'&home='+home;
return str;
+}
+
+// 妫�娴嬬敤鎴锋槸鍚︽湁鏉冮檺
+function checkUserPermit(permits, name) {
+ // 閬嶅巻
+
+
}
\ No newline at end of file
--
Gitblit v1.9.1