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 | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html b/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
index 04bf0c2..0dc1272 100644
--- a/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
+++ b/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
@@ -3,7 +3,6 @@
<head>
<meta charset="UTF-8">
<title>閰嶇粍绠＄悊</title>
- <link rel="stylesheet" href="../jqueryui/jquery-ui.min.css">
<link rel="stylesheet" href="../src/css/layui.css">
<link rel="stylesheet" href="../font-awesome-4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="../pages/css/mylayui.css">
@@ -63,11 +62,9 @@
</div>
</div>
<script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
- <script type="text/javascript" src="../jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
- <script type="text/javascript" src="../src/layui.js"></script>
+ <script type="text/javascript" src="../pages/js/base.js"></script>
<script type="text/javascript" src="../pages/js/mylayui.js"></script>
- <script type="text/javascript" src="../js/base.js"></script>
<script type="text/javascript" src="../pages/js/common.js"></script>
<script type="text/javascript">
layui.use(['layer', 'table', 'form', 'laytpl', 'element', 'laydate'],function() {
@@ -119,12 +116,16 @@
,toolbar: true
,defaultToolbar: ['exports', 'filter']
,cellMinWidth: 80
+ ,initSort: {
+ field: 'warnstarttime',
+ type: 'desc'
+ }
,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', sort: true}
,{field:'warnendtime', title:'寮傚父缁撴潫鏃堕棿', align:'center'}
- ,{field:'warntimelen', title:'寮傚父鏃堕暱(绉�)', align:'center'}
+ ,{field:'warntimelen', title:'寮傚父鏃堕暱(鍒嗛挓)', align:'center'}
]]
,data: rsData
,page: {
@@ -163,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