From be5ae72ac614bd34702ed9298af2507e49bc9b95 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期一, 26 十一月 2018 09:10:28 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/batt-state-statistical-details.html | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html b/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
index 0dc1272..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: {
--
Gitblit v1.9.1