From 943651096ffe71d38311b77612b902410f3d269e Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 10 十月 2018 13:23:40 +0800
Subject: [PATCH] 更换电池单体
---
gx_tieta/WebRoot/ele-match-group.jsp | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-match-group.jsp b/gx_tieta/WebRoot/ele-match-group.jsp
index 3116a56..2a4e5a6 100644
--- a/gx_tieta/WebRoot/ele-match-group.jsp
+++ b/gx_tieta/WebRoot/ele-match-group.jsp
@@ -24,6 +24,11 @@
<link rel="stylesheet" href="css/common.css">
<link rel="stylesheet" href="pages/css/common.css">
<style type="text/css">
+ #main {
+ position: absolute;
+ top: 124px;
+ bottom: 32px;
+ }
#sideBar {
height: 100%;
}
@@ -32,6 +37,9 @@
}
.layui-form-radio {
margin-right: 10px !important;
+ }
+ .layui-table-view {
+ margin: 0;
}
</style>
</head>
@@ -145,7 +153,7 @@
]
,page: {}
- ,height: 'full-170'
+ ,height: 'full-165'
};
var toolBarTpl = groupTblTools.innerHTML;
@@ -228,6 +236,7 @@
if(rs.code == 1) {
var data = rs.data;
var num = 0;
+ console.log(data);
var rsData = formaterTblData(data);
// 璁剧疆琛ㄦ牸鐨勬暟鎹�
num = rsData.length;
@@ -259,16 +268,21 @@
var obj = {};
obj.stationname = _data.StationName; // 鏈烘埧鍚嶇О
obj.groupname = _data.BattGroupName; // 鐢垫睜缁勫悕绉�
- obj.brandname = _data.BattProducer; // 鍝佺墝
obj.monvol = _data.MonVolStd; // 鏍囩О鐢靛帇
obj.nominalcap = Number(_data.MonCapStd); // 鏍囩О瀹归噺
for(var k=0; k<_data.obj.length;k++) {
var _obj = $.extend({}, obj);
var __data = _data.obj[k];
+ // 璁剧疆鍗曚綋淇℃伅
_obj.monnum = '#'+__data.mon_num; // 鍗曚綋缂栧彿
+ _obj.brandname = __data.note; // 鍝佺墝
_obj.relcap = Number(__data.test_cap.toFixed(1)); // 瀹為檯瀹归噺
_obj.percap = Number((__data.percent*100).toFixed(1)); // 瀹归噺鐧惧垎姣�
- rs.push(_obj);
+
+ // 鍒ゆ柇鐢垫睜鍗曚綋涓嶅瓨鍦�
+ if(__data.mon_num != -1) {
+ rs.push(_obj);
+ }
}
}
--
Gitblit v1.9.1