From 263ea6e5dc5df6f44cd04a8d5694e4f8f2404312 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.13>
Date: 星期一, 10 十二月 2018 14:02:27 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/bts-comm-task.jsp | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/bts-comm-task.jsp b/gx_tieta/WebRoot/bts-comm-task.jsp
index 405766e..dd3b569 100644
--- a/gx_tieta/WebRoot/bts-comm-task.jsp
+++ b/gx_tieta/WebRoot/bts-comm-task.jsp
@@ -382,9 +382,7 @@
,{field:'dev_comm_runtime', title: '璁惧杩愯鏃堕棿', align: 'center'}
,{field:'break_type_txt', title:'杩炴帴鐘舵��', align:'center', templet: '#breakTypeTpl', width: 150}
]]
- ,data:[
- {'break_type': 1}
- ]
+ ,data:[]
,limit: 1000
,page: false
,height: 'full-290'
@@ -555,8 +553,8 @@
//鐐瑰嚮瀵煎嚭鎶ヨ〃
$('#export_table').click(function(){
- var tblData = createTableData(tOptions);
- GLOBAL.expExcel.xls(tblData);
+ var tblData = GLOBAL.Table.cTblData(tOptions);
+ GLOBAL.Table.expExcel.xls(tblData);
});
//鏋勯�犲鍑鸿〃鏍煎璞�
--
Gitblit v1.9.1