From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/bts-comm-mon.jsp | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/bts-comm-mon.jsp b/gx_tieta/WebRoot/bts-comm-mon.jsp
index 0b190c9..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:[]
@@ -124,7 +127,7 @@
//console.log(Page);
// 鏌ヨ鍚庡彴鏁版嵁
- /* search(createSearchParam(), true);
+ search(createSearchParam(), true);
function search(temp, newLoad) {
var load;
if(newLoad) {
@@ -134,12 +137,12 @@
$.ajax({
type:'post',
async:true,
- url: 'App_bts_comm_taskAction!serchByCondition',
+ url: 'App_bts_battgroupAction!serchByCondition',
data: "json="+JSON.stringify(temp),
dataType: 'json',
success:function(result) {
var model = JSON.parse(result.result);
- //console.info(model);
+ console.info(model);
var arr_td = new Array();
if(model.code == 1){
for(var i=0;i<model.data.length;i++){
@@ -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);
@@ -168,7 +174,7 @@
});
}
- */
+
--
Gitblit v1.9.1