From 6fc40df03a5fc40a2bae976ed8fdedc4946dc584 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.21>
Date: 星期二, 20 十一月 2018 17:27:00 +0800
Subject: [PATCH] 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 | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html b/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
index 12d4bb8..0dc1272 100644
--- a/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
+++ b/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
@@ -116,12 +116,16 @@
,toolbar: true
,defaultToolbar: ['exports', 'filter']
,cellMinWidth: 80
+ ,initSort: {
+ field: 'warnstarttime',
+ type: 'desc'
+ }
,cols: [[
{field:'stationname', title:'鏈烘埧鍚嶇О', align:'center', width: 460}
,{field:'warntype', title:'寮傚父绫诲瀷', align:'center'}
,{field:'warnstarttime', title:'寮傚父寮�濮嬫椂闂�', align:'center', sort: true}
,{field:'warnendtime', title:'寮傚父缁撴潫鏃堕棿', align:'center'}
- ,{field:'warntimelen', title:'寮傚父鏃堕暱(绉�)', align:'center'}
+ ,{field:'warntimelen', title:'寮傚父鏃堕暱(鍒嗛挓)', align:'center'}
]]
,data: rsData
,page: {
@@ -160,7 +164,7 @@
if(temp.warntypenum == _data.station_event_type){
temp.warnendtime = _data.record_datetime;
var timelong = (new Date(temp.warnendtime).getTime()- new Date(temp.warnstarttime).getTime())/1000;
- temp.warntimelen = timelong;
+ temp.warntimelen = (timelong/60).toFixed(2);
}
}
--
Gitblit v1.9.1