From d6f9a70d695ebe43eca2be363ceda30643450526 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 05 一月 2019 11:42:45 +0800
Subject: [PATCH] 修改设备状态记录查询的title并且改城设备历史事件查询，并添加到国际化文件中
---
gx_tieta/src/global_zh_CN.properties | 1 +
gx_tieta/WebRoot/zzlogin1.jsp | 5 +++++
gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties | 1 +
gx_tieta/WebRoot/equip-stats-change.jsp | 4 ++--
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
index 26138e4..eb58994 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
+++ b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
@@ -1038,6 +1038,7 @@
################## equip-stats-change.jsp ##################
Device_status_records_query = \u8bbe\u5907\u72b6\u6001\u8bb0\u5f55\u67e5\u8be2
+Device_history_event_query = \u8bbe\u5907\u5386\u53f2\u4e8b\u4ef6\u67e5\u8be2
################### batt-attention.jsp #######################
Batt_attention_manage=\u7535\u6c60\u5173\u6ce8\u7ba1\u7406
diff --git a/gx_tieta/WebRoot/equip-stats-change.jsp b/gx_tieta/WebRoot/equip-stats-change.jsp
index 0b352e0..fb1685b 100644
--- a/gx_tieta/WebRoot/equip-stats-change.jsp
+++ b/gx_tieta/WebRoot/equip-stats-change.jsp
@@ -10,7 +10,7 @@
<!-- 榛樿浣跨敤鏈�楂樺唴鏍� -->
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" >
<base href="<%=basePath%>">
- <title><s:text name="Device_status_records_query"/></title> <!-- 璁惧鐘舵�佽褰曟煡璇� -->
+ <title><s:text name="Device_history_event_query"/></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">
@@ -50,7 +50,7 @@
<div class="data-container">
<!-- 绛涢�夋潯浠� -->
<div class="filter-container">
- <div class="filter-title"><a href="javascript:changeFilterStats();"><s:text name="Device_status_records_query"/>--><s:text name="Show/hide_the_query_conditions"/></a></div> <!-- 鏄剧ず鎴栭殣钘忔煡璇㈡潯浠� -->
+ <div class="filter-title"><a href="javascript:changeFilterStats();"><s:text name="Device_history_event_query"/>--><s:text name="Show/hide_the_query_conditions"/></a></div> <!-- 鏄剧ず鎴栭殣钘忔煡璇㈡潯浠� -->
<div class="filter-content">
<table>
<tbody>
diff --git a/gx_tieta/WebRoot/zzlogin1.jsp b/gx_tieta/WebRoot/zzlogin1.jsp
index e06c62f..3572c01 100644
--- a/gx_tieta/WebRoot/zzlogin1.jsp
+++ b/gx_tieta/WebRoot/zzlogin1.jsp
@@ -5,6 +5,11 @@
%>
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%
+ ServletContext context = getServletContext();
+ String serverInfo = context.getServerInfo();
+ System.out.println(serverInfo);
+ %>
<!DOCTYPE HTML123>
<html>
<head>
diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index 26138e4..eb58994 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1038,6 +1038,7 @@
################## equip-stats-change.jsp ##################
Device_status_records_query = \u8bbe\u5907\u72b6\u6001\u8bb0\u5f55\u67e5\u8be2
+Device_history_event_query = \u8bbe\u5907\u5386\u53f2\u4e8b\u4ef6\u67e5\u8be2
################### batt-attention.jsp #######################
Batt_attention_manage=\u7535\u6c60\u5173\u6ce8\u7ba1\u7406
--
Gitblit v1.9.1