From 04bc2d9b97c61ea79017d05f81053e719742f82f Mon Sep 17 00:00:00 2001 From: whyclj <1525436766@qq.com> Date: 星期三, 19 十二月 2018 15:41:01 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/WebRoot/batt-state-statistical.jsp | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp index 013edd6..883aacb 100644 --- a/gx_tieta/WebRoot/batt-state-statistical.jsp +++ b/gx_tieta/WebRoot/batt-state-statistical.jsp @@ -168,7 +168,7 @@ ]] ,data:[] ,page: false - ,height: 'full-280' + ,height: 'full-270' }; // 鐢熸垚琛ㄦ牸鏁版嵁 @@ -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