From d11cadaa677d5c117f6e17dcd4d81fc93348e14f Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期二, 13 十一月 2018 13:19:15 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/index.jsp             |    8 +++++++-
 gx_tieta/src/global_zh_CN.properties   |   11 +++++++++--
 gx_tieta/WebRoot/batt-state-manage.jsp |    4 ++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index a246567..f69f7dc 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -16,7 +16,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><s:text name="Station_statequery"/></title>				<!-- 鏈烘埧鐘舵�佹煡璇� -->
+    <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">
@@ -82,7 +82,7 @@
 	    <!-- 涓讳綋鍐呭 -->
         <div id="main">
             <div id="eleInfor">
-                <span class="summary"><s:text name="Station_statequery"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></span>
+                <span class="summary"><s:text name="Station_real_status_query"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></span>
                 <div class="checkCon filter-container">
                 	<form action="" id="search_form">
                     <!-- 缁存姢鍖轰俊鎭� -->
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index a92b69e..3f21744 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -401,6 +401,7 @@
 	<script type="text/javascript" src="js/myConfirm.js"></script>
 	<script type="text/javascript" src="js/loading.js"></script>
 	<script type="text/javascript" src="src/layui.js"></script>
+	<script type="text/javascript" src="src/layui.all.js"></script>
 	<script type="text/javascript">
 	var permits;
 	<%	Object obj=session.getAttribute("permits");
@@ -2466,11 +2467,12 @@
 					var content = '<div style="padding:6px;"><span>钃勭數姹犵粍鍛婅鏁扮洰锛�</span>'+data.code+'<a style="margin-left: 14px" href="javascript:loadToWarnPage();">璇︽儏>></a></div>'+
 							'<div style="padding:6px;"><span>钃勭數姹犵粍钀藉悗鏁扮洰锛�</span>'+data.sum+'<a style="margin-left: 14px" href="javascript:loadToBehindPage();">璇︽儏>></a></div>'+
 							'<div style="padding:6px;"><span>钃勭數姹犵粍寤舵椂鏁扮洰锛�</span>'+data.newsum+'<a style="margin-left: 14px" href="javascript:loadToDischargeDelay();">璇︽儏>></a></div>'+
-							'<div style="padding:6px"><a href="javascript:loadToRealTime();">瀹炴椂鏁版嵁</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">鍘嗗彶鏁版嵁</a></div>'+
+							'<div style="padding:6px"><a href="javascript:loadToRealTime();">瀹炴椂鏁版嵁</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">鍘嗗彶鏁版嵁</a><a style="margin-left: 20px" href="javascript:showHomeInfo();">鍩虹珯淇℃伅</a></div>'+
 							'<div style="padding:6px;"><span>鍦板潃锛�</span>'+data.data.Address+'</div>'+
 							'<input type="hidden" class="ipt-hide home" value="'+data.data.StationName+'">'+
 							'<input type="hidden" class="ipt-hide province" value="'+data.data.stationName1+'">'+
 							'<input type="hidden" class="ipt-hide county" value="'+data.data.stationName5+'">'+							
+							'<input type="hidden" class="ipt-hide sid" value="'+data.data.StationId+'">'+
 							'<input type="hidden" class="ipt-hide city" value="'+data.data.stationName2+'">';
 					
 					var list = {
@@ -3741,5 +3743,9 @@
 		
 		$( "#mapToolSearch" ).autocomplete('option', 'source', homeSource);
 	}
+	// 鏄剧ず鏈烘埧淇℃伅
+	function showHomeInfo() {
+		layer.msg('鍔熻兘寮�鍙戜腑...');
+	}
 	</script> 
 </html>
diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index 0958021..45a1e7b 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1089,11 +1089,14 @@
 ##################  set-match-group.jsp  \u7535\u6c60\u7ec4\u914d\u7ec4\u8bb0\u5f55	#################################
 Batt_makegrouprecord = \u7535\u6c60\u7ec4\u914d\u7ec4\u8bb0\u5f55
 
-##################   batt-state-mange.jsp \u673a\u623f\u72b6\u6001\u67e5\u8be2   ###########################
+##################   batt-state-mange.jsp \u673a\u623f\u5b9e\u65f6\u72b6\u6001\u67e5\u8be2   ###########################
 Station_statequery = \u673a\u623f\u72b6\u6001\u67e5\u8be2
+Station_real_status_query=\u673a\u623f\u5b9e\u65f6\u72b6\u6001\u67e5\u8be2
 
 ##################  batt-state-statistical.jsp  \u673a\u623f\u72b6\u6001\u7edf\u8ba1	#############################
 Station_statestatistical = \u673a\u623f\u72b6\u6001\u7edf\u8ba1\u67e5\u8be2
+
+Station_histor_events_query = \u673a\u623f\u5386\u53f2\u4e8b\u4ef6\u67e5\u8be2
 
 
 ##################  batt-fault-manage.jsp  ##############################
@@ -1101,4 +1104,8 @@
 Station_problem_record = \u673a\u623f\u95ee\u9898\u8bb0\u5f55
 
 ##################  batt-traffic-statistics1.jsp  ##############################
-Station_traffic_statist = \u673a\u623f\u6d41\u91cf\u7edf\u8ba1\u67e5\u8be2
\ No newline at end of file
+Station_traffic_statist = \u673a\u623f\u6d41\u91cf\u7edf\u8ba1\u67e5\u8be2
+Device_traffic_query = \u8bbe\u5907\u6d41\u91cf\u67e5\u8be2
+
+
+Batt_data_analysis = \u7535\u6c60\u6570\u636e\u5206\u6790
\ No newline at end of file

--
Gitblit v1.9.1