From 35fd1cfc84fd97990ba86d4cbb0a6ff0c45c2d78 Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@192.168.10.18> Date: 星期三, 12 十二月 2018 15:47:49 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@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