From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改

---
 gx_tieta/WebRoot/batt-traffic-statistics1.jsp |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-traffic-statistics1.jsp b/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
index df51077..b814785 100644
--- a/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
+++ b/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
@@ -15,7 +15,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>鏈烘埧娴侀噺缁熻鏌ヨ</title>				<!--娴侀噺缁熻-->
+	    <title>璁惧娴侀噺缁熻鏌ヨ</title>				<!--璁惧娴侀噺缁熻鏌ヨ-->
 		<link rel="stylesheet" type="text/css" href="pages/css/base.css">
 		<link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">
 	    <link rel="stylesheet" type="text/css" href="src/css/layui.css">
@@ -41,7 +41,7 @@
         <div class="layui-page-container">
         	<!-- 鏉′欢绛涢�� -->
             <div class="layui-page-filter">
-                <div class="page-filter-header layui-page-filter-fweight">鏈烘埧娴侀噺缁熻鏌ヨ</div>
+                <div class="page-filter-header layui-page-filter-fweight">璁惧娴侀噺缁熻鏌ヨ</div>
                 <div class="page-filter-content">
                     <table>
                         <tr class="layui-page-filter-tbl-header layui-page-filter-fweight">
@@ -210,6 +210,9 @@
 				});
 				
 				
+				var isNewLoad = true;
+				
+				var pre_province = getQueryString('province');
 				// 鏌ヨ鐪佷笅鎷夋
 				searchProvince();
 				// 鏌ヨ鐪�
@@ -232,6 +235,9 @@
 								for(var i=0; i<data.length; i++) {
 									var _data = data[i];
 									var _tmp = getLayuiSelect(_data, _data, {}, {});
+									if(pre_province == _data && isNewLoad){
+										_tmp = getLayuiSelect(_data, _data, {}, {},true);
+									}
 									list.push(_tmp);
 								}
 							}else {
@@ -260,6 +266,7 @@
 					var tmp = {
 						StationName1: $("#province").val()
 					};
+					var pre_city = getQueryString('city');
 					// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
 					$.ajax({
 						type: 'post',
@@ -278,6 +285,9 @@
 								for(var i=0; i<data.length; i++) {
 									var _data = data[i];
 									var _tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data);
+									if(pre_city == _data.StationName2 && isNewLoad){
+										_tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data,true);
+									}
 									list.push(_tmp);
 								}
 							}else {
@@ -312,6 +322,7 @@
 					if(isLoad) {
 						filterLoad = layer.load();
 					}
+					var pre_county = getQueryString('county');
 					// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
 					$.ajax({
 						type: 'post',
@@ -331,6 +342,9 @@
 								for(var i=0; i<data.length; i++) {
 									var _data = data[i];
 									var _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data);
+									if(pre_county ==  _data.StationName5 && isNewLoad){
+										_tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data,true);
+									}
 									//console.info(_tmp);
 									list.push(_tmp);
 								}
@@ -362,6 +376,8 @@
 						StationName2:$("#city").val(),
 						StationName5:$("#county").val(),
 					};
+					var pre_home = getQueryString('home');
+					var auto_seach = false;
 					// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
 					$.ajax({
 						type: 'post',
@@ -384,15 +400,23 @@
 										dev_id: _data.FBSDeviceId
 									};
 									var _tmp = getLayuiSelect(_data.StationName, _data.StationName3, _attr, _data);
+									if(pre_home == _data.StationName && isNewLoad){
+										_tmp = getLayuiSelect(_data.StationName, _data.StationName3, _attr, _data,true);
+										auto_seach = true;
+									}
 									list.push(_tmp);
 								}
 							}else {
 								list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined));
 							}
-							
 							// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
 							createLayuiSelect(ele, list);
 							form.render('select', 'homeFilter');
+							if(auto_seach){
+								var temp = createSearchForm();
+								sTblData(temp);
+							}
+							isNewLoad = false;
 							
 						}
 					});
@@ -457,7 +481,7 @@
 							layer.close(loading);
 							// 瑙f瀽鑾峰彇鐨刯son
 							var rs = JSON.parse(result.result);
-							console.info(rs);
+							//console.info(rs);
 							// 鍒濆鍖栨暟鎹粨鏋�
 							tOptions.data = [];
 							if(rs.code == 1) {
@@ -569,7 +593,7 @@
 				
 				// 鑾峰彇鐢熸垚鎶樼嚎鍥剧殑閰嶇疆椤�
 				function getlineGraphOpts(data, type) {
-					console.log(data);
+					//console.log(data);
 					var rs = {
 						xdata:[],
 						sdata: [],
@@ -592,7 +616,7 @@
 							rs.unit = "M";
 						break;
 					}
-					console.log(rs);
+					//console.log(rs);
 					return rs;
 				}
         	});

--
Gitblit v1.9.1