From 67f23a8ce1da8e96f4620d3714afec70dd1afbae Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 08:53:40 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/endure.jsp | 257 ++++++++++++++++++++++++++++++--------------------
1 files changed, 154 insertions(+), 103 deletions(-)
diff --git a/gx_tieta/WebRoot/endure.jsp b/gx_tieta/WebRoot/endure.jsp
index 03208d3..d8724a1 100644
--- a/gx_tieta/WebRoot/endure.jsp
+++ b/gx_tieta/WebRoot/endure.jsp
@@ -8,19 +8,18 @@
<html>
<head>
<base href="<%=basePath%>">
-
- <title><s:text name="Batt_life_history_query"/></title> <!--鐢垫睜缁埅鑳藉姏鍘嗗彶鏌ヨ-->
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
- <link href="css/basic.css" rel="stylesheet">
- <link rel="stylesheet" href="css/BrdwMaint.css">
- <link rel="stylesheet" type="text/css" href="css/loading.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">
+ <title><s:text name="Batt_life_history_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 href="src/css/layui.css" type="text/css" rel="stylesheet">
<style type="text/css">
body {
overflow-x: hidden !important;
@@ -63,21 +62,25 @@
<form action="" id="search_form">
<table>
<tr class="fWeight">
- <td><s:text name="Maintenance_area"/></td> <!-- 缁存姢鍖� -->
+ <td>鐪�</td> <!-- 鐪� -->
+ <td>甯�</td> <!-- 甯� -->
+ <td>鍖�/鍘�</td> <!-- 鍖�/鍘� -->
<td><s:text name="Computer_name"/></td> <!-- 鏈烘埧鍚嶇О -->
<td><s:text name="Cruising_ability"/><s:text name="Type"/></td> <!-- 缁埅鑳藉姏绫诲瀷 -->
<td colspan="2"><s:text name="Battery_record_time"/></td> <!-- 鐢垫睜娴嬭瘯璁板綍鏃堕棿娈� -->
</tr>
<tr>
<td>
- <select id="station_name1">
-
- </select>
+ <select id="station_name1"></select>
</td>
<td>
- <select id="station_name">
-
- </select>
+ <select id="city"></select>
+ </td>
+ <td>
+ <select id="county"></select>
+ </td>
+ <td>
+ <select id="station_name"></select>
</td>
<td>
<select id="endu_type">
@@ -139,6 +142,7 @@
<div id="allShade"></div>
<script type="text/javascript" src="js/loading.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">
var Page={
pageCurr:1,
@@ -278,7 +282,10 @@
});
}
- $(document).ready(function(){
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ filterLoad = layer.load();
+ $(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -301,104 +308,146 @@
}else{
$("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
}
- findStationNamebyStationname1();
+ findCity();
});
});
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
- $('#station_name1').change(function(){
- findStationNamebyStationname1();
- });
-
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
+ // 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+ function findCity(isLoad) {
+ var data = {
+ StationName1: $("#station_name1").val()
};
- //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){
- 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]);
- $option.attr("value",data.data[i]);
- }
- $select.append($option);
+
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.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);
+ 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(),
+ };
+ // 鏄惁娣诲姞绛夊緟
+ 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);
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else{
+ $select.text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
- }else{
- $("#station_name").text('').html('<option>鏆傛棤绠＄悊鐨勬満鎴跨珯鐐�</option>');
+ findStationNamebyStationname1();
}
- ///findserchByBattGroupNamebystationname();
});
}
-
- /* //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("BattInfAction_serchByStation",null,function(data){
- data=data.result;
- data=eval("("+data+")");
- //console.info(data);
- if(data.code==1 && data.data.length>0){
- var $select=$("#station_name1");
- $select.text("");
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1].StationName1);
- $option.attr("value",data.data[i-1].StationName1);
- }
- $select.append($option);
- }
- }
- findStationNamebyStationname1();
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
+ $('#station_name1').change(function(){
+ findCity(true);
});
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
- $('#station_name1').change(function(){
- findStationNamebyStationname1();
+ $('#city').change(function(){
+ findCounty(true);
});
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- //var stationid = getQueryString("stationId");
- var selectvalue=$("#station_name1 option:selected").val();
- //alert(selectvalue);
- $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
- 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.sum+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1].StationName);
- $option.attr("value",data.data[i-1].StationName);
-
- }
- $select.append($option);
- }
- }
- });
- } */
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#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 selectvalue=$("#station_name1 option:selected").val();
+ //alert(selectvalue);
+ $.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");
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ 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);
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else{
+ $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+ }
+
+ layer.close(filterLoad);
+ });
+ }
//鏋勯�犳煡璇㈡潯浠�
function createSearchParam(){
@@ -407,6 +456,8 @@
num:3, //鐢垫睜鐘舵��
BattGroupId:$("#endu_type").val(), //鏌ヨ鏁版嵁
StationName:$('#station_name').val(), //鏈烘埧鍚�
+ StationName5:$('#county').val(), // 鍖�/鍘�
+ StationName2:$('#city').val(), //甯�
StationName1:$('#station_name1').val(), //缁存姢鍖�
BattProductDate:$('#starttime').val()+" 00:00:00",
BattProductDate1:$('#endtime').val()+" 23:59:59", //鐢熶骇鏃ユ湡娈�
@@ -418,8 +469,6 @@
var formjson;
//鏌ヨ鐢垫睜缁勭殑鍘嗗彶缁埅鑳藉姏
function searchBattLife(){
- loading.showLoading();
-
var jsontemp = $('#search_form').serialize();
if(formjson != jsontemp){
Page.pageCurr = 1;
@@ -427,7 +476,9 @@
}
var temp = createSearchParam();
- arrTd = new Array();
+ arrTd = new Array();
+ var load = layer.load(1);
+
$.ajax({
type: "post",
url: "Batttestdata_infAction!serchBattLife",
@@ -454,10 +505,10 @@
$('#total').text(Page.pageAll);
createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
- loading.hideLoading();
+ layer.close(load);
},
error:function(){
- loading.hideLoading();
+ layer.close(load);
noContent.showNoContent("鏌ヨ澶辫触,璇锋鏌ョ綉缁滆繛鎺ワ紒");
}
});
--
Gitblit v1.9.1