From 8d576aaf23412bd2b0fd83aa77e91f0ed359a9d8 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期四, 10 一月 2019 10:48:58 +0800
Subject: [PATCH] 修改线程监控异常显示逻辑 已服务器时间为准
---
gx_tieta/WebRoot/batt-fault-manage.jsp | 250 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 223 insertions(+), 27 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index fb122c1..047e0db 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -45,7 +45,8 @@
<th>鐪�</th> <!-- 鐪� -->
<th>甯�</th> <!-- 甯� -->
<th>鍖�/鍘�</th> <!-- 鍖�/鍘� -->
- <th><s:text name="Computer_site"/></th> <!-- 鏈烘埧绔欑偣 -->
+ <th><s:text name="Computer_site"/></th>
+ <th>闂绫诲瀷</th> <!-- 鏈烘埧绔欑偣 -->
</tr>
<tr>
<td>
@@ -59,6 +60,20 @@
</td>
<td>
<select name="" id="station_name3"></select>
+ </td>
+ <td>
+ <select name="" id="question_name">
+ <option value="-1">鍏ㄩ儴</option>
+ <option value="0">鐢垫睜闂</option>
+ <option value="1">鐢垫簮闂</option>
+ <option value="2">绌鸿皟闂</option>
+ <option value="3">婕忔按闂</option>
+ <option value="4">BTS璁惧闂</option>
+ <option value="5">GPRS妯″潡闂</option>
+ <option value="6">鏂藉伐瀹夎闂</option>
+ <option value="7">閾侀攤鐢垫睜闂</option>
+ <option value="8">鍏朵粬闂</option>
+ </select>
</td>
</tr>
</tbody>
@@ -79,7 +94,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>
@@ -102,6 +117,8 @@
<div id="detailsOpts"></div>
<!-- 瀛樺偍鏄剧ず鍥剧墖璇︽儏鐨勪俊鎭� -->
<div id="detailImgs"></div>
+ <!-- 瀛樺偍瑙ｅ喅鏂规鐨勪俊鎭� -->
+ <div id="subPlan"></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>
@@ -110,11 +127,13 @@
<script type="text/javascript" src="js/rightmenu.js"></script>
<script type="text/javascript" src="js/myConfirm.js"></script>
<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/javascript" src="pages/js/common.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;
@@ -124,6 +143,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妯″潡
@@ -131,20 +157,26 @@
,element = layui.element
,$=layui.jquery
,form = layui.form;
+
+ var homeQuestion = GLOBAL.HomeQues; // 鏈烘埧闂鍒楄〃
+ $('#question_name').html(homeQuestion.getOptions(true));
+ var uploadIframe; // 闈㈡澘
// 琛ㄦ牸鏁版嵁閰嶇疆椤�
var tOptions = {
elem: '#eleInfoTbl'
,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:'ques_type', title:'鏁呴殰绫诲瀷', align:'center',width:150}
+ ,{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
@@ -161,6 +193,12 @@
case 'details':
faultDetails(obj.data);
break;
+ case 'delError':
+ addSubPlan(obj.data);
+ break;
+ case 'viewError':
+ viewSolveDetails(obj.data);
+ break;
default:
layer.msg('鍔熻兘寮�鍙戜腑...');
break;
@@ -175,10 +213,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'
});
}
@@ -186,6 +249,7 @@
// 鏋勯�犵粨鏋�
function setDetailsOpts(data) {
var rs={
+ title: '鏁呴殰鎻忚堪',
num: data.num,
des: data.question?data.question:'鏆傛棤鎻忚堪锛侊紒锛�'
};
@@ -211,9 +275,67 @@
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);
+
+ $('#subPlan').data('data', subPlanData);
+
+ uploadIframe = layer.open({
+ type: 2,
+ title: '<span style="font-weight:bold">>>鏁呴殰鎺掗櫎鏂规</span>',
+ area: ['1200px', '600px'],
+ fixed: false, //涓嶅浐瀹�
+ resize: false,
+ maxmin: false,
+ content: 'iframe/batt-fault-manage-del.html'
+ });
+ }
+
+ // 鏋勯�犺В鍐虫柟妗堢殑缁撴灉
+ function setSubPlanData(data) {
+ var rs = {
+ num: data.num,
+ error_en: 1,
+ error_dispose: data.error_dispose
+ };
+
+ return rs;
+ }
+
+
function getData(a,b){
var arr=[];
- for(i=0;i<a;i++){
+ for(var 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;
@@ -222,7 +344,7 @@
$(document).on('click','.addbtn',function(){
searchStationHistRecord();
});
- var uploadIframe;
+ // 娣诲姞鏁呴殰淇℃伅
function searchStationHistRecord(){
// 鏄剧ず闈㈡澘
uploadIframe = layer.open({
@@ -244,9 +366,11 @@
searchfault();
});
+ var isNewLoad = true;
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
$(document).ready(function() {
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
+ var pre_province = getQueryString("province");
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup", null,
function(data) {
data = data.result;
@@ -258,11 +382,14 @@
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]);
$option.attr("value", data.data[i - 1]);
+ if(pre_province == data.data[i - 1] && isNewLoad){
+ $option.attr('selected',true);
+ }
}
$select.append($option);
}
@@ -273,10 +400,13 @@
});
});
+ //鏍规嵁鐪佹煡璇㈠競
function findCity() {
var data = {
StationName1: $("#station_name1").val()
};
+ var pre_city = getQueryString('city');
+ console.info(pre_city);
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -294,6 +424,9 @@
for (var i = 0; i < _data.length; i++) {
var __data = _data[i];
var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ if(pre_city == __data.StationName2 && isNewLoad){
+ tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);
+ }
optsList.push(tmp);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -314,7 +447,7 @@
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
};
-
+ var pre_county = getQueryString('county');
// 鏌ヨ鍖哄幙
$.ajax({
type: 'post',
@@ -334,6 +467,9 @@
StationId: __data.StationId
};
var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);
+ if(pre_county == __data.StationName5 && isNewLoad){
+ tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);
+ }
optsList.push(tmp);
}
@@ -368,6 +504,7 @@
StationName2: $("#city").val(),
StationName5: $("#county").val()
};
+ var pre_home = getQueryString('home');
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3", "json=" + JSON.stringify(tmp),
@@ -384,12 +521,16 @@
StationId: __data.StationId
};
var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ if(pre_home == __data.StationName && isNewLoad){
+ tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr,{},true);
+ isNewLoad = false
+ }
optsList.push(tmp);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
createOptions($select, optsList, true);
-
+ searchfault();
} else {
$("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
@@ -399,15 +540,15 @@
// 鏋勯�犳煡璇㈠悗鍙版暟鎹�
function tempCondition(){
+ var sid = $('#station_name3').find('option:selected').attr('stationid');
+ sid = sid?sid: "";
temp ={
- StationId:"",
+ StationId: sid,
StationName1:$('#station_name1').val(),
StationName2:$('#city').val(),
- StationName5:"",
- page:{
- pageSize: 10,
- pageCurr:1
- },
+ StationName5:$('#county').val(),
+ MonCount: $('#question_name').val(),
+ page:Page,
};
return temp;
}
@@ -433,26 +574,37 @@
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;
+ tmp.ques_type = homeQuestion.getLayuiBtn(_data.error_state);
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);
}
@@ -462,6 +614,50 @@
$('#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);
+ }
+ });
+
+ // 鍒囨崲闂绫诲瀷閲嶆柊璁剧疆鍒嗛〉淇℃伅
+ $('#question_name').change(function() {
+ Page.pageCurr = 1;
+ });
});
</script>
</body>
--
Gitblit v1.9.1