From 03ea4913cc48bb1d7db39396f15da44d17022453 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期四, 01 十一月 2018 11:37:22 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-state-statistical.jsp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index d399e94..cb2e315 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -10,7 +10,7 @@
<!-- 榛樿浣跨敤鏈�楂樺唴鏍� -->
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" >
<base href="<%=basePath%>">
- <title>鐢垫睜缁勭姸鎬佺粺璁＄鐞�</title>
+ <title><s:text name="Station_statestatistical"/></title> <!-- 鏈烘埧鐘舵�佺粺璁℃煡璇� -->
<link rel="stylesheet" href="css/basic.css">
<link rel="stylesheet" type="text/css" href="css/nocontent.css">
<link rel="stylesheet" type="text/css" href="css/loading.css">
@@ -36,7 +36,7 @@
<!--瀵艰埅寮�濮�-->
<jsp:include page="nav.jsp" flush="true"/>
<div class="filter-container">
- <div class="filter-title"><a href="javascript:;">鍩虹珯鐘舵�佺粺璁℃煡璇�--><s:text name="Show/hide_the_query_conditions"/></a></div>
+ <div class="filter-title"><a href="javascript:;"><s:text name="Station_statestatistical"/>--><s:text name="Show/hide_the_query_conditions"/></a></div>
<div class="filter-content">
<table>
<tbody>
--
Gitblit v1.9.1