From d42cb45f8fc0932e9a0766f98c445635a85b22d3 Mon Sep 17 00:00:00 2001
From: admin:huo123456@qq <496960745@qq.com>
Date: 星期一, 21 一月 2019 09:15:22 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/batt-state-manage.jsp | 124 ++++++++++++++++++++++++++++++++++-------
1 files changed, 102 insertions(+), 22 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index ea5903c..052a8a7 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -16,7 +16,7 @@
<meta http-equiv="expires" content="0">
<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
<meta http-equiv="description" content="This is my page">
- <title><s:text name="Station_statequery"/></title> <!-- 鏈烘埧鐘舵�佹煡璇� -->
+ <title><s:text name="Station_real_status_query"/></title> <!-- 鏈烘埧瀹炴椂鐘舵�佹煡璇� -->
<link href="css/basic.css" rel="stylesheet">
<link rel="stylesheet" href="css/BrdwMaint.css">
<link rel="stylesheet" type="text/css" href="css/loading.css">
@@ -82,7 +82,7 @@
<!-- 涓讳綋鍐呭 -->
<div id="main">
<div id="eleInfor">
- <span class="summary"><s:text name="Station_statequery"/>--><s:text name="Show/hide_the_query_conditions"/></span>
+ <span class="summary"><s:text name="Station_real_status_query"/>--><s:text name="Show/hide_the_query_conditions"/></span>
<div class="checkCon filter-container">
<form action="" id="search_form">
<!-- 缁存姢鍖轰俊鎭� -->
@@ -113,11 +113,11 @@
</table>
<table class="condi-opt">
<tr>
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_POFF_ComError" name="" value=2 class="" />鍋滅數</td> <!-- 鍋滅數 -->
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_XUHANG_ComError" name="" value=4 class="">缁埅</td> <!-- 鎺夌珯 -->
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name="" value=8 class="" />鍙戠數</td> <!-- 鍙戠數 -->
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError" name="" value=16 class="" >寮�闂ㄥ紓甯�</td>
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name="" value=32 class="">鎺夌珯</td> <!-- 鎺夌珯 -->
+ <td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_POFF_ComError" name="" value=2 class="" /><span class="checkbox-label">鍋滅數</span></td> <!-- 鍋滅數 -->
+ <td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_XUHANG_ComError" name="" value=4 class=""><span class="checkbox-label">缁埅</span></td> <!-- 鎺夌珯 -->
+ <td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name="" value=8 class="" /><span class="checkbox-label">鍙戠數</span></td> <!-- 鍙戠數 -->
+ <td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError" name="" value=16 class="" ><span class="checkbox-label">寮�闂ㄥ紓甯�</span></td> <!-- 寮�闂ㄥ紓甯� -->
+ <td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name="" value=32 class=""><span class="checkbox-label">鎺夌珯</span></td> <!-- 鎺夌珯 -->
</tr>
</table>
@@ -170,6 +170,7 @@
<script type="text/javascript" src="js/createTab.js"></script>
<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript" src="pages/js/common.js"></script>
+ <script type="text/javascript" src="js/rightmenu.js"></script>
<script type="text/javascript">
var Page={
pageCurr:1,
@@ -196,7 +197,7 @@
var station_state = getQueryString('station_state');
if(station_state){
//alert(station_state);
-
+ $('#search_form .condi-opt input[type=checkbox]').prop("checked", false);
$('#search_form .condi-opt [value='+station_state+']:checkbox').attr("checked", true);
}
@@ -255,7 +256,36 @@
$('#paging .search').click(function() {
searchstationstate(true);
});
-
+
+ var menuItems = [{
+ txt: '瀹炴椂-鐩戞祴鏁版嵁',cla: 'menu-control'
+ }];
+ // 娣诲姞鍙抽敭鑿滃崟
+ tblHd.on('click', 'tbody tr', function(e) {
+ // 鍒ゆ柇鏄惁涓哄彸閿�
+ if(e.which == 3) {
+ var disX = (e || event).clientX + 10; //鑾峰彇榧犳爣鐐瑰嚮鐨勬í鍧愭爣
+ var disY = (e || event).clientY + 10; // 鑾峰彇榧犳爣鐐瑰嚮鐨勭旱鍧愭爣
+ var trData = $(this).data('attr');
+ menuItems[0].data = trData;
+ //console.log(trData);
+ rightMenu.showMenu(menuItems, disX, disY);
+ }
+ });
+
+ // 鐐瑰嚮瀹炴椂-鐩戞祴鏁版嵁璺宠浆
+ $('body').on('click', '.menu-control', function() {
+ var _data = $(this).data('data');
+ //console.log(_data);
+ var province = _data.stationName1;
+ var city = _data.stationName2;
+ var county = _data.stationName5;
+ var home = _data.stationName;
+
+ var url = skipUrl('control.jsp',province,city,county,home);
+ window.open(url);
+ });
+
// 鐐瑰嚮琛ㄦ牸閫夐」鏄剧ず琛ㄦ牸閫夐」寮瑰嚭妗�
$('#paging .card-opt').click(function() {
var checkboxList = $('#cardOption .con_table table tbody').find('input[type="checkbox"]');
@@ -339,11 +369,13 @@
}
-
+ var isNewLoad = true;
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
var filterLoad;
$(document).ready(function(){
filterLoad = layer.load();
+ var pre_province = getQueryString('province');
+
//椤甸潰鍔犺浇鏃舵煡璇㈢渷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -360,6 +392,9 @@
}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);
}
@@ -378,6 +413,7 @@
if(isLoad) {
filterLoad = layer.load();
}
+ var pre_city = getQueryString('city');
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -395,6 +431,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);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -417,6 +456,7 @@
if(isLoad) {
filterLoad = layer.load();
}
+ var pre_county = getQueryString('county');
// 鏌ヨ鍖哄幙
$.ajax({
type: 'post',
@@ -436,6 +476,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);
}
@@ -478,6 +521,7 @@
if(isLoad) {
filterLoad = layer.load();
}
+ var pre_home = getQueryString('home');
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -494,6 +538,9 @@
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);
+ }
optsList.push(tmp);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -502,6 +549,7 @@
$("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
+ isNewLoad = false;
layer.close(filterLoad);
searchstationstate(true);
});
@@ -581,7 +629,7 @@
var index = 0;
var data = JSON.parse(data.result);
if(data.code==1&&data.data!=null){
- //console.info(data.data);
+ console.info(data.data);
var data = data.data;
//console.info(data[0].dev_id);
for(var i=0;i<data.length;i++){
@@ -627,11 +675,11 @@
if(_data.station_stat_xuhang){
arrTd[index++] = create_fa_font('fa-television','red',{msg: '缁埅寮傚父'});
arrTd[index++] = _data.station_xuhang_start_time;
- arrTd[index++] = StringtoData(_data.station_xuhang_start_time);
+ arrTd[index++] = StringtoData(_data.station_xuhang_start_time);
}else{
arrTd[index++] = create_fa_font('fa-television','green',{msg: '姝ｅ父'});
- arrTd[index++] = "-";
- arrTd[index++] = formartTime(0);
+ arrTd[index++] = _data.station_xuhang_start_time;
+ arrTd[index++] = getXunHangTimeLong(_data.station_xuhang_end_time, _data.station_xuhang_start_time, _data.station_stat_xuhang);
}
// 寮�闂ㄥ叧闂ㄥ紓甯�
@@ -660,21 +708,53 @@
$('#current').text(Page.pageCurr+"/"+pageNum);
}
layer.close(load);
- createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+ createFullTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+
+ // 缁欐瘡涓�琛屾坊鍔犳暟鎹�
+ var trList = tblBd.find('tbody tr');
+ // 閬嶅巻鍐呭缁檛r娣诲姞attr
+ for(var i=0; i<data.length; i++) {
+ trList.eq(i).data('attr', data[i]);
+ }
window.clearTimeout(myTimeOut);
myTimeOut = window.setTimeout(searchstationstate, 8000);
}
});
}
+
+ // 椤甸潰瀹瑰櫒澶у皬鏀瑰彉瑙﹀彂
+ $(window).resize(function() {
+ setTblWidth(tblHd, tblBd);
+ });
+
+ // 鑾峰彇缁埅鏃堕暱
function StringtoData(value){
- var date1= value; //寮�濮嬫椂闂�
- var date2 = new Date(); //缁撴潫鏃堕棿
- var date3 = date2.getTime() - new Date(date1).getTime(); //鏃堕棿宸殑姣鏁�
- var date4 = Math.floor(date3/(1000));
- return formartTime(date4);
- }
- //鏍煎紡鍖栨椂闂磛alue浼犲叆涓虹
+ var date1= value; //寮�濮嬫椂闂�
+ var date2 = new Date(); //缁撴潫鏃堕棿
+ var date3 = date2.getTime() - new Date(date1).getTime(); //鏃堕棿宸殑姣鏁�
+ var date4 = Math.floor(date3/(1000));
+ return formartTime(date4);
+ }
+
+ // 閫氳繃缁埅寮�濮嬫椂闂村拰缁撴潫鏃堕棿鑾峰彇缁埅鐨勬椂闀�
+ function getXunHangTimeLong(start, end, state) {
+ var timeLong = '';
+ if(start && end) {
+ var _timeLong = new Date(end).getTime()-new Date(start).getTime();
+ timeLong = Math.floor(_timeLong/(1000));
+ }
+
+ // 鏈�缁堟椂闂磝x澶﹛x鏃秞x鍒嗛挓
+ var rsTime = '-';
+ if(isNumber(timeLong)&&!state) {
+ rsTime = formartTime(timeLong)
+ }
+
+ return rsTime;
+ }
+
+ //鏍煎紡鍖栨椂闂磛alue浼犲叆涓虹
function formartTime(value){
value = Math.abs(parseInt(value));
//console.info(value);
--
Gitblit v1.9.1