From 3f5f75f280b70a2d02f89aafbf22d8e5323e33f1 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 15:02:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-life-manage.jsp | 278 +++++++++++++++----------------------------------------
1 files changed, 78 insertions(+), 200 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index 4abed5f..5ea65d0 100644
--- a/gx_tieta/WebRoot/batt-life-manage.jsp
+++ b/gx_tieta/WebRoot/batt-life-manage.jsp
@@ -63,7 +63,8 @@
<form action="" id="search_form">
<table>
<tr class="fWeight">
- <td><s:text name="Maintenance_area"/></td> <!-- 缁存姢鍖� -->
+ <td>鐪�</td> <!-- 鐪� -->
+ <td>甯�</td> <!-- 甯� -->
<td><s:text name="Computer_name"/></td> <!-- 鏈烘埧鍚嶇О -->
<td>缁埅绫诲瀷</td> <!--缁埅绫诲瀷 -->
<td>缁埅鏃堕棿</td>
@@ -71,6 +72,11 @@
<tr>
<td>
<select id="station_name1">
+
+ </select>
+ </td>
+ <td>
+ <select id="city">
</select>
</td>
@@ -94,12 +100,7 @@
<option value=180>缁埅鏃堕棿灏忎簬3灏忔椂</option>
</select>
</td>
- <!-- <td style="width: 15%">
- <input type="text" readonly="readonly" id="starttime" onclick="showCalendar(this)" value="2000-01-01">
- </td>
- <td style="width: 15%">
- <input type="text" readonly="readonly" id="endtime" onclick="showCalendar(this)" value="">
- </td> -->
+
</tr>
</table>
</form>
@@ -287,7 +288,9 @@
});
}
- $(document).ready(function(){
+
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ $(document).ready(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -310,41 +313,80 @@
}else{
$("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
}
- findStationNamebyStationname1();
+ findCity();
});
});
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ function findCity() {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ var $select = $("#city");
+ if(rs.code == 1) {
+ var _data= rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ optsList.push(tmp);
+ }
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else {
+ $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
+ findCity();
+ });
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
findStationNamebyStationname1();
});
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val()
};
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+ var rs = JSON.parse(data.result);
+ if(rs.code==1){
+ var _data = rs.data;
var $select = $("#station_name");
- $select.text('');
- for(var i=0;i<data.data.length;i++){
- var $option=$("<option></option>");
- {
- $option.text(data.data[i]);
- $option.attr("value",data.data[i]);
- }
- $select.append($option);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
}else{
- $("#station_name").text('').html('<option>鏆傛棤绠＄悊鐨勬満鎴跨珯鐐�</option>');
+ $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
- ///findserchByBattGroupNamebystationname();
});
}
@@ -352,183 +394,19 @@
function createSearchParam(){
//alert($('#endu_type').val());
var temp = {
- note:$('#station_name').val(), //鏌ヨ鏁版嵁
- endurance_state:$('#endurance_state').val(), //鏈烘埧鍚�
- endurance_timelong:$('#endurance_timelong').val(), //缁存姢鍖�
+ 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", //鐢熶骇鏃ユ湡娈�
};
- console.info(temp);
+ //console.info(temp);
return temp;
}
- var formjson;
- //鏌ヨ鐢垫睜缁勭殑鍘嗗彶缁埅鑳藉姏
- function searchBattLife(){
- loading.showLoading();
-
- var jsontemp = $('#search_form').serialize();
- if(formjson != jsontemp){
- Page.pageCurr = 1;
- formjson = jsontemp;
- }
-
- var temp = createSearchParam();
- arrTd = new Array();
- $.ajax({
- type: "post",
- url: "Batt_enduranceAction!serchByCondition",
- async:true,
- dataType:'text',
- data:"json="+JSON.stringify(temp),
- success: function(data){
- data = eval("("+data+")");
- var model = eval("("+data.result+")");
- console.info(model);
- if(model.code==1){
- if(temp.BattGroupId == 0){
- setRealdate(model.data,arrTd);
- }else{
- sethistorydata(model.data,arrTd);
- }
- }else{
- Page.pageAll = 0;
- noContent.showNoContent("鏆傛棤鏌ヨ缁撴灉!");
- loading.hideLoading();
- }
- //createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
- // loading.hideLoading();
- },
- error:function(){
- loading.hideLoading();
- noContent.showNoContent("鏌ヨ澶辫触,璇锋鏌ョ綉缁滆繛鎺ワ紒");
- }
- });
- }
-
- //璁剧疆瀹炴椂鏁版嵁鐨勮〃鏍兼暟鎹�
- function setRealdate(data,arr){
- console.info(data);
- var alldata = new Array();
- for(var i = 0;i<data.length;i++){
- var moncapstd = data[i].binf.MonCapStd;
- var monvolstd = data[i].binf.MonVolStd;
- var maxvol = data[i].bdata.mon_vol;
- var minvol = data[i].bdata.mon_tmp;
- var test_cap = data[i].bstate.batt_test_cap;
- var test_curr = data[i].bstate.group_curr.toFixed(1);
- var actionvalue = (GetMonomerCap(moncapstd,GetHourRate(moncapstd,test_curr),test_cap,maxvol,minvol,monvolstd,CapType_Real)).toFixed(0);
- var restvalue = (GetMonomerCap(moncapstd,GetHourRate(moncapstd,test_curr),test_cap,maxvol,minvol,monvolstd,CapType_Rest)).toFixed(0);
- var percent = (restvalue*100/moncapstd).toFixed(1);
- var restTime = test_curr==0?formartTime(0):formartTime(restvalue*60/test_curr);
- var temp = getObjByStationName(alldata, data[i].binf.StationName);
- console.info(actionvalue+"=="+restvalue);
- if(temp == undefined){
- alldata.push({
- StationName1:data[i].binf.StationName1,
- StationName:data[i].binf.StationName,
- moncapstd:moncapstd,
- actionvalue:parseInt(actionvalue),
- restvalue:parseInt(restvalue),
- test_curr:test_curr,
- });
- }else{
- temp.actionvalue +=parseInt(actionvalue);
- temp.restvalue += parseInt(restvalue);
- }
- }
- for(var i = (Page.pageCurr-1)*Page.pageSize;i<alldata.length && i<Page.pageCurr*Page.pageSize;i++){
- arr.push(alldata[i].StationName1);
- arr.push(alldata[i].StationName);
- arr.push(alldata[i].moncapstd);
- arr.push(alldata[i].actionvalue);
- arr.push(alldata[i].restvalue);
- arr.push((alldata[i].test_curr));
- arr.push(alldata[i].test_curr==0?formartTime(0):formartTime(alldata[i].restvalue*60/alldata[i].test_curr));
- }
- Page.pageAll = alldata.length;
- }
-
- //璁剧疆鍘嗗彶鏁版嵁鐨勮〃鏍兼暟鎹�
- function sethistorydata(data,arr){
- console.info(data);
- var alldata = new Array(); //瀛樻斁鎵�鏈夋暟鎹満鎴跨殑鏁版嵁
- for(var i=0;i<data.length;i++){
- var stationid = data[i].binf.StationId;
- var moncapstd = data[i].binf.MonCapStd;
- var monvolstd = data[i].binf.MonVolStd;
- var maxvol = data[i].tdata.max_monvol;
- var minvol = data[i].tdata.min_monvol;
- var test_cap = data[i].tdata.test_cap;
- var test_curr = data[i].tdata.test_curr;
- var actionvalue = (GetMonomerCap(moncapstd,GetHourRate(moncapstd,test_curr),test_cap,maxvol,minvol,monvolstd,CapType_Real)).toFixed(0);
- var restvalue = (GetMonomerCap(moncapstd,GetHourRate(moncapstd,test_curr),test_cap,maxvol,minvol,monvolstd,CapType_Rest)).toFixed(0);
-
- //console.info(moncapstd+"==="+actionvalue+"==="+restvalue);
- var percent = (restvalue*100/moncapstd).toFixed(1);
-
- var restTime = test_curr==0?formartTime(0):formartTime(restvalue*60/test_curr);
- var temp = getObjByStationName(alldata, data[i].binf.StationName);
- //console.info(temp);
- if(temp == undefined){
- alldata.push({
- stationid:stationid,
- StationName1:data[i].binf.StationName1,
- StationName:data[i].binf.StationName,
- moncapstd:moncapstd,
- actionvalue:parseInt(actionvalue),
- restvalue:parseInt(restvalue),
- test_curr:test_curr,
- });
- }else{
- temp.actionvalue +=parseInt(actionvalue);
- temp.restvalue += parseInt(restvalue);
- }
-
- //sconsole.info(alldata);
- }
- for(var i = (Page.pageCurr-1)*Page.pageSize;i<alldata.length && i<Page.pageCurr*Page.pageSize;i++){
- arr.push(alldata[i].StationName1);
- arr.push(alldata[i].StationName);
- arr.push(alldata[i].moncapstd);
- arr.push(alldata[i].actionvalue);
- arr.push(alldata[i].restvalue);
- arr.push((alldata[i].test_curr).toFixed(1));
- arr.push(alldata[i].test_curr==0?formartTime(0):formartTime(alldata[i].actionvalue*60/alldata[i].test_curr));
- }
- Page.pageAll = alldata.length;
- }
-
- //鍒ゆ柇station鍦╨ist涓槸鍚﹀瓨鍦�
- function getObjByStationName(list,StationName){
- var obj = undefined;
- for(var i=0;list!=undefined && i<list.length;i++){
- if(list[i].StationName == StationName){
- obj = list[i];
- break;
- }
- }
- return obj;
- }
-
- //鏍煎紡鍖栨椂闂�
- function formartTime(value){
- value = Math.abs(parseInt(value));
- //console.info(value);
- var day_num = 0;
- var hour_num = 0;
- var min_num = 0;
- if(value>=24*60){
- day_num = Math.floor(value/(24*60));
- value = value%(24*60);
- }
- if(value>=60){
- hour_num = Math.floor(value/60);
- value = value%60;
- }
- min_num = value;
- return day_num+"澶�"+hour_num+"灏忔椂"+min_num+"鍒�";
- }
-
//棣栭〉
$('#home').click(function(){
if(Page!=undefined){
--
Gitblit v1.9.1