From 4d5cad58f0b879d23ad37fa5fd385449a1dd1445 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期四, 01 十一月 2018 16:46:57 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/elegroup.jsp | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/elegroup.jsp b/gx_tieta/WebRoot/elegroup.jsp
index 1cb70d9..a3e0ccd 100644
--- a/gx_tieta/WebRoot/elegroup.jsp
+++ b/gx_tieta/WebRoot/elegroup.jsp
@@ -23,7 +23,7 @@
position: absolute;
top: 0;
right: 0;
- z-index: 999;
+ z-index: 99;
}
.toolbar-fixed-top-right.right10 {
right: 10px;
@@ -418,8 +418,9 @@
createBattTable(allbattstation);
addTdIdx($('#tbroom table tbody td'),battstationIdList);
}
- $('#station_num').text(totalstationNum);
- $('#batt_num').text(totalbattNum);
+ getbattStationlength();
+ /* $('#station_num').text(totalstationNum);
+ $('#batt_num').text(totalbattNum); */
});
}
}
@@ -1031,7 +1032,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ var tmp = getOptionsData(__data.StationName, __data.StationName, __data, _attr);
optsList.push(tmp);
}
--
Gitblit v1.9.1