From 01354002e003c422d963c861f7260ccaeab4f0dc Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 11:21:14 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-state-manage.jsp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 1ec4c49..7434bbe 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -10,7 +10,7 @@
<head>
<base href="<%=basePath%>">
- <title>鍩虹珯鐘舵�佺鐞�</title> <!-- 鍩虹珯鐘舵�佺鐞� -->
+ <title><s:text name="Station_statequery"/></title> <!-- 鏈烘埧鐘舵�佹煡璇� -->
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="css/basic.css" rel="stylesheet">
@@ -83,7 +83,7 @@
<!-- 涓讳綋鍐呭 -->
<div id="main">
<div id="eleInfor">
- <span class="summary">鍩虹珯鐘舵�佺鐞嗘煡璇�--><s:text name="Show/hide_the_query_conditions"/></span>
+ <span class="summary"><s:text name="Station_statequery"/>--><s:text name="Show/hide_the_query_conditions"/></span>
<div class="checkCon filter-container">
<form action="" id="search_form">
<!-- 缁存姢鍖轰俊鎭� -->
@@ -462,7 +462,7 @@
StationId: stationid?stationid:0,
BattGroupNum:battgroupid,
};
- console.info(temp);
+ //console.info(temp);
return temp;
}
function batt_condition(){
--
Gitblit v1.9.1