From 2b2f80d07c341860e149bc6be8127c70e4d2e15e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 08 一月 2019 10:09:44 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/equip-stats-change.jsp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/equip-stats-change.jsp b/gx_tieta/WebRoot/equip-stats-change.jsp
index 0f8d2ce..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>
@@ -239,7 +239,7 @@
var _data = model.data[i];
arrTd.push(_data.dev_id); //璁惧id
arrTd.push(_data.note); //鏈烘埧鍚嶇О
- arrTd.push(_data.eve_type_name); //鍙樿縼鍓嶄簨浠剁被鍨�
+ arrTd.push(_data.eve_type_name); //鍙樿縼鍓嶄簨浠剁被鍨�
arrTd.push(_data.last_stat_name); //鍙樻崲鍓嶇姸鎬�
arrTd.push(_data.now_stat_name); //鍙樺寲鍚庣姸鎬�
arrTd.push(_data.state_change_reason_name); //鍙樻崲鍘熷洜
--
Gitblit v1.9.1