From dfefba58aeae9fff0ef0463acf3d112f78d72629 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.8>
Date: 星期一, 29 十月 2018 17:21:45 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-traffic-statistics.jsp | 151 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 105 insertions(+), 46 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-traffic-statistics.jsp b/gx_tieta/WebRoot/batt-traffic-statistics.jsp
index 56a6455..2bb4ffb 100644
--- a/gx_tieta/WebRoot/batt-traffic-statistics.jsp
+++ b/gx_tieta/WebRoot/batt-traffic-statistics.jsp
@@ -86,14 +86,14 @@
</select>
</td>
<td>
- <select id="station_name">
+ <select id="station_name3">
</select>
</td>
<td>
- <select>
- <option>鎸夊勾缁熻</option>
- <option>鎸夋湀缁熻</option>
- <option>鎸夋棩缁熻</option>
+ <select id="statistics">
+ <option value=3>鎸夊勾缁熻</option>
+ <option value=1>鎸夋湀缁熻</option>
+ <option value=2>鎸夋棩缁熻</option>
</select>
</td>
<td><input type="text" id="startalm" readonly="readonly" name="bmd.adata.alm_start_time" value="2000-1-1" /></td>
@@ -112,11 +112,15 @@
<!-- 鎸夐挳鍐呭 -->
<div id="paging">
+ <a href="javascript:" class="search"><s:text name="Search"/></a> <!-- 鏌ヨ -->
+ <a href="javascript:" id="export_table"><s:text name="Export"/></a> <!-- 瀵煎嚭 -->
+
<span>鎬昏</span>
<span>5000</span>
</div>
</div>
-
+
+ </div>
<!-- 鏁翠綋鐏拌壊閬僵灞� -->
<div id="allShade"></div>
<script type="text/javascript" src="js/loading.js"></script>
@@ -125,19 +129,33 @@
<script type="text/javascript" src="js/eleHistWarn1-jquery.ui.js"></script>
<script type="text/javascript">
- layui.use(['layer'], function() {
- var layer = layui.layer;
- var arrTh = new Array(); // 琛ㄦ牸鐨勫ご閮�
- var arrTd = new Array(); // 琛ㄦ牸鐨勮〃浣�
- var tblStatus = new Array(); // 琛ㄦ牸鐘舵�佹暟缁�
- var tblOptsHd = new Array(); // 琛ㄦ牸閫夐」澶撮儴
- var tblOptsBd = new Array(); // 琛ㄦ牸閫夐」鏁扮粍
- arrTh = ['鏃堕棿娈�', '鏈烘埧鍚嶇О','娴侀噺','缁熻鏃堕棿'];
- //arrTh = ['<s:text name="Maintenance_area"/>', '<s:text name="Computer_name"/>', '<s:text name="Nominal_capacity"/>(AH)', '<s:text name="Actual_capacity"/>(AH)','<s:text name="Residual_capacity"/>(AH)', '<s:text name="real_time"/><s:text name="Current"/>(A)', '<s:text name="Power_cut"/><s:text name="Endurance"/><s:text name="Time"/>'];
- //tblOptsHd = ['缂栧彿', '閫夐」', '鏄惁閫夋嫨'];
- tblOptsHd = ['<s:text name="Number"/>', '<s:text name="Options"/>', '<s:text name="IsChecked"/>'];
- var tblHd = $('#tbHead');
- var tblBd = $('#tbBrdw');
+ var arrTh = new Array(); // 琛ㄦ牸鐨勫ご閮�
+ var arrTd = new Array(); // 琛ㄦ牸鐨勮〃浣�
+ var tblStatus = new Array(); // 琛ㄦ牸鐘舵�佹暟缁�
+ var tblOptsHd = new Array(); // 琛ㄦ牸閫夐」澶撮儴
+ var tblOptsBd = new Array(); // 琛ㄦ牸閫夐」鏁扮粍
+ arrTh = ['缁熻鏃堕棿娈�','鐪�','甯�', '鏈烘埧鍚嶇О','娴侀噺'];
+ //arrTh = ['<s:text name="Maintenance_area"/>', '<s:text name="Computer_name"/>', '<s:text name="Nominal_capacity"/>(AH)', '<s:text name="Actual_capacity"/>(AH)','<s:text name="Residual_capacity"/>(AH)', '<s:text name="real_time"/><s:text name="Current"/>(A)', '<s:text name="Power_cut"/><s:text name="Endurance"/><s:text name="Time"/>'];
+ //tblOptsHd = ['缂栧彿', '閫夐」', '鏄惁閫夋嫨'];
+ tblOptsHd = ['<s:text name="Number"/>', '<s:text name="Options"/>', '<s:text name="IsChecked"/>'];
+ var tblHd = $('#tbHead');
+ var tblBd = $('#tbBrdw');
+ // 鐢熸垚琛ㄦ牸鐨勫ご閮ㄥ拰琛ㄤ綋
+ function createAllTbl(header, body, arrTh, arrTd, status) {
+ //console.info(status);
+ var newArrTh = new Array();
+ var newArrTd = new Array();
+ newArrTh = getArrTh(status, arrTh);
+ newArrTd = getArrTd(status, arrTd);
+ createTablenew(header, newArrTh, newArrTd);
+ createTablenew(body, newArrTh, newArrTd);
+ // 瀹氫箟琛ㄦ牸鐨勫ご閮ㄥ拰琛ㄤ綋瀹藉害涓�鑷�
+ var bdWidth = body.find('table').width();
+ header.find('table').width(bdWidth);
+ }
+ layui.use(['layer'], function() {
+ var layer = layui.layer;
+
// 鏍规嵁琛ㄦ牸鐨勫ご閮ㄧ敓鎴愯〃鏍奸�夐」鍜岃〃鏍肩殑鐘舵�佹暟缁�
$(function() {
@@ -160,8 +178,8 @@
// 鐢熸垚琛ㄦ牸
$(function() {
- for(i=0;i<5000;i++){arrTd.push(i)}
- createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+ // for(i=0;i<5000;i++){arrTd.push(i)}
+ // createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
// 鐐瑰嚮琛ㄦ牸閫夐」鏄剧ず琛ㄦ牸閫夐」寮瑰嚭妗�
$('#paging .card-opt').click(function() {
var checkboxList = $('#cardOption .con_table table tbody').find('input[type="checkbox"]');
@@ -222,19 +240,7 @@
}
}
- // 鐢熸垚琛ㄦ牸鐨勫ご閮ㄥ拰琛ㄤ綋
- function createAllTbl (header, body, arrTh, arrTd, status) {
- //console.info(status);
- var newArrTh = new Array();
- var newArrTd = new Array();
- newArrTh = getArrTh(status, arrTh);
- newArrTd = getArrTd(status, arrTd);
- createTablenew(header, newArrTh, newArrTd);
- createTablenew(body, newArrTh, newArrTd);
- // 瀹氫箟琛ㄦ牸鐨勫ご閮ㄥ拰琛ㄤ綋瀹藉害涓�鑷�
- var bdWidth = body.find('table').width();
- header.find('table').width(bdWidth);
- }
+
//瀵逛簬寮瑰嚭涓插彛杩涜瀹氫綅(position:fixed)
function centerDiv(ele){
@@ -247,12 +253,6 @@
});
}
-
-
-
-
-
-
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
$(document).ready(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
@@ -335,7 +335,7 @@
var rs = JSON.parse(data.result);
if(rs.code==1){
var _data = rs.data;
- var $select = $("#station_name");
+ var $select = $("#station_name3");
// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
var optsList = [];
for(var i=0;i<_data.length;i++){
@@ -344,7 +344,7 @@
var _attr = {
StationId: __data.FBSDeviceId,
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
optsList.push(tmp);
}
findStationNamebyStationname1.stations = _data;
@@ -353,13 +353,12 @@
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
+
});
}
+
});
-
-
-
//鑾峰彇閫変腑鐨勬満鎴垮璞�
function getSelectStation(dev_id,arr){
if(arr != undefined && arr.length > 0){
@@ -368,13 +367,73 @@
return arr[i];
}
}
+
}
return undefined;
}
+ function createSearchForm(){
+ var stationid = $('#station_name3').find("option:selected").attr('Stationid');
+ var temp = {
+ dev_id: stationid?stationid:0,
+ record_time:$('#startalm').val()+" 00:00:00",
+ record_time1:$('#endTalm').val()+" 23:59:59",
+ num:$('#statistics').val(),
+ };
+ //console.info(temp);
+ return temp;
+ }
+ function searchTranfficStatistic(){
+ var temp = createSearchForm();
+ arrTd = new Array();
+ var Index = 0;
+ $.post("StationtrafficAction!serchByCondition","json="+JSON.stringify(temp),function(data){
+ //console.info(data);
+ var data = JSON.parse(data.result);
+ //console.info(data);
+ if(data.code==1&&data.data.length>0){
+ data=data.data;
+ //console.info(data);
+ for(i=0;i<data.length;i++){
+ arrTd[Index++] = data[i].note;
+ arrTd[Index++] = data[i].stationName1;
+ arrTd[Index++] = data[i].stationName2;
+ arrTd[Index++] = data[i].stationName;
+ arrTd[Index++] = tranfficCount(data[i].nowflow);
+ }
+ //console.info(arrTd);
+ //createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+ }
+ createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+ });
+ //createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+ }
-
+ function tranfficCount(value){
+ value = (value/1048576).toFixed(2);
+ if(value>1024){
+ value = (value/1024).toFixed(2);
+ return value + "G";
+ }else{
+ return value + "M";
+ }
+ }
+
+ $('#paging .search').click(function() {
+ jungeJifang();
+ searchTranfficStatistic();
+ });
+
+ function jungeJifang(){
+ var stationid = $('#station_name3').find("option:selected").attr('Stationid');
+ //stationid?stationid:0;
+ //console.info(stationid);
+ if(stationid){
+ }else{
+ alert("璇烽�夋嫨涓�涓満鎴�");
+ }
+ }
</script>
</body>
--
Gitblit v1.9.1