From d07437008c669fd760bb9e058d6cfa4564064c78 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 07 十一月 2018 09:56:36 +0800
Subject: [PATCH] 修复页面内容
---
gx_tieta/WebRoot/iframe/set-match-group.html | 2 -
gx_tieta/WebRoot/iframe/batt-state-statistical-details.html | 4 --
gx_tieta/WebRoot/iframe/batt-fault-manage-del.html | 3 -
gx_tieta/WebRoot/pages/css/mylayui.css | 4 ++
gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html | 1
gx_tieta/WebRoot/ele-match-group.jsp | 6 +-
gx_tieta/WebRoot/batt-fault-manage.jsp | 9 ++++
gx_tieta/WebRoot/iframe/batt-fault-manage-details.html | 11 +----
gx_tieta/WebRoot/pages/js/mylayui.js | 23 +++++++++++
9 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index 8455d36..6637e02 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -205,6 +205,14 @@
// 鏌ョ湅澶勭悊鏂规鎻忚堪
function viewSolveDetails(data) {
+ console.log(data.error_en_num);
+ // 鍒ゆ柇鏄惁宸插瓨鍦ㄨВ鍐虫柟妗�
+ if(!data.error_en_num) {
+ layer.msg('鏆傛棤瑙ｅ喅鏂规');
+ return;
+ }
+
+
var imgOpts = setDelDetailsOpts(data);
$('#detailImgs').data('data', imgOpts);
layer.open({
@@ -533,6 +541,7 @@
tmp.stationName3 = _data.stationName;
tmp.note = _data.record_time;
tmp.question = _data.error_descript;
+ tmp.error_en_num = _data.error_en;
tmp.error_en = error_en;
tmp.error_dispose = _data.error_dispose;
tmp.num = _data.num;
diff --git a/gx_tieta/WebRoot/ele-match-group.jsp b/gx_tieta/WebRoot/ele-match-group.jsp
index c7cf372..4c6d8d9 100644
--- a/gx_tieta/WebRoot/ele-match-group.jsp
+++ b/gx_tieta/WebRoot/ele-match-group.jsp
@@ -56,7 +56,7 @@
<div class="side-bar" id="sideBar"></div>
</div>
</div>
- <div class="abs abs-right left360" id="inforCont">
+ <div class="abs abs-left360" id="inforCont">
<div class="tbl-container">
<table class="" id="groupTbl" lay-filter="groupTbl"></table>
</div>
@@ -91,7 +91,7 @@
var treeView = new TreeView($('#sideBar'));
// 璁剧疆宸﹀彸缂╂斁
- $('#resizeCont .side-bar-container').resizable({
+ /* $('#resizeCont .side-bar-container').resizable({
handles: 'e',
maxWidth: 520,
minWidth: 240,
@@ -100,7 +100,7 @@
treeView.setContainer();
$('#inforCont').css('left', ui.size.width+'px');
}
- });
+ }); */
// 鐢熸垚涓�绾у鑸�-鐪�
first(treeView, treeView.container);
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
index a1ace7f..153ec70 100644
--- a/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
@@ -118,7 +118,6 @@
</form>
</div>
<script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
- <script type="text/javascript" src="../js/base.js"></script>
<script type="text/javascript" src="../jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript" src="../pages/js/mylayui.js"></script>
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-del.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-del.html
index 879dbc2..8b64122 100644
--- a/gx_tieta/WebRoot/iframe/batt-fault-manage-del.html
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-del.html
@@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>娣诲姞鎺掗櫎鏁呴殰鏂规</title>
<link rel="stylesheet" type="text/css" href="../pages/css/base.css">
- <link rel="stylesheet" type="text/css" href="../jqueryui/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="../src/css/layui.css">
<link rel="stylesheet" type="text/css" href="../pages/css/mylayui.css">
<style>
@@ -53,8 +52,6 @@
</div>
</div>
<script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
- <script type="text/javascript" src="../js/base.js"></script>
- <script type="text/javascript" src="../jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript" src="../pages/js/mylayui.js"></script>
<script type="text/javascript">
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html
index ac4f523..d864373 100644
--- a/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html
@@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>鏁呴殰璇︽儏</title>
<link rel="stylesheet" type="text/css" href="../pages/css/base.css">
- <link rel="stylesheet" type="text/css" href="../jqueryui/jquery-ui.css">
<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">
@@ -40,8 +39,6 @@
</div>
<script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
- <script type="text/javascript" src="../js/base.js"></script>
- <script type="text/javascript" src="../jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript" src="../pages/js/mylayui.js"></script>
<script type="text/html" id="detailImgs">
@@ -65,7 +62,8 @@
elem: '#imgCarousel',
arrow: 'always',
width: '100%',
- height: '500px'
+ height: '500px',
+ autoplay: false
};
//甯歌杞挱
@@ -78,11 +76,6 @@
laytpl(detailImgsTpl).render(imgs, function(html) {
$('#imgCarousel').html(html);
detailsImgs.reload(options);
- });
-
- // 鍒囨崲浜嬩欢
- carousel.on('change(imgCarousel)', function(obj) {
- //console.info(obj);
});
});
</script>
diff --git a/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html b/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
index 1a8d80a..9958cbf 100644
--- a/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
+++ b/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
@@ -3,7 +3,6 @@
<head>
<meta charset="UTF-8">
<title>閰嶇粍绠＄悊</title>
- <link rel="stylesheet" href="../jqueryui/jquery-ui.min.css">
<link rel="stylesheet" href="../src/css/layui.css">
<link rel="stylesheet" href="../font-awesome-4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="../pages/css/mylayui.css">
@@ -63,11 +62,8 @@
</div>
</div>
<script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
- <script type="text/javascript" src="../jqueryui/jquery-ui.min.js"></script>
- <script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript" src="../pages/js/mylayui.js"></script>
- <script type="text/javascript" src="../js/base.js"></script>
<script type="text/javascript" src="../pages/js/common.js"></script>
<script type="text/javascript">
layui.use(['layer', 'table', 'form', 'laytpl', 'element', 'laydate'],function() {
diff --git a/gx_tieta/WebRoot/iframe/set-match-group.html b/gx_tieta/WebRoot/iframe/set-match-group.html
index bb12fd4..df00a89 100644
--- a/gx_tieta/WebRoot/iframe/set-match-group.html
+++ b/gx_tieta/WebRoot/iframe/set-match-group.html
@@ -78,9 +78,7 @@
<script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="../jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
- <script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript" src="../pages/js/mylayui.js"></script>
- <script type="text/javascript" src="../js/base.js"></script>
<script type="text/javascript">
layui.use(['layer', 'table', 'form', 'laytpl', 'element'],function() {
var layer = layui.layer // 鑾峰彇layer妯″潡
diff --git a/gx_tieta/WebRoot/pages/css/mylayui.css b/gx_tieta/WebRoot/pages/css/mylayui.css
index 0a9ac54..0480e58 100644
--- a/gx_tieta/WebRoot/pages/css/mylayui.css
+++ b/gx_tieta/WebRoot/pages/css/mylayui.css
@@ -111,6 +111,10 @@
height: 100%;
overflow-y: auto;
}
+/* abs-left */
+.abs.abs-left360 {
+ left: 360px;
+}
/* abs-top */
.abs.abs-top100 {
top: 100px;
diff --git a/gx_tieta/WebRoot/pages/js/mylayui.js b/gx_tieta/WebRoot/pages/js/mylayui.js
index de98aef..fb9dc1e 100644
--- a/gx_tieta/WebRoot/pages/js/mylayui.js
+++ b/gx_tieta/WebRoot/pages/js/mylayui.js
@@ -35,4 +35,25 @@
// 杩斿洖鏋勯�犵殑瀵硅薄
return obj;
-}
\ No newline at end of file
+}
+
+//鏍煎紡鍖栨椂闂�
+Date.prototype.format =function(format)
+{
+ var o = {
+ "M+" : this.getMonth()+1, //month
+ "d+" : this.getDate(), //day
+ "h+" : this.getHours(), //hour
+ "m+" : this.getMinutes(), //minute
+ "s+" : this.getSeconds(), //second
+ "q+" : Math.floor((this.getMonth()+3)/3), //quarter
+ "S" : this.getMilliseconds() //millisecond
+ };
+ if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
+ (this.getFullYear()+"").substr(4- RegExp.$1.length));
+ for(var k in o)if(new RegExp("("+ k +")").test(format))
+ format = format.replace(RegExp.$1,
+ RegExp.$1.length==1? o[k] :
+ ("00"+ o[k]).substr((""+ o[k]).length));
+ return format;
+};
\ No newline at end of file
--
Gitblit v1.9.1