From 52637917ddd991d35c37b64faddc2187ff736482 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.29>
Date: 星期一, 15 十月 2018 16:35:49 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-state-statistical.jsp | 101 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 75 insertions(+), 26 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index d3dd83a..c1df1cf 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -70,10 +70,9 @@
<td><input type="text" id="startalm" readonly="readonly" name="bmd.adata.alm_start_time" value="2000-1-1" /></td>
<td><input type="text" id="endTalm" readonly="readonly" name="bmd.adata.alm_start_time1" /></td>
<td>
- <select>
- <option>鏃�</option>
- <option>鎸夊勾缁熻</option>
- <option>鎸夋湀缁熻</option>
+ <select id="statistics">
+ <option value=3>鎸夊勾缁熻</option>
+ <option value=1>鎸夋湀缁熻</option>
</select>
</td>
</tr>
@@ -83,20 +82,20 @@
<tr>
<td>
- <input type="checkbox" id="" name="" checked="checked" value="" class="" />鍋滅數 <!-- 鍋滅數 -->
+ <input type="checkbox" id="ALM_TYPE_BTS9100S_POFF_ComError" name="" checked="checked" value="" class="" />鍋滅數 <!-- 鍋滅數 -->
</td>
<td>
- <input type="checkbox" id="" name="" checked="checked" value="" class="" />鍙戠數 <!-- 鍙戠數 -->
+ <input type="checkbox" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name="" checked="checked" value="" class="" />鍙戠數 <!-- 鍙戠數 -->
</td>
<td>
- <input type="checkbox" id="" name="" checked="checked" value="" class="">鎺夌珯 <!-- 鎺夌珯 -->
+ <input type="checkbox" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name="" checked="checked" value="" class="">鎺夌珯 <!-- 鎺夌珯 -->
</td>
- <td><input type="checkbox" id="" name="" value="" class="" checked="checked">寮�闂ㄥ紓甯�</td> <!-- 寮�闂紝寮�鍏崇數婧愬紓甯� -->
- <td><input type="checkbox" name="" id="" checked="checked" value="" class="">娓╁害涓婇檺鍛婅</td>
- <td><input type="checkbox" name="" id="" checked="checked" value="" class="">娓╁害涓嬮檺鍛婅</td> <!-- 娓╁害寮傚父 -->
- <td><input type="checkbox" name="" id="" checked="checked" value="" class="">婀垮害涓婇檺鍛婅</td>
- <td><input type="checkbox" name="" id="" checked="checked" value="" class="">婀垮害涓嬮檺鍛婅</td> <!-- 婀垮害寮傚父 -->
+ <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError" name="" value="" class="" checked="checked">寮�闂ㄥ紓甯�</td> <!-- 寮�闂紝寮�鍏崇數婧愬紓甯� -->
+ <td><input type="checkbox" id="ALM_TYPE_BTS9100S_TEMPUP_ComError" name="" checked="checked" value="" class="">娓╁害涓婇檺鍛婅</td>
+ <td><input type="checkbox" id="ALM_TYPE_BTS9100S_TEMPLOW_ComError" name="" checked="checked" value="" class="">娓╁害涓嬮檺鍛婅</td> <!-- 娓╁害寮傚父 -->
+ <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DAMPUP_ComError" name="" checked="checked" value="" class="">婀垮害涓婇檺鍛婅</td>
+ <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DAMPLOW_ComError" name="" checked="checked" value="" class="">婀垮害涓嬮檺鍛婅</td> <!-- 婀垮害寮傚父 -->
</tr>
</table>
</div>
@@ -161,7 +160,7 @@
$(function () {
// 鍒濆鍖栭〉闈㈢殑鏁版嵁
//鑷畾涔夋暟缁勫彉閲忥紝鏁扮粍鐨勫�间负鐢垫睜鍛婅琛ㄦ牸鐨勮〃澶� 缂栧彿 鏈烘埧鍚嶇О 鐢垫睜缁勫悕绉� 鍛婅鍚嶇О 鍗曚綋缂栧彿 鍛婅鍊� 鍛婅绛夌骇 鍛婅纭 鍛婅纭鏃堕棿 鍛婅寮�濮嬫椂闂� 鍛婅鎴鏃堕棿
- ArrWarnTh = ['鏈烘埧鍚嶇О','鍋滅數娆℃暟','鍙戠數娆℃暟','鎺夌珯娆℃暟','寮�闂ㄥ紓甯告鏁�','娓╁害涓婇檺鍛婅','娓╁害涓嬮檺鍛婅','婀垮害涓婇檺鍛婅','婀垮害涓嬮檺鍛婅'];
+ ArrWarnTh = ['鍛婅鏃堕棿娈�','鏈烘埧鍚嶇О','鍋滅數娆℃暟','鍙戠數娆℃暟','鎺夌珯娆℃暟','寮�闂ㄥ紓甯告鏁�','娓╁害涓婇檺鍛婅','娓╁害涓嬮檺鍛婅','婀垮害涓婇檺鍛婅','婀垮害涓嬮檺鍛婅'];
ArrWarnTb = new Array(); // 鐢ㄤ簬瀛樻斁琛ㄦ牸鏁版嵁
createFullTbl($('.tbl-header'), $('.tbl-body'), ArrWarnTh, ArrWarnTb);
@@ -255,33 +254,83 @@
$(function(){
//鐐瑰嚮鏌ヨ鎸夐挳
$('#paging .search').click(function(){
-
+ //var check = $("#ALM_TYPE_BTS9100S_FADIAN_ComError").attr("checked");
+ //console.info(check);
+ serachBattStatistical();
});
});
var formjson;
-
-
+ function serachBattStatistical(){
+ var temp = createSearchForm();
+ var json = JSON.stringify(temp);
+ ArrWarnTb = new Array();
+ $.ajax({
+ type:"post",
+ url:"Batt_devalarm_data_historyAction!serchStateBydev_id",
+ async:true,
+ dataType:'json',
+ data:"json="+json,
+ success:function(data){
+ var data=JSON.parse(data.result);
+ var index=0;
+ //console.info(data);
+ if(data.code==1&&data!=null){
+ data=data.data;
+ Page.pageAll = data.length;
+ var pageNum=Math.ceil(Page.pageAll/Page.pageSize);
+ $('#total').text(Page.pageAll);
+ $('#current').text(Page.pageCurr+"/"+pageNum);
+ var currentStartdata=Math.ceil((Page.pageCurr-1)*Page.pageSize);
+ var currenEnddata = 0;
+ if(Math.ceil(Page.pageAll-(Page.pageCurr-1)*Page.pageSize)<Page.pageSize){
+ currenEnddata = Math.ceil((Page.pageAll-(Page.pageCurr-1)*Page.pageSize)+(Page.pageCurr-1)*Page.pageSize);
+ }else{
+ currenEnddata = Math.ceil((Page.pageCurr)*Page.pageSize);
+ }
+ console.info(currenEnddata);
+ for(i=currentStartdata;i<currenEnddata;i++){
+ console.info(data);
+ ArrWarnTb[index++]=data[i].dev_ip; //鍛婅鏃堕棿娈�
+ ArrWarnTb[index++]=data[i].stationName; //鏈烘埧鍚嶇О
+ ArrWarnTb[index++]=data[i].num; //鍋滅數
+ ArrWarnTb[index++]=data[i].record_id; //鍙戠數娆℃暟
+ ArrWarnTb[index++]=data[i].alm_type; //鎺夌珯娆℃暟
+ ArrWarnTb[index++]=data[i].alm_level; //寮�闂ㄥ紓甯�
+ ArrWarnTb[index++]=data[i].alm_is_confirmed;//娓╁害涓婇檺
+ ArrWarnTb[index++]=data[i].alm_cleared_type;//娓╁害涓嬮檺
+ ArrWarnTb[index++]=data[i].usr_id; //婀垮害涓婇檺
+ ArrWarnTb[index++]=data[i].note; //婀垮害涓嬮檺
+ }
+ createFullTbl($('.tbl-header'), $('.tbl-body'), ArrWarnTh, ArrWarnTb);
+ }
+ }
+ })
+ }
//鏋勯�犳煡璇㈡潯浠跺璞�
+ // function creatArrTb(var arr,int){
+ // var arr = new Array();
+
+ // return arr;
+ // }
function createSearchForm(){
+ var stationid = $('#station_name3').find("option:selected").attr('Stationid');
var temp={
- page:Page,
- binf:{
StationName1:$('#station_name1').val(), // 鐪�
StationName2:$('#city').val(), // 甯�
- StationName:$('#station_name').val(), //鏈烘埧鍚嶇О
-
- }
-
+ StationName3:$('#station_name3').val(), //鏈烘埧鍚嶇О
+ StationId: stationid?stationid:0,
+ BattInUseDate:$('#startalm').val(),
+ BattInUseDate1:$('#endTalm').val(),
+ BattGroupNum:$('#statistics').val()
};
+ //console.info(temp);
return temp;
}
-
-
-
+
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
$(document).ready(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
@@ -371,7 +420,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
optsList.push(tmp);
}
--
Gitblit v1.9.1