From 8d921663d0400bad1053a4b70f84f0e338d9f221 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.31>
Date: 星期三, 31 十月 2018 16:01:12 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/elegroup.jsp | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/elegroup.jsp b/gx_tieta/WebRoot/elegroup.jsp
index da19682..a3e0ccd 100644
--- a/gx_tieta/WebRoot/elegroup.jsp
+++ b/gx_tieta/WebRoot/elegroup.jsp
@@ -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