From 89cc717e3ccd49d49539b25d7a8554126504b51f Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 08:53:20 +0800
Subject: [PATCH] 电池配组记录区/县添加

---
 gx_tieta/WebRoot/control.jsp |  178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 173 insertions(+), 5 deletions(-)

diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 094ebad..24d373a 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -373,6 +373,158 @@
 					<th id="card_infor_left"><s:text name="Parameter_name"/></th>			<!-- 鍙傛暟鍚嶇О -->
 					<th><s:text name="Parameter_value"/></th>								<!-- 鍙傛暟鍊� -->
 				</tr>
+				<tr>
+					<td>绔欑偣ID</td>
+					<td id="station_stationid_ex"></td>
+				</tr>
+				<tr>
+					<td>绔欑偣鍚嶇О</td>
+					<td id="station_stationname"></td>
+				</tr>
+				<tr>
+					<td>鏈烘埧ID</td>
+					<td id="station_stationid"></td>
+				</tr>
+				<tr>
+					<td>鎵�灞炵粍缁�</td>
+					<td id="station_affiliation"></td>
+				</tr>
+				<tr>
+					<td>鏁版嵁鏉ユ簮</td>
+					<td id="station_dataSources"></td>
+				</tr>
+				<tr>
+					<td>绔欏潃绫诲瀷</td>
+					<td id="station_stationType"></td>
+				</tr>
+				<tr>
+					<td>缁忕含搴�</td>
+					<td id="station_jinweidu"></td>
+				</tr>
+				<tr>
+					<td>鎵�鍦ㄥ湴鍧�</td>
+					<td id="station_stationAddr"></td>
+				</tr>
+				<tr>
+					<td>绔欏潃鐘舵��</td>
+					<td id="station_stationstate"></td>
+				</tr>
+				<tr>
+					<td>缁存姢鍗曚綅</td>
+					<td id="station_maintenanceCompany"></td>
+				</tr>
+				<tr>
+					<td>绔欏潃鍦烘櫙</td>
+					<td id="station_stationscenario"></td>
+				</tr>
+				<tr>
+					<td>绔欏潃浜ф潈</td>
+					<td id="station_stationproperty"></td>
+				</tr>
+				<tr>
+					<td>浣跨敤鍗曚綅</td>
+					<td id="station_useUnit"></td>
+				</tr>
+				<tr>
+					<td>鐗╃悊绔欏潃缂栫爜</td>
+					<td id="station_siteCode"></td>
+				</tr>
+				<tr>
+					<td>鍘嗗彶鐗╃悊绔欏潃缂栫爜</td>
+					<td id="station_historySiteCode"></td>
+				</tr>
+				<tr>
+					<td>绔欏潃鍐呴儴缂栧彿</td>
+					<td id="station_siteInternalNumber"></td>
+				</tr>
+				<tr>
+					<td>绔欏潃鎷奸煶绠�绉�</td>
+					<td id="station_sitePinyinReferred"></td>
+				</tr>
+				<tr>
+					<td>涓枃绠�绉�</td>
+					<td id="station_siteChineseReferred"></td>
+				</tr>
+				<tr>
+					<td>鏄惁寮�閫氫笟鍔�</td>
+					<td id="station_isOpenBusiness"></td>
+				</tr>
+				<tr>
+					<td>褰曞叆浜哄憳</td>
+					<td id="station_schoolPersonnel"></td>
+				</tr>
+				<tr>
+					<td>褰曞叆鏃堕棿</td>
+					<td id="station_entryTime"></td>
+				</tr>
+				<tr>
+					<td>淇敼浜�</td>
+					<td id="station_modifyPeople"></td>
+				</tr>
+				<tr>
+					<td>淇敼鏃堕棿</td>
+					<td id="station_modifyTime"></td>
+				</tr>
+				<tr>
+					<td>澶囨敞</td>
+					<td id="station_note"></td>
+				</tr>
+				<tr>
+					<td>绔欏潃鎺ユ敹鏍囪鍙婃槸鍚︽湁鏁�</td>
+					<td id="station_receiveorvalidity"></td>
+				</tr>
+				<tr>
+					<td>绉诲姩绔欏潃鍚嶇О</td>
+					<td id="station_siteNameCMCC"></td>
+				</tr>
+				<tr>
+					<td>鐢典俊绔欏潃鍚嶇О</td>
+					<td id="station_siteNameCTC"></td>
+				</tr>
+				<tr>
+					<td>鑱旈�氱珯鍧�鍚嶇О</td>
+					<td id="station_siteNameCUCC"></td>
+				</tr>
+				<tr>
+					<td>鍝佺墝</td>
+					<td id="station_producer"></td>
+				</tr>
+				<tr>
+					<td>缁埅娴嬬畻鏃堕暱</td>
+					<td id="station_lastTimeLong"></td>
+				</tr>
+				<tr>
+					<td>缁埅娴嬬畻绫诲埆</td>
+					<td id="station_lastTimeType"></td>
+				</tr>
+				<tr>
+					<td>缁埅鍙戠敓鏃堕棿</td>
+					<td id="station_lastTimeDate"></td>
+				</tr>
+				<tr>
+					<td>鍏变韩鎯呭喌</td>
+					<td id="station_shareInfo"></td>
+				</tr>
+				<tr>
+					<td>杩愯惀鍟嗚喘涔板彂鐢垫湇鍔$姸鍐�</td>
+					<td id="station_electPower"></td>
+				</tr>
+				<tr>
+					<td>鏄惁鍏峰鍙戠數鏉′欢</td>
+					<td id="station_isCanElectPower"></td>
+				</tr>
+				<tr>
+					<td>涓婄珯璺▼</td>
+					<td id="station_upperStationRoute"></td>
+				</tr>
+				<tr>
+					<td>涓婄珯闅炬槗绋嬪害</td>
+					<td id="station_upperStationDifficult"></td>
+				</tr>
+				<tr>
+					<td>瀹㈡埛闂搴撴湭瀹屾垚钃勭數姹犵淮淇�</td>
+					<td id="station_clienteleErrorService"></td>
+				</tr>
 			</table>
 		</div>
 		<input type="button" name="" id="out_card_infor" value="<s:text name='Return'/>">
