From 77870599e51385355f110aeffc9e6d1c42f1cea0 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期六, 03 十一月 2018 11:41:05 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/css/mylayui.css | 7 +
gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html | 1
gx_tieta/WebRoot/batt-fault-manage.jsp | 107 +++++++++++++++++++++++---
gx_tieta/WebRoot/iframe/batt-fault-manage-details.html | 89 ++++++++++++++++++++++
4 files changed, 190 insertions(+), 14 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index f4e8130..fb122c1 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -10,7 +10,7 @@
<!-- 榛樿浣跨敤鏈�楂樺唴鏍� -->
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" >
<base href="<%=basePath%>">
- <title>闂鍙嶉</title> <!-- 闂鍙嶉 -->
+ <title>鏈烘埧闂璁板綍</title> <!-- 鏈烘埧闂璁板綍 -->
<link rel="stylesheet" href="css/basic.css">
<link rel="stylesheet" type="text/css" href="css/nocontent.css">
<link rel="stylesheet" type="text/css" href="css/loading.css">
@@ -37,14 +37,14 @@
<!--瀵艰埅寮�濮�-->
<jsp:include page="nav.jsp" flush="true"/>
<div class="filter-container">
- <div class="filter-title"><a href="javascript:;">闂鍙嶉</a></div>
+ <div class="filter-title"><a href="javascript:;">鏈烘埧闂璁板綍</a></div>
<div class="filter-content">
<table>
<tbody>
<tr>
<th>鐪�</th> <!-- 鐪� -->
<th>甯�</th> <!-- 甯� -->
- <th>鍖�/鍘�</th> <!-- 甯� -->
+ <th>鍖�/鍘�</th> <!-- 鍖�/鍘� -->
<th><s:text name="Computer_site"/></th> <!-- 鏈烘埧绔欑偣 -->
</tr>
<tr>
@@ -60,14 +60,11 @@
<td>
<select name="" id="station_name3"></select>
</td>
-
-
</tr>
</tbody>
</table>
</div>
</div>
-
<!-- 瀵煎嚭琛ㄦ牸鏁版嵁鐨勮〃鍗� -->
<form id="export_excel" action="ExportTable.servlet" method="post">
<input type="hidden" name="PageName" value="eleHistoryWarn.jsp"/>
@@ -81,14 +78,30 @@
<div >
<!-- 鍒嗛〉鍐呭 -->
<div id="paging">
- <a href="javascript:" id="search" class="layui-btn layui-btn-normal search">鏌ユ壘</a>
- <a class="layui-btn layui-btn-normal addbtn">娣诲姞</a>
- <a href="javascript:" id="export_table" class="layui-btn layui-btn-normal outbtn"><s:text name="Export"/></a> <!-- 瀵煎嚭 -->
+ <a href="javascript:" id="search" class="search"><s:text name="Search"/><!-- 鏌ヨ --></a>
+ <a href="javascript:" class="export"><s:text name="Export"/><!-- 瀵煎嚭 --></a>
+ <s:text name="At_present"/><!-- 褰撳墠 --><span id="current">1/0</span>
+ <span><s:text name="Each_page"/><!-- 姣忛〉 --><input type="text" id="number" value="10"/><s:text name="Item"/><!-- 鏉� --></span>
+ <s:text name="Total_data"/><!-- 鏁版嵁鎬婚噺 --><span id="total">0</span>
+ <a href="javascript:" id="home"><s:text name="HomePage"/><!-- 棣栭〉 --></a>
+ <a href="javascript:" id="pre"><s:text name="Page_Up"/><!-- 涓婁竴椤� --></a>
+ <a href="javascript:" id="next_p"><s:text name="Page_Down"/><!-- 涓嬩竴椤� --></a>
+ <a href="javascript:" id="last"><s:text name="End_Page"/><!-- 灏鹃〉 --></a>
+ <span id="cont">
+ <s:text name="Goto"/><!-- 杞埌 -->
+ <input type="text" id="page_num" value="1" onfocus="this.type='text'" autoComplete="off">
+ <input type="text" style="display:none;" id="456" value="1" onfocus="this.type='text'" autoComplete="off">
+ <a href="javascript:" id="go"><s:text name="Jump"/><!-- 璺宠浆 --></a>
+ </span>
+ <a href="javascript:" class="addbtn">娣诲姞</a>
</div>
</div>
+ <!-- 鍏抽棴鏇存柊寮瑰嚭妗嗙殑鎸夐挳 -->
<div id="closeUploadBtn"></div>
<div id="details"></div>
<div id="detailsOpts"></div>
+ <!-- 瀛樺偍鏄剧ず鍥剧墖璇︽儏鐨勪俊鎭� -->
+ <div id="detailImgs"></div>
<script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/equip-stats-change.jquery.ui.js"></script>
<script type="text/javascript" src="js/eleHistWarn1-jquery.ui.js"></script>
@@ -101,6 +114,7 @@
<script type="text/javascript" src="src/layui.js"></script>
<script type="text/html" id="toolBar">
<a class="layui-btn layui-btn-xs" lay-event="details">鏁呴殰璇︽儏</a>
+ <a class="layui-btn layui-btn-xs" lay-event="delError">鎺掗櫎鏁呴殰鏂规</a>
</script>
<script type="text/javascript">
var permits;
@@ -121,30 +135,88 @@
var tOptions = {
elem: '#eleInfoTbl'
,toolbar: false
- ,defaultToolbar: ['exports', 'filter']
,cellMinWidth: 80
,cols: [[
{field:'station_name1', title:'鐪�', align:'center'}
,{field:'city', title:'甯�', align:'center'}
,{field:'stationName3', title:'鏈烘埧鍚嶇О', align:'center'}
,{field:'note', title:'鏃堕棿', align:'center'}
+ ,{field:'error_en', title: '鏁呴殰鎺掗櫎鐘舵��', align: 'center'}
+ ,{field:'error_dispose', title: '澶勭悊鏂规', align: 'center'}
,{field:'question', title:'鏁呴殰鎻忚堪', align:'center'},
- ,{fixed: 'right', title:'鏁呴殰璇︽儏',toolbar: '#toolBar', width: 100}
+ ,{fixed: 'right', title:'鎿嶄綔',toolbar: '#toolBar', width: 200, align:'center'}
]]
,data:[]
- ,page: true
+ ,page: false
,height: 'full-280'
};
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
+ table.on('tool(eleInfoTbl)', function(obj){
+ //console.log(obj);
+ var ev = obj.event;
+ switch(ev) {
+ case 'details':
+ faultDetails(obj.data);
+ break;
+ default:
+ layer.msg('鍔熻兘寮�鍙戜腑...');
+ break;
+ }
+
+ });
+
+ // 鏌ヨ鏁呴殰璇︽儏
+ function faultDetails(data) {
+ var imgOpts = setDetailsOpts(data);
+ $('#detailImgs').data('data', imgOpts);
+ layer.open({
+ type: 2,
+ title: '<span style="font-weight:bold">>>鏁呴殰璇︽儏</span>',
+ area: ['700px', '660px'],
+ fixed: false, //涓嶅浐瀹�
+ resize: false,
+ maxmin: false,
+ content: 'iframe/batt-fault-manage-details.html'
+ });
+ }
+
+ // 鏋勯�犵粨鏋�
+ function setDetailsOpts(data) {
+ var rs={
+ num: data.num,
+ des: data.question?data.question:'鏆傛棤鎻忚堪锛侊紒锛�'
+ };
+ var picture_num = data.picture_num;
+ var imgs = [];
+ switch(picture_num) {
+ case 1:
+ imgs = ['picture_one'];
+ break;
+ case 2:
+ imgs = ['picture_one','picture_two'];
+ break;
+ case 3:
+ imgs = ['picture_one', 'picture_two', 'picture_three'];
+ break;
+ case 4:
+ imgs = ['picture_one', 'picture_two', 'picture_three', 'picture_four'];
+ break;
+ }
+
+ rs.imgs = imgs;
+
+ return rs;
+ }
+
function getData(a,b){
var arr=[];
for(i=0;i<a;i++){
arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha鍝堝搱鍗″崱鍗″崱鍗″崱鍗″崱'+i});
}
- return arr
+ return arr;
}
$(document).on('click','.addbtn',function(){
@@ -168,6 +240,8 @@
// 鍏抽棴涓婁紶鍥剧墖鐨勯潰鏉�
$('#closeUploadBtn').click(function() {
layer.close(uploadIframe);
+ // 鏌ヨ鍐呭
+ searchfault();
});
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
@@ -299,7 +373,6 @@
$.post("BattInfAction!serchStationName3", "json=" + JSON.stringify(tmp),
function(data) {
var rs = JSON.parse(data.result);
- console.info(rs);
if (rs.code == 1) {
var _data = rs.data;
var $select = $("#station_name3");
@@ -356,14 +429,20 @@
var data = JSON.parse(result.result);
if(data.code==1&&data.data.length>0){
data = data.data;
+ console.log(data);
for(var i=0;i<data.length;i++){
var tmp = {};
var _data = data[i];
+ var error_en = _data.error_en?'<a class="layui-btn layui-btn-xs layui-bg-blue">宸叉帓闄�</a>':'<a class="layui-btn layui-btn-xs layui-bg-red">鎺掗櫎涓�...</a>'
tmp.station_name1 = _data.stationName1;
tmp.city = _data.stationName2;
tmp.stationName3 = _data.stationName;
tmp.note = _data.record_time;
tmp.question = _data.error_descript;
+ tmp.error_en = error_en;
+ tmp.num = _data.num;
+ tmp.county = _data.stationName5;
+ tmp.picture_num = _data.picture_num;
tOptions.data.push(tmp);
}
}else {
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
index 1346e26..a1ace7f 100644
--- a/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-add1.html
@@ -137,6 +137,7 @@
'record_time': date.format('yyyy-MM-dd hh:mm:ss'), // 鎻愪氦鏃ユ湡
'error_descript': '',
'stationId': '',
+ 'error_dispose': '',
'picture_num':4
},
files: {}
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html
new file mode 100644
index 0000000..96a22f5
--- /dev/null
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-details.html
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <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">
+ html, body {
+ width: 700px;
+ min-width: 700px;
+ }
+ #imgCarousel .carousel-item div {
+ text-align: center;
+ }
+ #imgCarousel img {
+ width: auto;
+ height: 100%;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-page-container mrl8 mrr8">
+ <fieldset class="layui-elem-field">
+ <legend>闂鎻忚堪</legend>
+ <div class="layui-field-box" id="detailsText">
+
+ </div>
+ </fieldset>
+
+ <div class="layui-carousel" id="imgCarousel" lay-filter="imgCarousel">
+ <div carousel-item="" class="carousel-item">
+ <div>鏉＄洰1</div>
+ <div>鏉＄洰2</div>
+ <div>鏉＄洰3</div>
+ <div>鏉＄洰4</div>
+ <div>鏉＄洰5</div>
+ </div>
+ </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/html" id="detailImgs">
+ <div carousel-item="" class="carousel-item">
+ {{# layui.each(d.imgs, function(index, item){ }}
+ <div><img src="Deverror_recordAction!serchByInfo?json={num:{{ d.num }},note:{{ item }} }"></div>
+ {{# }); }}
+ </div>
+ </script>
+ <script type="text/javascript">
+ layui.use(['laytpl', 'carousel'], function() {
+ var carousel = layui.carousel;
+ var laytpl = layui.laytpl;
+
+ // 鍥剧墖杞浆閰嶇疆椤�
+ var options = {
+ elem: '#imgCarousel',
+ arrow: 'always',
+ width: '100%',
+ height: '500px'
+ };
+
+ //甯歌杞挱
+ var detailsImgs = carousel.render(options);
+ var detailImgsTpl = $('#detailImgs').html();
+ var imgs = parent.$('#detailImgs').data('data');
+ $('#detailsText').text(imgs.des);
+ // 娣诲姞妯℃澘
+ laytpl(detailImgsTpl).render(imgs, function(html) {
+ $('#imgCarousel').html(html);
+ detailsImgs.reload(options);
+ });
+
+ // 鍒囨崲浜嬩欢
+ carousel.on('change(imgCarousel)', function(obj) {
+ //console.info(obj);
+ });
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/pages/css/mylayui.css b/gx_tieta/WebRoot/pages/css/mylayui.css
index d51a07c..aab10df 100644
--- a/gx_tieta/WebRoot/pages/css/mylayui.css
+++ b/gx_tieta/WebRoot/pages/css/mylayui.css
@@ -127,4 +127,11 @@
/* width */
.w272 {
width: 272px;
+}
+/* mrl */
+.mrl8 {
+ margin-left: 8px;
+}
+.mrr8 {
+ margin-right: 8px;
}
\ No newline at end of file
--
Gitblit v1.9.1