Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git...

81041

2018-11-06 1ea5c72df085a25726de4ec6c68ec825ba440960

Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/WebRoot/iframe/batt-state-statistical-details.html

@@ -120,9 +120,9 @@
                ,defaultToolbar: ['exports', 'filter']

                ,cellMinWidth: 80

                ,cols: [[

                    {field:'stationname', title:'机房名称', align:'center', width: 380}

                    {field:'stationname', title:'机房名称', align:'center', width: 460}

                    ,{field:'warntype', title:'异常类型', align:'center'}

                    ,{field:'warnstarttime', title:'异常开始时间', align:'center'}

                    ,{field:'warnstarttime', title:'异常开始时间', align:'center', sort: true}

                    ,{field:'warnendtime', title:'异常结束时间', align:'center'}

                    ,{field:'warntimelen', title:'异常时长(秒)', align:'center'}

                ]]