From a6f784d801885a6a2c785206d12085c19be3f9e3 Mon Sep 17 00:00:00 2001 From: 81041 <81041@192.168.10.20> Date: 星期四, 29 十一月 2018 11:50:29 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/WebRoot/batt-state-statistical.jsp | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp index 6e01c08..883aacb 100644 --- a/gx_tieta/WebRoot/batt-state-statistical.jsp +++ b/gx_tieta/WebRoot/batt-state-statistical.jsp @@ -342,11 +342,9 @@ tmp.push(_data.station_event_type_tempup); // 娓╁害涓婇檺 tmp.push(_data.station_event_type_templow); // 娓╁害涓嬮檺 tmp.push(_data.station_event_type_dampup); // 婀垮害涓婇檺 - tmp.push(_data.station_event_type_damplow); // 婀垮害涓嬮檺 - + tmp.push(_data.station_event_type_damplow); // 婀垮害涓嬮檺 rs.push(tmp); - } - + } return rs; } -- Gitblit v1.9.1