From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 11:59:20 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/batt-state-statistical-details.html | 4 ++--
1 files changed, 2 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 30b4904..0dc1272 100644
--- a/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
+++ b/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
@@ -125,7 +125,7 @@
,{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: {
@@ -164,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