From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改
---
gx_tieta/WebRoot/iframe/batt-state-statistical-details.html | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..67cb13a 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:'warntype', title:'浜嬩欢绫诲瀷', align:'center'}
+ ,{field:'warnstarttime', title:'浜嬩欢寮�濮嬫椂闂�', align:'center', sort: true}
+ ,{field:'warnendtime', 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