From 01f4050c3529f85ec05673fea9273f35c6e5e934 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 05 十二月 2018 14:04:40 +0800
Subject: [PATCH] 电池实时告警跨域访问和电池实时状态加续航停止时间
---
gx_tieta/WebRoot/iframe/batt-state-statistical-details.html | 10 +++++-----
1 files changed, 5 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 30b4904..67cb13a 100644
--- a/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
+++ b/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
@@ -122,10 +122,10 @@
}
,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: {
@@ -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