@@ -2744,8 +2896,9 @@
 				var batt = getBatt();
 				var province = batt.StationName1;
 				var city = batt.StationName2;
+				var county = batt.StationName5;
 				var home = batt.StationName;
-				$(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&home='+home);
+				$(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home);
 			});
 		});
 	
@@ -2780,6 +2933,7 @@
 								val:_data.BattGroupId,
 								province: _data.stationName1,
 								city: _data.stationName2,
+								county: _data.stationName5,
 								home: _data.stationName,
 								isCharge:0
 							});
@@ -2789,6 +2943,7 @@
 								val: _data.BattGroupId,
 								province: _data.stationName1,
 								city: _data.stationName2,
+								county: _data.stationName5,
 								home: _data.stationName,
 								isCharge:1
 							});
@@ -3959,6 +4114,7 @@
 			var second = GLOBAL.pages.siderbar.second;	// 浜岀骇瀵艰埅
 			var third = GLOBAL.pages.siderbar.third;	// 涓夌骇瀵艰埅
 			var fourth = GLOBAL.pages.siderbar.fourth;	// 鍥涚骇瀵艰埅
+			var fifth = GLOBAL.pages.siderbar.fifth;	// 浜旂骇瀵艰埅
 			var localSideBar = GLOBAL.pages.siderbar.localSideBar;	// 瀹氫綅鏈烘埧
 			var treeView = new TreeView($('#lside'));
 			$('#lside').width($('#ele_content').width());
@@ -3983,10 +4139,16 @@
 				second(treeView, $(this).parent(), province);
 			});
 			
-			// 甯�->鏈烘埧
+			// 甯�->鍘�
 			treeView.ele.on('click', '.city', function() {
 				var city = $(this).data('attr');
 				third(treeView, $(this).parent(), city);
+			});
+			
+			// 鍘�->鏈烘埧
+			treeView.ele.on('click', '.county', function() {
+				var county = $(this).data('attr');
+				fourth(treeView, $(this).parent(), county);
 			});
 			
 			battinlist = [];
@@ -3996,10 +4158,11 @@
 				var tmp = {
 					StationName1: home.StationName1,
 					StationName2: home.StationName2,
+					StationName5: home.StationName5,
 					StationName: home.StationName,
 					StationId: home.StationId
 				};
-				fourth(treeView, $(this).parent(), tmp);
+				fifth(treeView, $(this).parent(), tmp);
 			});
 			
 			// 鐢垫睜缁�
@@ -4086,11 +4249,13 @@
 				var tmp = {
 					province: batt.StationName1,
 					city: batt.StationName2,
+					county: batt.StationName5,
 					home: batt.StationName,
 					homeid: batt.StationId,
 					battid: batt.BattGroupId
 				};
 				findBattinfByBattGroupId(batt.BattGroupId);
+				findStationInfoByStation(batt);
 				// 鏍规嵁鏁版嵁瀹氫綅
 				localSideBar(treeView, treeView.container, tmp);
 			});
@@ -4128,11 +4293,12 @@
 				var tmp = {
 					province: battInfo.province,
 					city: battInfo.city,
+					county: battInfo.county,
 					home: battInfo.home,
 					homeid: battInfo.note,
 					battid: battInfo.val
 				};
-				
+				//console.log(tmp);
 				localSideBar(treeView, treeView.container, tmp);
 			});
 			
@@ -4152,7 +4318,8 @@
 			function findHome() {
 				var tmp = {
 					StationName1:'',
-					StationName2: ''
+					StationName2: '',
+					StationName5:''
 				};
 				
 				// 鏌ヨ灏嗕俊鎭�
@@ -4167,6 +4334,7 @@
 								label: _data.StationName+'('+_data.StationId+')',
 								province: _data.StationName1,
 								city: _data.StationName2,
+								county: _data.StationName5,
 								home: _data.StationName,
 								homeid: _data.StationId,
 								battid: undefined

--
Gitblit v1.9.1