From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改
---
gx_tieta/WebRoot/mobil/batt-state-statistical.html | 123 +++++++++-------------------------------
1 files changed, 28 insertions(+), 95 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-state-statistical.html b/gx_tieta/WebRoot/mobil/batt-state-statistical.html
index 04f963b..705fc11 100644
--- a/gx_tieta/WebRoot/mobil/batt-state-statistical.html
+++ b/gx_tieta/WebRoot/mobil/batt-state-statistical.html
@@ -110,9 +110,9 @@
<option value="">鍏ㄩ儴</option>
</select>
<p>缁熻鏂瑰紡</p>
- <select id="" data-mini="true">
- <option value="">鎸夊勾缁熻</option>
- <option value="">鎸夋湀缁熻</option>
+ <select id="statistics" data-mini="true">
+ <option value="3">鎸夊勾缁熻</option>
+ <option value="1">鎸夋湀缁熻</option>
</select>
<p>鏃堕棿</p>
@@ -193,35 +193,31 @@
loadshow();
var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
var temp = createSearchForm();
- console.info(stationid);
- /*var temp = {
- StationName1:$("#station_name1").val(),
- StationName2:$("#city").val(),
- StationName5: $("#county").val(),
- StationName: $("#station_name").val(),
- StationId: stationid
- };*/
- //console.info(temp);
+ console.info(temp);
var json = JSON.stringify(temp);
//console.info(json);
arrTd = new Array();
- $.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){
+ $.post("Bts_station_eventAction!serchByCondition","json="+json,function(data){
data=eval("("+data.result+")");
//console.info(data);
if(data.code==1 && data.data.length>0){
data=data.data;
- //console.info(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].stationName; //鏈烘埧鍚嶇О
+ arr[index++]=data[i].station_event_type_poff;
+ arr[index++]=data[i].station_event_type_fadian;
+ arr[index++]=data[i].station_event_type_diaozhan;
+ arr[index++]=data[i].station_event_type_dooropen;
+ arr[index++]=data[i].station_event_type_xuhang;
+ arr[index++]=data[i].station_event_type_tempup;
+ arr[index++]=data[i].station_event_type_templow;
+ arr[index++]=data[i].station_event_type_dampup;
+ arr[index++]=data[i].station_event_type_damplow;
+ arr[index++]=""; //鎸夐挳
}
//console.info(Page);
createTbl(tbl, arrTh, arr);
@@ -243,27 +239,18 @@
function createSearchForm(){
+ var stationid = $('#homeName').find("option:selected").attr('Stationid');
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()
-
- }
-
+ StationName3:$('#homeName').val(), //鏈烘埧鍚嶇О
+ StationId: stationid?stationid:0,
+ BattInUseDate:$('#startTestrecord').val()+" 00:00:00", //鐢垫睜娴嬭瘯璁板綍鏃堕棿娈�
+ BattInUseDate1:$('#endTestrecord').val()+" 23:59:59",
+ BattGroupNum:$('#statistics').val(),
};
+ console.info(temp);
return temp;
}
// stringify(createSearchForm());
@@ -426,61 +413,11 @@
updataSelStation($Ostation_name1, arr);
}
- findserchByBattGroupNamebystationname();
+ // findserchByBattGroupNamebystationname();
}
});
}
-
- //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�
- function findserchByBattGroupNamebystationname(){
- var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
-
- var data = {
- StationName1: $("#mainteArea").val(),
- StationName2:$("#city").val(),
- StationName5:$("#country").val(),
- StationName: $("#homeName").val(),
- StationId: stationid
- };
-
- //console.info(data);
- $.ajax({
- type: "post",
- url: "BattInfAction!serchBattByStation",
- async:true,
- dataType:'json',
- data:"json = "+JSON.stringify(data),
- success: function(data){
- data = data.result;
- data = eval("("+data+")");
- //console.warn();
- //console.info(data);
- //console.info(data.code);
- if(data.code==1&&data.data.length>0){
- var $Ostation_name1=$("#battgroup_name");
- $Ostation_name1.text("");
- var arr = new Array();
- for(var i=0;i<=data.data.length;i++)
- {
- if(i == 0){
- arr.push({
- val:0,
- txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
- });
- }else{
- arr.push({
- val:data.data[i-1].BattGroupId,
- txt:data.data[i-1].BattGroupName,
- });
- }
- }
- updataSel($Ostation_name1, arr);
- }
-
- }
- });
- }
-
+
//褰撶渷鏀瑰彉鏃舵洿鏂板競
$('#mainteArea').change(function(){
findCity();
@@ -493,11 +430,7 @@
$('#country').change(function(){
findStationNamebyStationname1();
});
- //褰撴満鎴挎敼鍙樻椂锛屾洿鏂扮數姹犵粍
- $('#homeName').change(function(){
- findserchByBattGroupNamebystationname();
- });
-
+
$(function() {
--
Gitblit v1.9.1