From 11cd3824e96bbe5644b0d0720dc4260f341468c2 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 23:04:16 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/taskplan.jsp | 360 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 231 insertions(+), 129 deletions(-)
diff --git a/gx_tieta/WebRoot/taskplan.jsp b/gx_tieta/WebRoot/taskplan.jsp
index c510543..7714037 100644
--- a/gx_tieta/WebRoot/taskplan.jsp
+++ b/gx_tieta/WebRoot/taskplan.jsp
@@ -19,6 +19,7 @@
<!-- 瀵煎叆椤甸潰鐗瑰畾鏍峰紡 -->
<link rel="stylesheet" type="text/css" href="css/taskplan_layout.css">
<link rel="stylesheet" type="text/css" href="css/query.css">
+<link href="src/css/layui.css" type="text/css" rel="stylesheet">
<!-- 瀵煎叆Jquery -->
</head>
<body>
@@ -34,50 +35,53 @@
<span class="summary"><s:text name="Behind_monomer"/><s:text name="Search"/>--><s:text name="Show/hide_the_query_conditions"/></span>
<div class="checkCon">
<form action="" id="search_form">
- <!-- 缁存姢鍖轰俊鎭� -->
- <table>
- <tr class="fWeight">
- <td>璁惧绫诲瀷</td>
- <td><s:text name="Maintenance_area"/></td> <!-- 缁存姢鍖� -->
- <td><s:text name="Computer_site"/></td> <!-- 鏈烘埧绔欑偣(鎴栨満鎴胯澶�)-->
- <td><s:text name="Battery"/></td> <!-- 钃勭數姹犵粍 -->
- <td style="display:none;" colspan="2"><s:text name="Battery_installation_period"/></td> <!-- 鐢垫睜瀹夎鏃堕棿娈�-->
- <td colspan="2"><s:text name='Record'/><s:text name="Time"/></td> <!-- 鏀剧數鏃堕棿 -->
- <td style="display:none;"><s:text name="Battery_brand"/>鐢垫睜鍝佺墝</td>
- </tr>
- <tr>
- <td>
- <select id="dev_type" name="dev_type">
- <option value="1">FBS/BTS璁惧</option>
- <option value="2">LD9璁惧</option>
- </select>
- </td>
- <td>
- <select id="station_name1" name="station_name1">
-
- </select>
- </td>
- <td>
- <select id="station_name" name="station_name">
-
- </select>
- </td>
- <td>
- <select id="battgroup_name" name="battgroup_name">
- </select>
- </td>
- <td style="display:none;"><input type="text" id="startinusedate" name="startinusedate" value="1970-1-1" readonly="readonly" onfocus="new Calendar().show(this)"></td>
- <td style="display:none;"><input type="text" id="endinusedate" name="endinusedate" readonly="readonly" onfocus="new Calendar().show(this)"></td>
-
- <td><input type="text" id="startdischargedate" name="startdischargedate" value="1970-1-1" readonly="readonly" onfocus="new Calendar().show(this)"></td>
- <td><input type="text" id="enddischargedate" name="enddischargedate" readonly="readonly" onfocus="new Calendar().show(this)"></td>
- <td style="display:none;">
- <select id="producer" name="producer">
-
- </select>
- </td>
- </tr>
- </table>
+ <!-- 缁存姢鍖轰俊鎭� -->
+ <table>
+ <tr class="fWeight">
+ <td>璁惧绫诲瀷</td>
+ <td>鐪�</td> <!-- 鐪� -->
+ <td>甯�</td> <!-- 甯� -->
+ <td>鍖�/鍘�</td> <!-- 鍖�/鍘� -->
+ <td><s:text name="Computer_site"/></td> <!-- 鏈烘埧绔欑偣(鎴栨満鎴胯澶�)-->
+ <td><s:text name="Battery"/></td> <!-- 钃勭數姹犵粍 -->
+ <td style="display:none;" colspan="2"><s:text name="Battery_installation_period"/></td> <!-- 鐢垫睜瀹夎鏃堕棿娈�-->
+ <td colspan="2"><s:text name='Record'/><s:text name="Time"/></td> <!-- 鏀剧數鏃堕棿 -->
+ <td style="display:none;"><s:text name="Battery_brand"/>鐢垫睜鍝佺墝</td>
+ </tr>
+ <tr>
+ <td>
+ <select id="dev_type" name="dev_type">
+ <option value="1">FBS/BTS璁惧</option>
+ <option value="2">LD9璁惧</option>
+ </select>
+ </td>
+ <td>
+ <select id="station_name1" name="station_name1"></select>
+ </td>
+ <td>
+ <select id="city" name="station_name2"></select>
+ </td>
+ <td>
+ <select id="county" name="county"></select>
+ </td>
+ <td>
+ <select id="station_name" name="station_name"></select>
+ </td>
+ <td>
+ <select id="battgroup_name" name="battgroup_name"></select>
+ </td>
+ <td style="display:none;"><input type="text" id="startinusedate" name="startinusedate" value="1970-1-1" readonly="readonly" onfocus="new Calendar().show(this)"></td>
+ <td style="display:none;"><input type="text" id="endinusedate" name="endinusedate" readonly="readonly" onfocus="new Calendar().show(this)"></td>
+
+ <td><input type="text" id="startdischargedate" name="startdischargedate" value="1970-1-1" readonly="readonly" onfocus="new Calendar().show(this)"></td>
+ <td><input type="text" id="enddischargedate" name="enddischargedate" readonly="readonly" onfocus="new Calendar().show(this)"></td>
+ <td style="display:none;">
+ <select id="producer" name="producer">
+
+ </select>
+ </td>
+ </tr>
+ </table>
</form>
</div>
</div>
@@ -130,6 +134,7 @@
<div class="clear"></div>
</body>
<script type="text/javascript" src="js/createTab.js"></script>
+<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var Page = {
pageSize:10, //姣忛〉鐨勮鏁�
@@ -339,7 +344,7 @@
Page.pageCurr = 1;
formjson = temp;
}
- loading.showLoading();
+ var load = layer.load(1);
var json = window.JSON.stringify(temp);
arrTd = new Array();
$.ajax({
@@ -351,7 +356,7 @@
success: function(data){
data = eval('('+data+')');
var model = eval('('+data.result+')');
- //console.info(model);
+ console.info(model);
if(model.code == 1){
for(var i = 0;i < model.data.length;i++){
//console.info(model.data.length);
@@ -380,7 +385,7 @@
$('#page_num').val(Page.pageCurr);
//console.info(arrTd);
changeTblByStatus();
- loading.hideLoading();
+ layer.close(load);
},
error:function(a){
//console.info(a);
@@ -448,7 +453,12 @@
});
}
+ 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;
@@ -465,130 +475,220 @@
}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);
}
}else{
$("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
}
- findStationNamebyStationname1();
+ findCity();
});
});
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ // 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+ function findCity(isLoad) {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ var pre_city = getQueryString("city");
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ var $select = $("#city");
+ if(rs.code == 1) {
+ var _data= rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ 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);
+ }
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else {
+ $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+ }
+ findCounty();
+ }
+ });
+ }
+
+ // 鏌ヨ鍖�/鍘�
+ function findCounty(isLoad) {
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ };
+ var pre_county = getQueryString("county");
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ // 鏌ヨ鍖哄幙
+ $.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(){
- findStationNamebyStationname1();
+ findCity(true);
});
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
+ findCounty(true);
+ });
+
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
+ findStationNamebyStationname1(true);
+ });
+
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
+ function findStationNamebyStationname1(isLoad){
+ var tmp = {
+ StationName1:$("#station_name1").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("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+ var rs = JSON.parse(data.result);
+ if(rs.code==1){
+ var _data = rs.data;
var $select = $("#station_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- var $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
- }
- $select.append($option);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ if(pre_home == __data.StationName && isNewLoad){
+ tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr,{},true);
+ }
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
}else{
- $("#station_name").text('').html('<option>鏆傛棤绠＄悊鐨勬満鎴跨珯鐐�</option>');
+ $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
+ isNewLoad = false;
findserchByBattGroupNamebystationname();
});
}
+ // 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
$('#station_name').change(function(){
- findserchByBattGroupNamebystationname();
+ findserchByBattGroupNamebystationname(true);
});
- //鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
- var user = {
- UNote:$("#station_name1 option:selected").val(),
- UName:$("#station_name option:selected").val()
+ //鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍
+ function findserchByBattGroupNamebystationname(isLoad){
+ var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val(),
+ StationName: $("#station_name").val(),
+ StationId: stationid
};
-
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
//var station_name1=$("#station_name1 option:selected").val();
//var station_name=$("#station_name option:selected").val();
- $.post("User_battgroup_baojigroup_battgroupAction!serchBattgroupidInGroup","json="+JSON.stringify(user),function(data){
+ $.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
data=data.result;
//console.info(data);
data=eval("("+data+")");
//console.info(data);
if(data.code==1 && data.data.length>0){
var $select = $("#battgroup_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i!=0){
- $option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
- $option.attr("value",data.data[i-1].BattGroupId);
- $option.attr("stationname",data.data[i-1].StationName);
- }else{
- $option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>锛�");
- $option.attr("value", "0");
- }
- $select.append($option);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<data.data.length;i++){
+ var _data = data.data[i];
+ var _attr = {
+ stationname: _data.StationName,
+ dev_id: _data.FBSDeviceId,
+ batt_num: _data.GroupIndexInFBSDevice+1
+ };
+ var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>";
+ var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr);
+ optsList.push(tmp);
}
- searchBattMonLow();
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ $select.find('option').eq(0).val(0);
}else{
- $("#battgroup_name").text('').html('<option>鏆傛棤绠＄悊鐨勮搫鐢垫睜缁�</option>');
+ $("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
+ searchBadBatt();
+ layer.close(filterLoad);
});
}
- //鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
- /* function findserchByBattGroupNamebystationname(){
- var station_name1=$("#station_name1 option:selected").val();
- var station_name=$("#station_name option:selected").val();
- if(station_name.length == 0){
- var $select = $("#battgroup_name");
- $select.text("");
- var $option=$("<option></option>");
- $option.html("<s:text name='All'/>");
- $option.attr("value", "0");
- $select.append($option);
- searchBattMonLow();
- }else{
- $.post("BattInfAction_serchByBattGroupName","bif.StationName1="+station_name1+"&bif.StationName="+station_name,function(data){
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
-
- var $select = $("#battgroup_name");
- $select.text("");
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i!=0){
- $option.html(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
- $option.attr("value",data.data[i-1].BattGroupId);
- }else{
- $option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�");
- $option.attr("value", "0");
- }
- $select.append($option);
- }
- searchBattMonLow();
- }
- });
- }
- } */
//鏌ヨ鐢垫睜鍝佺墝
$.post("BattInfAction_serchByBattProducer",null,function(data){
@@ -617,7 +717,9 @@
var temp = {
binf:{
StationName:$('#station_name').val(),
+ StationName2:$('#city').val(),
StationName1:$('#station_name1').val(),
+ StationName5:$('#county').val(),
BattGroupId:$('#battgroup_name').val(),
BattProducer:$('#producer').val(),
BattInUseDate:$('#startinusedate').val()+" 00:00:00",
--
Gitblit v1.9.1