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/batt-life-manage.jsp | 313 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 253 insertions(+), 60 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index 5ea65d0..abb8c45 100644
--- a/gx_tieta/WebRoot/batt-life-manage.jsp
+++ b/gx_tieta/WebRoot/batt-life-manage.jsp
@@ -8,19 +8,19 @@
<html>
<head>
<base href="<%=basePath%>">
-
- <title>鍩虹珯缁埅鏃堕暱绠＄悊鍔熻兘</title> <!--鍩虹珯缁埅鏃堕暱绠＄悊鍔熻兘-->
- <meta charset="UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <link href="css/basic.css" rel="stylesheet">
- <link rel="stylesheet" href="css/BrdwMaint.css">
- <link rel="stylesheet" type="text/css" href="css/loading.css">
-
<meta http-equiv="pragma" content="no-cache">
<meta http-equiv="cache-control" content="no-cache">
<meta http-equiv="expires" content="0">
<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
<meta http-equiv="description" content="This is my page">
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <title><s:text name="Station_life_query"/></title> <!--鏈烘埧缁埅鑳藉姏鏌ヨ-->
+ <link href="css/basic.css" rel="stylesheet">
+ <link rel="stylesheet" href="css/BrdwMaint.css">
+ <link rel="stylesheet" type="text/css" href="css/loading.css">
+ <link rel="stylesheet" type="text/css" href="css/dischargeplan_layout.css">
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<style type="text/css">
body {
overflow-x: hidden !important;
@@ -57,47 +57,45 @@
<!-- 涓讳綋鍐呭 -->
<div id="main">
<div id="eleInfor">
- <span class="summary"><s:text name="Batt_life_history_query"/>--><s:text name="Show/hide_the_query_conditions"/></span>
+ <span class="summary"><s:text name="Station_life_query"/>--><s:text name="Show/hide_the_query_conditions"/></span>
<div class="checkCon">
<!-- 缁存姢鍖轰俊鎭� -->
<form action="" id="search_form">
<table>
<tr class="fWeight">
- <td>鐪�</td> <!-- 鐪� -->
+ <td>鐪�</td> <!-- 鐪� -->
<td>甯�</td> <!-- 甯� -->
+ <td>鍖�/鍘�</td> <!-- 鍖�/鍘� -->
<td><s:text name="Computer_name"/></td> <!-- 鏈烘埧鍚嶇О -->
- <td>缁埅绫诲瀷</td> <!--缁埅绫诲瀷 -->
- <td>缁埅鏃堕棿</td>
+ <td>鎺夌珯</td>
+ <td>瀹為檯缁埅鏃堕棿</td>
</tr>
<tr>
<td>
- <select id="station_name1">
-
- </select>
+ <select id="station_name1"></select>
</td>
<td>
- <select id="city">
-
- </select>
+ <select id="city"></select>
</td>
<td>
- <select id="station_name">
-
- </select>
+ <select id="county"></select>
</td>
<td>
- <select id="endurance_state">
- <option value=0>鍏ㄩ儴</option>
- <option value=1>瀹炴椂缁埅</option>
- <option value=2>娼滃湪缁埅</option>
+ <select id="station_name"></select>
+ </td>
+ <td>
+ <select id="is_stand">
+ <option value=100>鍏ㄩ儴</option>
+ <option value=1>鏄�</option>
+ <option value=0>鍚�</option>
</select>
</td>
<td>
- <select id="endurance_timelong">
+ <select id="actual_timelong">
<option value =0>鍏ㄩ儴</option>
- <option value=60>缁埅鏃堕棿灏忎簬1灏忔椂</option>
- <option value=120>缁埅鏃堕棿灏忎簬2灏忔椂</option>
- <option value=180>缁埅鏃堕棿灏忎簬3灏忔椂</option>
+ <option value=60>瀹為檯缁埅鏃堕棿灏忎簬1灏忔椂</option>
+ <option value=120>瀹為檯缁埅鏃堕棿灏忎簬2灏忔椂</option>
+ <option value=180>瀹為檯缁埅鏃堕棿灏忎簬3灏忔椂</option>
</select>
</td>
@@ -133,6 +131,7 @@
<s:text name="Goto"/><!-- 杞埌 --><input type="text" id="page_num" value="1"/>
<a href="javascript:" id="go"><s:text name="Jump"/><!-- 璺宠浆 --></a>
</span>
+ <a href="javascript:startStationThread();" class="start-station-stical">鍚姩缁埅缁熻</a>
</div>
</div>
<!-- 琛ㄦ牸閫夐」鍐呭 -->
@@ -149,6 +148,7 @@
<div id="allShade"></div>
<script type="text/javascript" src="js/loading.js"></script>
<script type="text/javascript" src="js/createTab.js"></script>
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var Page={
pageCurr:1,
@@ -161,7 +161,7 @@
var tblStatus = new Array(); // 琛ㄦ牸鐘舵�佹暟缁�
var tblOptsHd = new Array(); // 琛ㄦ牸閫夐」澶撮儴
var tblOptsBd = new Array(); // 琛ㄦ牸閫夐」鏁扮粍
- arrTh = ['璁惧ID', '鏈烘埧鍚嶇О', '缁埅鐘舵�� ','瀹為檯瀹归噺', '鏍囩О瀹归噺','瀹為檯鐢垫祦','缁埅鏃堕棿(min)'];
+ arrTh = ['璁惧ID', '鏈烘埧鍚嶇О', '瀹為檯瀹归噺', '鏍囩О瀹归噺','璐熻浇鐢垫祦', '鏈�灏忓疄闄呯画鑸椂闂�(min)','骞冲潎瀹為檯缁埅鏃堕棿(min)', '鏈�澶у疄闄呯画鑸椂闂�(min)', '鐞嗚缁埅鏃堕棿(min)', '鏄惁鎺夌珯'];
//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"/>'];
@@ -185,6 +185,36 @@
var cardBd = $('#cardOption .con_table');
createCard(cardHd, tblOptsHd, tblOptsBd);
createCard(cardBd, tblOptsHd, tblOptsBd);
+
+ // 璁剧疆鏄惁鎺夌珯
+ var pre_is_stand = getQueryString('is_stand');
+ if(pre_is_stand){
+ $('#is_stand').val(pre_is_stand);
+
+ if(pre_is_stand == 0) {
+ $('#actual_timelong').val(0);
+ $('#actual_timelong').prop('disabled', true);
+ }
+ }
+
+ // 璁剧疆缁埅鏃堕暱
+ var pre_timelong = getQueryString('timelong');
+ if(pre_timelong){
+ $('#actual_timelong').val(pre_timelong);
+ }
+
+ // 鐐瑰嚮鏄惁鎺夌珯涓哄惁璁剧疆缁埅鏃堕暱涓嶅彲鐐�
+ $('#is_stand').change(function() {
+ $('#actual_timelong').prop('disabled', false);
+ console.log($(this).val())
+ // 闈炴帀绔欒缃画鑸椂闀挎棤娉曠偣鍑�
+ if($(this).val() == 0) {
+ $('#actual_timelong').val(0);
+ $('#actual_timelong').prop('disabled', true);
+ }
+
+
+ });
});
// 鐢熸垚琛ㄦ牸
@@ -192,15 +222,7 @@
createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
$('#paging .search').click(function() {
- searchBattLife();
- /* loading.showLoading();
- arrTd = [
- '缁存姢鍖�1', '鏈烘埧鍚嶇О1', '鐢垫睜缁勫悕绉�1', '鏍囩О瀹归噺1', '瀹為檯瀹归噺1', '瀹炴椂鐢垫祦1', '缁埅鏃堕棿1'
- ];
- createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
- setTimeout(function() {
- loading.hideLoading();
- }, 2000); */
+ searchBattLife(true);
});
// 鐐瑰嚮琛ㄦ牸閫夐」鏄剧ず琛ㄦ牸閫夐」寮瑰嚭妗�
@@ -288,10 +310,14 @@
});
}
-
- // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var isNewLoad = true;
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
- //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
+ filterLoad = layer.load();
+
+ var pre_province = getQueryString('province');
+ //椤甸潰鍔犺浇鏃舵煡璇㈢渷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
data=eval("("+data+")");
@@ -307,6 +333,9 @@
}else{
$option.text(data.data[i-1]);
$option.attr("value",data.data[i-1]);
+ if(pre_province == data.data[i-1] && isNewLoad){
+ $option.attr("selected",true);
+ }
}
$select.append($option);
}
@@ -317,10 +346,15 @@
});
});
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ var pre_city = getQueryString('city');
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -338,6 +372,9 @@
for(var i=0;i<_data.length;i++){
var __data = _data[i];
var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ if(pre_city == __data.StationName2 && isNewLoad){
+ tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);
+ }
optsList.push(tmp);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -345,25 +382,82 @@
}else {
$select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
}
- findStationNamebyStationname1();
+ findCounty();
}
});
}
+
+ // 鏌ヨ鍖�/鍘�
+ function findCounty(isLoad) {
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ var pre_county = getQueryString('county');
+ // 鏌ヨ鍖哄幙
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: "BattInfAction!serchStationName5",
+ data: "json="+JSON.stringify(tmp),
+ success:function(data) {
+ var rs = JSON.parse(data.result);
+ var $select = $("#county");
+ if(rs.code==1){
+ var _data = rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);
+ if(pre_county == __data.StationName5 && isNewLoad){
+ tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);
+ }
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else{
+ $select.text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
- findCity();
+ findCity(true);
});
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function(){
- findStationNamebyStationname1();
+ findCounty(true);
+ });
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
+ findStationNamebyStationname1(true);
});
//鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
+ function findStationNamebyStationname1(isLoad){
var tmp = {
StationName1:$("#station_name1").val(),
- StationName2:$("#city").val()
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ var pre_home = getQueryString('home');
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -378,7 +472,10 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ if(pre_home == __data.StationName && isNewLoad){
+ tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr,{},true);
+ }
optsList.push(tmp);
}
@@ -387,26 +484,83 @@
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
+ searchBattLife(true);
+ layer.close(filterLoad);
+ isNewLoad = false;
});
}
//鏋勯�犳煡璇㈡潯浠�
function createSearchParam(){
- //alert($('#endu_type').val());
- var temp = {
- num:3, //鐢垫睜鐘舵��
- BattGroupId:$("#endu_type").val(), //鏌ヨ鏁版嵁
- StationName:$('#station_name').val(), //鏈烘埧鍚�
- StationName2:$('#city').val(), //甯�
- StationName1:$('#station_name1').val(), //缁存姢鍖�
- BattProductDate:$('#starttime').val()+" 00:00:00",
- BattProductDate1:$('#endtime').val()+" 23:59:59", //鐢熶骇鏃ユ湡娈�
+ var temp = {
+ page:Page,
+ stationName:$('#station_name').val(), //鏈烘埧鍚�
+ stationName5:$('#county').val(),
+ stationName2:$('#city').val(), //甯�
+ stationName1:$('#station_name1').val(), //鐪�
+ is_out_stand: $('#is_stand').val(), //鏄惁鎺夌珯
+ endurance_actual_timelong: $('#actual_timelong').val(), //瀹為檯
};
//console.info(temp);
return temp;
}
-
+ // 鏌ヨ鍐呭
+ function searchBattLife(isLoad){
+ var temp = createSearchParam();
+ var json = JSON.stringify(temp);
+ arrTd = new Array();
+ var load;
+ if(isLoad) {
+ load = layer.load(1);
+ }
+ $.ajax({
+ type:"post",
+ url:"Batt_enduranceAction!serchByCondition",
+ async:true,
+ datatype:'json',
+ data:"json="+json,
+ success:function(data){
+ var data = JSON.parse(data.result);
+ layer.close(load);
+ //console.info(data);
+ if(data.code==1&&data.data.length>0){
+ data=data.data;
+ var index = 0;
+ var ArryTb= new Array();
+ for(i=0;i<data.length;i++){
+ arrTd[index++]=data[i].deviceId;
+ arrTd[index++]=data[i].stationName;
+ arrTd[index++]=data[i].real_cap;
+ arrTd[index++]=data[i].moncapstd;
+ arrTd[index++]=data[i].real_curr;
+ arrTd[index++]=data[i].endurance_actual_timelong_min;
+ arrTd[index++]=data[i].endurance_actual_timelong;
+ arrTd[index++]=data[i].endurance_actual_timelong_max;
+ arrTd[index++]=data[i].endurance_theory_timelong;
+ //console.info(data[i].deviceId+"===="+data[i].is_out_stand);
+ if(data[i].is_out_stand==0){ //鏈帀绔�(缁胯壊)
+ arrTd[index++]='<div class="status effect" ></div>';
+ }
+ else if(data[i].is_out_stand==1){
+ arrTd[index++]='<div class="status no-effect"></div>';
+ }
+ //arrTd[index++]=data[i].is_out_stand;
+ }
+ Page.pageAll = data[data.length-1].page.pageAll;
+ }else{
+ Page.pageAll = 0;
+ }
+
+ var pageNum=Math.ceil(Page.pageAll/Page.pageSize);
+ $('#total').text(Page.pageAll);
+ $('#current').text(Page.pageCurr+"/"+pageNum);
+ $('#page_num').val(Page.pageCurr);
+ createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+ }
+ });
+
+ }
//棣栭〉
$('#home').click(function(){
if(Page!=undefined){
@@ -507,6 +661,7 @@
function exprotTable(eleTh,eleTd,eleform,eleTh_Text,eleTd_Text){
//alert("瀵煎嚭");
var ArrTh=new Array();
+ var a=0;
for(var i=0;i<eleTh.length;i++)
{
ArrTh[i]=eleTh.eq(i).text();
@@ -514,7 +669,17 @@
var ArrTd="";
for(var i=0;i<eleTd.length;i++)
{
- ArrTd+=eleTd.eq(i).text()+"&";
+ if((i+1)%eleTh.length==0){
+ //console.info(eleTd.eq(i).text());
+ if(eleTd.eq(i).find('div class').is('status no-effect')){
+ ArrTd+="宸叉帀绔�";
+ }else{
+ ArrTd+="鏈帀绔�";
+ }
+ ArrTd+=eleTd.eq(i).text()+"&";
+ }else{
+ ArrTd+=eleTd.eq(i).text()+"&";
+ }
}
eleTh_Text.attr('value',ArrTh);
eleTd_Text.attr('value',ArrTd);
@@ -522,6 +687,34 @@
//console.info(ArrTd);
eleform.submit();
}
+
+ //鍚姩鏈烘埧缁埅绾跨▼
+ function startStationThread(){
+ load = layer.load(1);
+ var temp = {
+ thread_id:2019001,
+ thread_en:1,
+ };
+ $.ajax({
+ type:"post",
+ url:"Thread_utilAction!update",
+ async:true,
+ datatype:'json',
+ data:"json="+JSON.stringify(temp),
+ success:function(data){
+ layer.close(load);
+ //console.info(data);
+ var model = JSON.parse(data.result);
+ if(model.code == 1){
+ layer.msg("鍚姩鎴愬姛");
+ }else{
+ layer.msg("鍚姩澶辫触");
+ }
+ },error:function(){
+ layer.msg("鍚姩澶辫触");
+ }
+ });
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1