From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/mobil/batt-traffic-statistics.html | 91 +++++++++++++++++++++++----------------------
1 files changed, 47 insertions(+), 44 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-traffic-statistics.html b/gx_tieta/WebRoot/mobil/batt-traffic-statistics.html
index 11b7eca..f625be3 100644
--- a/gx_tieta/WebRoot/mobil/batt-traffic-statistics.html
+++ b/gx_tieta/WebRoot/mobil/batt-traffic-statistics.html
@@ -110,10 +110,10 @@
<option value="">鍏ㄩ儴</option>
</select>
<p>缁熻鏂瑰紡</p>
- <select id="" data-mini="true">
- <option value="">鎸夊勾缁熻</option>
- <option value="">鎸夋湀缁熻</option>
- <option value="">鎸夋棩缁熻</option>
+ <select id="statistics" data-mini="true">
+ <option value="3">鎸夊勾缁熻</option>
+ <option value="1">鎸夋湀缁熻</option>
+ <option value="2">鎸夋棩缁熻</option>
</select>
<p>鏃堕棿娈�</p>
<div class="checkdata">
@@ -146,6 +146,14 @@
<table data-role="table" class="ui-responsive ui-shadow" id="tab" >
</table>
+ </div>
+ <div data-role="footer" data-position="fixed">
+ <div data-role="navbar">
+ <ul>
+ <li><a href="index.html" target="_top" data-icon="home">棣栭〉</a></li>
+ <li><a href="batt-traffic-line.html" target="_top" data-icon="arrow-r">鎶樼幇鍥�</a></li>
+ </ul>
+ </div>
</div>
</div>
</body>
@@ -205,23 +213,21 @@
var json = JSON.stringify(temp);
//console.info(json);
arrTd = new Array();
- $.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){
+ $.post("StationtrafficAction!serchByCondition","json="+json,function(data){
data=eval("("+data.result+")");
- //console.info(data);
+ console.info(data);
if(data.code==1 && data.data.length>0){
data=data.data;
//console.info(data);
arr=new Array();
index=0;
for(var i=0;i<data.length;i++){
- Page.pageAll=data[i].Size;
- arr[index++]=data[i].BattGroupId; //鐢垫睜缁刬d
- arr[index++]=data[i].StationName; //鏈烘埧鍚嶇О
- arr[index++]=data[i].StationIp; //鏈烘埧IP
- arr[index++]=data[i].BattGroupName; //鐢垫睜缁勫悕绉�
- arr[index++]=data[i].BattGroupNum; //鐢垫睜缁勫簭鍙�
-
-
+ arr[index++]=data[i].note;
+ arr[index++]=data[i].stationName1; //鐢垫睜缁刬d
+ arr[index++]=data[i].stationName2; //鏈烘埧鍚嶇О
+ arr[index++]=data[i].stationName; //鏈烘埧IP
+ arr[index++]=tranfficCount(data[i].dayflow); //鐢垫睜缁勫悕绉�
+
}
//console.info(Page);
createTbl(tbl, arrTh, arr);
@@ -239,31 +245,27 @@
});
}
-
-
+
+ // 璁＄畻娴侀噺
+ function tranfficCount(value){
+ value = (value/1048576).toFixed(2);
+ if(value>1024){
+ value = (value/1024).toFixed(2);
+ return value + "G";
+ }else{
+ return value + "M";
+ }
+ }
function createSearchForm(){
- var temp={
- page:{
- pageCurr:Page.pageCurr,
- pageSize:Page.pageSize,
- },
- binf:{
- StationName1:$('#mainteArea').val(),
- StationName2:$('#city').val(),
- StationName5:$('#country').val(),
- StationName:$('#homeName').val(),
-
- },
-
- tdata:{
-
- record_time:$('#startTestrecord').val(), //鐢垫睜娴嬭瘯璁板綍鏃堕棿娈�
- record_time1:$('#endTestrecord').val()
-
- }
-
+ var dev_id = $('#homeName').find("option:selected").attr('stationid');
+ var temp = {
+ dev_id: dev_id?dev_id:0,
+ record_time:$('#startTestrecord').val()+" 00:00:00", //鐢垫睜娴嬭瘯璁板綍鏃堕棿娈�
+ record_time1:$('#endTestrecord').val()+" 23:59:59",
+ num:$('#statistics').val()
};
+ console.info(temp);
return temp;
}
// stringify(createSearchForm());
@@ -400,7 +402,7 @@
success: function(data){
data = data.result;
data = eval("("+data+")");
- //console.info(data);
+ console.info(data);
//console.info(data.code);
if(data.code==1&&data.data.length>0){
var $Ostation_name1=$("#homeName");
@@ -409,16 +411,17 @@
for(var i=0;i<=data.data.length;i++)
{
if(i == 0){
- arr.push({
- val:"",
- stationid:"",
- txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
- });
+ //arr.push({
+ //dev_id:"",
+ // stationid:"",
+ // txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ //});
}else{
arr.push({
val:data.data[i-1].StationName3,
- stationid:data.data[i-1].StationId,
- txt:data.data[i-1].StationName3,
+ stationid:data.data[i-1].FBSDeviceId,
+ //dev_id:data.data[i-1].FBSDeviceId,
+ txt:data.data[i-1].StationName3,
});
}
}
--
Gitblit v1.9.1