From 954517b2ba6192ec535238edd4de1150d83941c1 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期四, 06 十二月 2018 15:54:26 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/js/common.js | 41 +++++++++++++++++++-
gx_tieta/WebRoot/bts-comm-task.jsp | 55 ++++++++++++++++++++++++++-
gx_tieta/WebRoot/batt-state-manage.jsp | 7 +++
3 files changed, 97 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 3510401..052a8a7 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -708,7 +708,7 @@
$('#current').text(Page.pageCurr+"/"+pageNum);
}
layer.close(load);
- createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+ createFullTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
// 缁欐瘡涓�琛屾坊鍔犳暟鎹�
var trList = tblBd.find('tbody tr');
@@ -723,6 +723,11 @@
});
}
+ // 椤甸潰瀹瑰櫒澶у皬鏀瑰彉瑙﹀彂
+ $(window).resize(function() {
+ setTblWidth(tblHd, tblBd);
+ });
+
// 鑾峰彇缁埅鏃堕暱
function StringtoData(value){
var date1= value; //寮�濮嬫椂闂�
diff --git a/gx_tieta/WebRoot/bts-comm-task.jsp b/gx_tieta/WebRoot/bts-comm-task.jsp
index beae88b..33dc6cb 100644
--- a/gx_tieta/WebRoot/bts-comm-task.jsp
+++ b/gx_tieta/WebRoot/bts-comm-task.jsp
@@ -141,6 +141,7 @@
<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="pages/js/mylayui.js"></script>
+ <script type="text/javascript" src="pages/js/common.js"></script>
<script type="text/javascript">
layui.use(['form', 'table', 'layer', 'element'], function() {
var table = layui.table; // 鑾峰彇琛ㄦ牸妯″潡
@@ -378,7 +379,7 @@
,{field:'battgroup_id3', title:'鐢垫睜缁�3', align:'center', width: 150}
,{field:'battgroup_id4', title:'鐢垫睜缁�4', align:'center', width: 150}
,{field:'connet_time', title:'璁惧杩炴帴鏃堕棿', align:'center'}
- ,{field: 'dev_comm_runtime', title: '璁惧杩愯鏃堕棿', align: 'center'}
+ ,{field:'dev_comm_runtime', title: '璁惧杩愯鏃堕棿', align: 'center'}
,{field:'break_type_txt', title:'杩炴帴鐘舵��', align:'center', templet: '#breakTypeTpl', width: 150}
]]
,data:[
@@ -427,11 +428,12 @@
_tmp.connet_time = _data.connet_time;
_tmp.dev_comm_runtime = _data.dev_comm_runtime;
_tmp.break_type = _data.break_type;
+ _tmp.break_type_txt = createDeviceType(_data.break_type);
arr_td.push(_tmp);
Page.setAll(_data.num);
}
}
- //console.info(arr_td);
+ //console.info(tOptions);
tOptions.data = arr_td;
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
@@ -442,6 +444,19 @@
}
});
+ }
+
+ //鑾峰彇璁惧杩炴帴鐨勭姸鎬�
+ function createDeviceType(dev_type){
+ var str_type = "鏈煡绫诲瀷";
+ //console.info(typeof dev_type);
+ switch(dev_type){
+ case 0:str_type="鎴愬姛杩炴帴";break;
+ case 1:str_type="鎵句笉鍒板搴旇澶嘔D";break;
+ case 2:str_type="閫氫俊寮傚父鏂紑";break;
+ default:str_type="鏈煡绫诲瀷";
+ }
+ return str_type;
}
@@ -538,6 +553,42 @@
$('#total').text(page.all);
}
+ //鐐瑰嚮瀵煎嚭鎶ヨ〃
+ $('#export_table').click(function(){
+ var tblData = GLOBAL.Table.cTblData(tOptions);
+ GLOBAL.Table.expExcel.xls(tblData);
+ });
+
+ //鏋勯�犲鍑鸿〃鏍煎璞�
+ function createTableData(tOptions){
+ var thead_arr = new Array(); //琛ㄥご鏁版嵁鏁扮粍
+ var thody_arr = new Array(); //琛ㄦ牸鏁版嵁鏁扮粍
+ var proname_arr = new Array(); //灞炴�у悕鏁扮粍
+ //console.info(tOptions);
+ if(tOptions != undefined){
+ //鏋勯�犺〃澶存暟缁�
+ for(var i = 0;i< tOptions.cols.length;i++){
+ var _th = tOptions.cols[i];
+ for(var k=0;k<_th.length;k++){
+ if(_th[k].field != undefined){
+ proname_arr.push(_th[k].field);
+ thead_arr.push(_th[k].title);
+ }
+ }
+ }
+ //鏋勯�犺〃鏍煎唴閮ㄦ暟鎹暟缁�
+ for(var j = 0;j < tOptions.data.length;j++){
+ var _data = tOptions.data[j];
+ for(var k=0;k<proname_arr.length;k++){
+ thody_arr.push(_data[proname_arr[k]]);
+ }
+ }
+ }
+ return {
+ thead: [thead_arr],
+ tbody:[thody_arr]
+ }
+ }
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index 5a80746..fe0877c 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -549,7 +549,7 @@
// 瀵煎嚭鎶ヨ〃
;(function($, window, document, gl, undefined) {
// 瀹氫箟testVal鐨勫懡鍚嶇┖闂�
- gl.namespace('expExcel');
+ gl.namespace('Table');
var ExpExcel = function() {
this.thead = ''; // 琛ㄦ牸鐨勫ご閮�
this.tbody = ''; // 琛ㄦ牸鐨勫唴瀹�
@@ -678,9 +678,44 @@
var expExcel = new ExpExcel();
- console.log(expExcel);
+ //console.log(expExcel);
// 缁戝畾瀵煎嚭鏁版嵁瀵硅薄
- GLOBAL.expExcel = expExcel;
+ GLOBAL.Table.expExcel = expExcel;
+
+
+ //鏋勯�犲鍑鸿〃鏍煎璞�
+ function createTableData(tOptions){
+ var thead_arr = new Array(); //琛ㄥご鏁版嵁鏁扮粍
+ var thody_arr = new Array(); //琛ㄦ牸鏁版嵁鏁扮粍
+ var proname_arr = new Array(); //灞炴�у悕鏁扮粍
+ //console.info(tOptions);
+ if(tOptions != undefined){
+ //鏋勯�犺〃澶存暟缁�
+ for(var i = 0;i< tOptions.cols.length;i++){
+ var _th = tOptions.cols[i];
+ for(var k=0;k<_th.length;k++){
+ if(_th[k].field != undefined){
+ proname_arr.push(_th[k].field);
+ thead_arr.push(_th[k].title);
+ }
+ }
+ }
+ //鏋勯�犺〃鏍煎唴閮ㄦ暟鎹暟缁�
+ for(var j = 0;j < tOptions.data.length;j++){
+ var _data = tOptions.data[j];
+ for(var k=0;k<proname_arr.length;k++){
+ thody_arr.push(_data[proname_arr[k]]);
+ }
+ }
+ }
+ return {
+ thead: [thead_arr],
+ tbody:[thody_arr]
+ };
+ }
+
+ // 缁戝畾瀵煎嚭鏁版嵁瀵硅薄
+ GLOBAL.Table.cTblData = createTableData;
})(jQuery, window, document, GLOBAL);
// 鐢熸垚闃块噷鍥炬爣鐨勫厓绱�
--
Gitblit v1.9.1