From 8fa05701a4d5fe21231d9eb3c01dd6e80188313f Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 07 十二月 2018 16:27:18 +0800
Subject: [PATCH] 修改电池信息单体电压，单体数量 ，浮充电压阀值和离线电压阀值联动
---
gx_tieta/WebRoot/bts-comm-task.jsp | 63 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/WebRoot/bts-comm-task.jsp b/gx_tieta/WebRoot/bts-comm-task.jsp
index 692f647..dd3b569 100644
--- a/gx_tieta/WebRoot/bts-comm-task.jsp
+++ b/gx_tieta/WebRoot/bts-comm-task.jsp
@@ -15,7 +15,7 @@
<meta http-equiv="expires" content="0">
<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
<meta http-equiv="description" content="This is my page">
- <title>璁惧杩炴帴淇℃伅</title>
+ <title><s:text name="Dev_connect_info_query"/></title> <!-- 璁惧杩炴帴淇℃伅鏌ヨ -->
<link rel="stylesheet" type="text/css" href="pages/css/base.css">
<link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="src/css/layui.css">
@@ -41,7 +41,7 @@
<div class="layui-page-container">
<!-- 鏉′欢绛涢�� -->
<div class="layui-page-filter">
- <div class="page-filter-header layui-page-filter-fweight">璁惧杩炴帴淇℃伅</div>
+ <div class="page-filter-header layui-page-filter-fweight"><s:text name="Dev_connect_info_query"/></div> <!-- 璁惧杩炴帴淇℃伅鏌ヨ -->
<div class="page-filter-content">
<table>
<tr class="layui-page-filter-tbl-header layui-page-filter-fweight">
@@ -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,12 +379,10 @@
,{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:[
- {'break_type': 1}
- ]
+ ,data:[]
,limit: 1000
,page: false
,height: 'full-290'
@@ -427,11 +426,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 +442,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 +551,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>
--
Gitblit v1.9.1