From 196a672da9a0ae25cf8749b7b3b407396d55bab0 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期五, 18 一月 2019 16:41:55 +0800
Subject: [PATCH] 添加电池组连接信息查询页面以及添加国际化信息
---
gx_tieta/src/global_zh_CN.properties | 5 ++++-
gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties | 5 ++++-
gx_tieta/WebRoot/bts-comm-mon.jsp | 14 ++++++++++----
3 files changed, 18 insertions(+), 6 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 656ac19..128f98e 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
+++ b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
@@ -1124,4 +1124,7 @@
Batch_batt_param_set = \u6279\u91cf\u7535\u6c60\u53c2\u6570\u8bbe\u7f6e
################## sys-set-test.jsp ##############################
-Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e
\ No newline at end of file
+Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e
+
+################## bts-comm-mon.jsp #########################
+Batt_conn_info_query = \u7535\u6c60\u7ec4\u8fde\u63a5\u4fe1\u606f\u67e5\u8be2
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/bts-comm-mon.jsp b/gx_tieta/WebRoot/bts-comm-mon.jsp
index bfb5580..eb17c30 100644
--- a/gx_tieta/WebRoot/bts-comm-mon.jsp
+++ b/gx_tieta/WebRoot/bts-comm-mon.jsp
@@ -15,7 +15,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>鐢垫睜娉ㄥ唽淇℃伅鏌ヨ</title>
+ <title><s:text name="Batt_conn_info_query"/></title> <!-- 鐢垫睜缁勮繛鎺ヤ俊鎭煡璇� -->
<link rel="stylesheet" type="text/css" href="pages/css/base.css">
<link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="src/css/layui.css">
@@ -105,9 +105,12 @@
,cols: [[
{field: 'Staionanme', title: '鏈烘埧鍚嶇О', align: 'center', width: 450}
,{field:'dev_id', title:'璁惧id', align:'center', width: 260}
- ,{field:'battgroup_id', title:'鐢垫睜缁刬d', align:'center', width: 260}
- ,{field:'battgroup_index', title:'鐢垫睜缁勭储寮�', align:'center', width: 260}
- ,{field:'battgroup_mon_cnt', title:'鐢垫睜缁勫崟浣撲釜鏁�', align:'center', width: 260}
+ ,{field:'battgroup_id', title:'鐢垫睜缁刬d', align:'center', width: 200}
+ ,{field:'battgroup_index', title:'鐢垫睜缁勭储寮�', align:'center', width: 200}
+ ,{field:'battgroup_mon_cnt', title:'鐢垫睜缁勫崟浣撲釜鏁�', align:'center', width: 200}
+ ,{field:'battgroup_float_vol', title:'娴厖鐢靛帇', align:'center', width: 200}
+ ,{field:'battgroup_float_curr', title:'娴厖鐢垫祦', align:'center', width: 200}
+ ,{field:'battgroup_register_code', title:'娉ㄥ唽鐮�', align:'center', width: 200}
]]
,data:[]
@@ -151,6 +154,9 @@
_tmp.battgroup_id = _data.battgroup_id;
_tmp.battgroup_index = _data.battgroup_index;
_tmp.battgroup_mon_cnt = _data.battgroup_mon_cnt;
+ _tmp.battgroup_float_vol = _data.battgroup_float_vol;
+ _tmp.battgroup_float_curr = _data.battgroup_float_curr;
+ _tmp.battgroup_register_code = _data.battgroup_register_code;
arr_td.push(_tmp);
Page.setAll(_data.num);
diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index 656ac19..128f98e 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1124,4 +1124,7 @@
Batch_batt_param_set = \u6279\u91cf\u7535\u6c60\u53c2\u6570\u8bbe\u7f6e
################## sys-set-test.jsp ##############################
-Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e
\ No newline at end of file
+Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e
+
+################## bts-comm-mon.jsp #########################
+Batt_conn_info_query = \u7535\u6c60\u7ec4\u8fde\u63a5\u4fe1\u606f\u67e5\u8be2
\ No newline at end of file
--
Gitblit v1.9.1