From 7151953af27fa197444512f84abfe8af604b8ca6 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.23>
Date: 星期一, 10 十二月 2018 09:22:16 +0800
Subject: [PATCH] 修复电池历史告警页面不能查询到在线电压告警数据bug
---
gx_tieta/WebRoot/batt-fault-manage.jsp | 157 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 136 insertions(+), 21 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index bd2d9ed..1c398f4 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -79,7 +79,7 @@
<!-- 鍒嗛〉鍐呭 -->
<div id="paging">
<a href="javascript:" id="search" class="search"><s:text name="Search"/><!-- 鏌ヨ --></a>
- <a href="javascript:" class="export"><s:text name="Export"/><!-- 瀵煎嚭 --></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>
@@ -114,9 +114,11 @@
<script type="text/javascript" src="js/myinterval.js"></script>
<script type="text/javascript" src="js/pageUtil.js"></script>
<script type="text/javascript" src="src/layui.js"></script>
+ <script type="text/javascript" src="js/pageUtil.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>
+ <a class="layui-btn layui-btn-xs" lay-event="viewError">鏌ョ湅鏁呴殰鏂规</a>
</script>
<script type="text/javascript">
var permits;
@@ -126,6 +128,13 @@
permits=<%=permits%>;
//console.info(json);
<% } %>
+
+ var Page = {
+ pageCurr:1,
+ pageSize:10,
+ pageAll:0
+ };
+
// 搴旂敤layui妗嗘灦
layui.use(['layer', 'table', 'form', 'laytpl', 'element','jquery'],function() {
var layer = layui.layer // 鑾峰彇layer妯″潡
@@ -140,14 +149,15 @@
,toolbar: false
,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: 200, align:'center'}
+ {field:'stationName3', title:'鏈烘埧鍚嶇О', align:'center',width:450}
+ ,{field:'note', title:'鏁呴殰鎻愬嚭鏃ユ湡', align:'center',width:150}
+ ,{field:'originator', title:'鏁呴殰鎻愬嚭浜�', align:'center',width:150}
+ ,{field:'error_en', title: '鏁呴殰鎺掗櫎鐘舵��', align: 'center',width:150}
+ ,{field:'question', title:'鏁呴殰鎻忚堪', align:'center'}
+ ,{field:'error_dispose', title: '澶勭悊鏂规鎻忚堪', align: 'center'}
+ ,{field:'solve_record_time', title: '澶勭悊鏂规鎻愬嚭鏃ユ湡', align: 'center'}
+ ,{field:'solve_user',title:'鏁呴殰瑙ｅ喅浜�',align: 'center'}
+ ,{fixed: 'right', title:'鎿嶄綔',toolbar: '#toolBar', width: 290, align:'center'}
]]
,data:[]
,page: false
@@ -167,6 +177,9 @@
case 'delError':
addSubPlan(obj.data);
break;
+ case 'viewError':
+ viewSolveDetails(obj.data);
+ break;
default:
layer.msg('鍔熻兘寮�鍙戜腑...');
break;
@@ -181,10 +194,35 @@
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,
+ maxHeight: 660,
+ maxmin: true,
+ content: 'iframe/batt-fault-manage-details.html'
+ });
+ }
+
+ // 鏌ョ湅澶勭悊鏂规鎻忚堪
+ 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({
+ type: 2,
+ title: '<span style="font-weight:bold">>>澶勭悊鏂规璇︽儏</span>',
+ area: ['1200px', '660px'],
+ fixed: false, //涓嶅浐瀹�
+ resize: true,
+ maxHeight: 660,
+ maxmin: true,
content: 'iframe/batt-fault-manage-details.html'
});
}
@@ -192,6 +230,7 @@
// 鏋勯�犵粨鏋�
function setDetailsOpts(data) {
var rs={
+ title: '鏁呴殰鎻忚堪',
num: data.num,
des: data.question?data.question:'鏆傛棤鎻忚堪锛侊紒锛�'
};
@@ -217,6 +256,35 @@
return rs;
}
+ // 鏋勯�犳煡鐪嬪鐞嗘柟妗堝晩缁撴灉
+ function setDelDetailsOpts(data) {
+ var rs={
+ title: '澶勭悊鏂规鎻忚堪',
+ num: data.num,
+ des: data.error_dispose?data.error_dispose:'鏆傛棤鎻忚堪锛侊紒锛�'
+ };
+ var picture_num = data.picture_num;
+ var imgs = [];
+ switch(picture_num) {
+ case 1:
+ imgs = ['solve_picture_one'];
+ break;
+ case 2:
+ imgs = ['solve_picture_one','solve_picture_two'];
+ break;
+ case 3:
+ imgs = ['solve_picture_one', 'solve_picture_two', 'solve_picture_three'];
+ break;
+ case 4:
+ imgs = ['solve_picture_one', 'solve_picture_two', 'solve_picture_three', 'solve_picture_four'];
+ break;
+ }
+
+ rs.imgs = imgs;
+
+ return rs;
+ }
+
// 娣诲姞瑙ｅ喅鏂规
function addSubPlan(data) {
var subPlanData = setSubPlanData(data);
@@ -226,7 +294,7 @@
uploadIframe = layer.open({
type: 2,
title: '<span style="font-weight:bold">>>鏁呴殰鎺掗櫎鏂规</span>',
- area: ['700px', '560px'],
+ area: ['1200px', '600px'],
fixed: false, //涓嶅浐瀹�
resize: false,
maxmin: false,
@@ -239,7 +307,7 @@
var rs = {
num: data.num,
error_en: 1,
- error_dispose: ''
+ error_dispose: data.error_dispose
};
return rs;
@@ -293,7 +361,7 @@
for (var i = 0; i <= data.data.length; i++) {
$option = $("<option></option>");
if (i == 0) {
- $option.html("鍏ㄩ儴(" + data.data.length + ")");
+ $option.html("鍏ㄩ儴(鍏�" + data.data.length + "绉�)");
$option.attr("value", "");
} else {
$option.text(data.data[i - 1]);
@@ -308,6 +376,7 @@
});
});
+ //鏍规嵁鐪佹煡璇㈠競
function findCity() {
var data = {
StationName1: $("#station_name1").val()
@@ -439,10 +508,7 @@
StationName1:$('#station_name1').val(),
StationName2:$('#city').val(),
StationName5:"",
- page:{
- pageSize: 10,
- pageCurr:1
- },
+ page:Page,
};
return temp;
}
@@ -468,26 +534,36 @@
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>'
+ 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>';
+ var solve_record_time = _data.error_en?_data.solve_record_time:'';
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_num = _data.error_en;
tmp.error_en = error_en;
+ tmp.error_dispose = _data.error_dispose;
tmp.num = _data.num;
tmp.county = _data.stationName5;
tmp.picture_num = _data.picture_num;
+ tmp.originator = _data.uname;
+ tmp.solve_user = _data.solve_uname;
+ tmp.solve_record_time = solve_record_time;
tOptions.data.push(tmp);
+ Page.pageAll = _data.page.pageAll;
}
}else {
+ Page.pageAll = 0;
layer.msg('鏆傛棤鏁版嵁锛�', {icon:0, shade: 0.1,shadeClose:true});
}
var pageNum = tOptions.data.length;
tOptions.limit = pageNum;
// 璁剧疆鍒嗛〉淇℃伅
- $('#total').text(pageNum);
+ $('#total').text(Page.pageAll);
+ $('#current').text(Page.pageCurr+"/"+Math.ceil(Page.pageAll/Page.pageSize));
+
table.render(tOptions);
layer.close(load);
}
@@ -497,6 +573,45 @@
$('#search').click(function(){
searchfault();
});
+
+
+ //椤甸潰鍒嗛〉
+
+ //鐐瑰嚮棣栭〉
+ $('#home').click(function(){
+ GotoFirstPage(Page,searchfault);
+ });
+
+
+ //鐐瑰嚮涓婁竴椤�
+ $('#pre').click(function(){
+ GotoPrePage(Page,searchfault);
+ });
+
+ //鐐瑰嚮涓嬩竴椤�
+ $('#next_p').click(function(){
+ GotoNextPage(Page,searchfault);
+ });
+
+ //鐐瑰嚮灏鹃〉
+ $('#last').click(function(){
+ GotoLastPage(Page,searchfault);
+ });
+
+ //鐐瑰嚮璺宠浆
+ $('#go').click(function(){
+ GotoAppointPage($('#page_num'),Page,searchfault);
+ });
+
+ //璁剧疆姣忛〉鏉℃暟浜嬩欢
+ $('#number').blur(function(){
+ var pagesize = $('#number').val();
+ if(parseInt(pagesize) > 0){
+ Page.pageSize = pagesize;
+ }else{
+ $('#number').val(Page.pageSize);
+ }
+ });
});
</script>
</body>
--
Gitblit v1.9.1