From 7bc36b22fe7677ca1ea9018175ea39d1ea2bdad6 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 21 十一月 2018 10:25:23 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-state-manage.jsp | 245 +++++++++++++++++++++++++++++++++---------------
1 files changed, 166 insertions(+), 79 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 7434bbe..f69f7dc 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -9,22 +9,21 @@
<html>
<head>
<base href="<%=basePath%>">
-
- <title><s:text name="Station_statequery"/></title> <!-- 鏈烘埧鐘舵�佹煡璇� -->
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="cache-control" content="no-cache">
+ <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_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">
<link rel="stylesheet" type="text/css" href="css/basic-layout.css"/>
<link rel="stylesheet" href="css/nocontent.css">
<link rel="stylesheet" href="alifont/iconfont.css">
- <meta http-equiv="pragma" content="no-cache">
- <meta http-equiv="cache-control" content="no-cache">
- <meta http-equiv="expires" content="0">
- <meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
- <meta http-equiv="description" content="This is my page">
-
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<style type="text/css">
body {
overflow-x: hidden !important;
@@ -83,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">
<!-- 缁存姢鍖轰俊鎭� -->
@@ -91,24 +90,22 @@
<tr class="fWeight">
<td>鐪�</td> <!-- 鐪� -->
<td>甯�</td> <!-- 甯� -->
+ <td>鍖�/鍘�</td> <!-- 鍖�/鍘� -->
<td><s:text name="Computer_name"/></td> <!-- 鏈烘埧鍚嶇О -->
</tr>
<tr>
<td>
- <select id="station_name1" name="stationname1">
-
- </select>
+ <select id="station_name1" name="stationname1"></select>
</td>
<td>
- <select id="city">
-
- </select>
+ <select id="city"></select>
</td>
<td>
- <select id="station_name3" name="stationname">
-
- </select>
+ <select id="county"></select>
+ </td>
+ <td>
+ <select id="station_name3" name="stationname"></select>
</td>
@@ -116,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>
@@ -171,6 +168,7 @@
<script type="text/javascript" src="js/loading.js"></script>
<script type="text/javascript" src="js/nocontent.js"></script>
<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">
var Page={
@@ -193,6 +191,16 @@
// 鏍规嵁琛ㄦ牸鐨勫ご閮ㄧ敓鎴愯〃鏍奸�夐」鍜岃〃鏍肩殑鐘舵�佹暟缁�
$(function() {
+
+ //褰撲粠鍏朵粬椤甸潰璺宠浆鍒板綋鍓嶉〉闈㈤�変腑鎸囧畾鐨勫紓甯哥被鍨嬪苟涓旀煡璇㈣褰�
+ 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);
+ }
+
+
centerDiv($('#cardOption'));
// 閬嶅巻琛ㄦ牸澶撮儴鐢熸垚鐘舵�佹暟缁�
for(var i = 0; i < arrTh.length; i++) {
@@ -245,10 +253,7 @@
createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
$('#paging .search').click(function() {
-
- searchstationstate();
- //noContent.showNoContent(); //鏄剧ず鏌ヨ澶辫触妗�
-
+ searchstationstate(true);
});
// 鐐瑰嚮琛ㄦ牸閫夐」鏄剧ず琛ㄦ牸閫夐」寮瑰嚭妗�
@@ -334,9 +339,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;
@@ -353,6 +362,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);
}
@@ -363,10 +375,15 @@
});
});
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ var pre_city = getQueryString('city');
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -384,6 +401,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);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -391,25 +411,87 @@
}else {
$select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
}
- findStationNamebyStationname1();
+ findCounty();
}
});
}
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
+
+ // 鏌ヨ鍖�/鍘�
+ function findCounty(isLoad) {
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ var pre_county = getQueryString('county');
+ // 鏌ヨ鍖哄幙
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: "BattInfAction!serchStationName5",
+ data: "json="+JSON.stringify(tmp),
+ success:function(data) {
+ var rs = JSON.parse(data.result);
+ var $select = $("#county");
+ if(rs.code==1){
+ var _data = rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ 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);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else{
+ $select.text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ // 褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
- findCity();
+ findCity(true);
});
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ // 褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function(){
- findStationNamebyStationname1();
+ findCounty(true);
+ });
+ // 褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
+ findStationNamebyStationname1(true);
+ });
+
+ // 褰撶數姹犵粍鐨勫�煎彉鍖栨椂鏇存柊鍐呭
+ $('#station_name3').change(function() {
+ searchstationstate(true);
});
//鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
+ function findStationNamebyStationname1(isLoad){
var tmp = {
StationName1:$("#station_name1").val(),
- StationName2:$("#city").val()
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ 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){
@@ -421,18 +503,14 @@
var optsList = [];
//console.info(_data[0]);
for(var i=0;i<_data.length;i++){
- /* if(i==0){
- $select.html("<s:text name='All'/>(<s:text name='Common'/>"+data.length+"<s:text name='Species'/>)");
- $select.attr("value","");
- }else{
- $select.text(_data[i-1].StationName3);
- $select.attr("value",_data[i-1].StationId);
- }*/
var __data = _data[i];
var _attr = {
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);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -441,8 +519,9 @@
$("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
-
- searchstationstate();
+ isNewLoad = false;
+ layer.close(filterLoad);
+ searchstationstate(true);
});
}
@@ -456,8 +535,9 @@
pageSize:$('#number').val(),
pageCurr:Page.pageCurr,
},
- StationName1:$('#station_name1').val(), //甯�
- StationName2:$('#city').val(),
+ StationName1:$('#station_name1').val(), // 鐪�
+ StationName2:$('#city').val(), // 甯�
+ StationName5:$('#county').val(), // 鍖�/鍘�
StationName3:$('#station_name3').val(),
StationId: stationid?stationid:0,
BattGroupNum:battgroupid,
@@ -465,43 +545,49 @@
//console.info(temp);
return temp;
}
- function batt_condition(){
- var POFF_ComError = 0;
- var XUHANG_ComError = 0;
- var FADIAN_ComError = 0;
- var DIAOZHAN = 0;
- var DOOROPEN_ComError = 0;
- var condition = 0;
- if($('#ALM_TYPE_BTS9100S_POFF_ComError').attr("checked")){
- POFF_ComError = $('#ALM_TYPE_BTS9100S_POFF_ComError').val();
- condition+=parseInt(POFF_ComError);
- }
- if($('#ALM_TYPE_BTS9100S_XUHANG_ComError').attr("checked")){
- XUHANG_ComError = $('#ALM_TYPE_BTS9100S_XUHANG_ComError').val();
- condition+=parseInt(XUHANG_ComError);
- }
- if($('#ALM_TYPE_BTS9100S_FADIAN_ComError').attr("checked")){
- FADIAN_ComError = $('#ALM_TYPE_BTS9100S_FADIAN_ComError').val();
- condition+=parseInt(FADIAN_ComError);
- }
- if($('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').attr("checked")){
- DIAOZHAN = $('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').val();
- condition+=parseInt(DIAOZHAN);
- }
- if($('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').attr("checked")){
- DOOROPEN_ComError = $('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').val();
- condition+=parseInt(DOOROPEN_ComError);
- }
- //condition = POFF_ComError+XUHANG_ComError+DIAOZHAN+DOOROPEN_ComError+FADIAN_ComError;
- //console.info(condition);
- return condition;
+
+ function batt_condition(){
+ var POFF_ComError = 0;
+ var XUHANG_ComError = 0;
+ var FADIAN_ComError = 0;
+ var DIAOZHAN = 0;
+ var DOOROPEN_ComError = 0;
+ var condition = 0;
+ if($('#ALM_TYPE_BTS9100S_POFF_ComError').attr("checked")){
+ POFF_ComError = $('#ALM_TYPE_BTS9100S_POFF_ComError').val();
+ condition+=parseInt(POFF_ComError);
}
+ if($('#ALM_TYPE_BTS9100S_XUHANG_ComError').attr("checked")){
+ XUHANG_ComError = $('#ALM_TYPE_BTS9100S_XUHANG_ComError').val();
+ condition+=parseInt(XUHANG_ComError);
+ }
+ if($('#ALM_TYPE_BTS9100S_FADIAN_ComError').attr("checked")){
+ FADIAN_ComError = $('#ALM_TYPE_BTS9100S_FADIAN_ComError').val();
+ condition+=parseInt(FADIAN_ComError);
+ }
+ if($('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').attr("checked")){
+ DIAOZHAN = $('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').val();
+ condition+=parseInt(DIAOZHAN);
+ }
+ if($('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').attr("checked")){
+ DOOROPEN_ComError = $('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').val();
+ condition+=parseInt(DOOROPEN_ComError);
+ }
+ //condition = POFF_ComError+XUHANG_ComError+DIAOZHAN+DOOROPEN_ComError+FADIAN_ComError;
+ //console.info(condition);
+ return condition;
+ }
var myTimeOut;
//鏌ヨ鏈烘埧鐘舵��
- function searchstationstate(){
+ function searchstationstate(isLoad){
var temp = createSearchParam();
arrTd = new Array();
+ // 鏄惁娣诲姞绛夊緟
+ var load;
+ if(isLoad) {
+ load = layer.load(1);
+ }
$.ajax({
type: "post",
url: "Bts_station_stateAction_action_serchByCondition",
@@ -591,6 +677,7 @@
$('#total').text(Page.pageAll);
$('#current').text(Page.pageCurr+"/"+pageNum);
}
+ layer.close(load);
createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
window.clearTimeout(myTimeOut);
--
Gitblit v1.9.1