From 26aca5663d83a7f3b17a258e1ad57218564ecd9c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.28>
Date: 星期五, 28 九月 2018 16:33:08 +0800
Subject: [PATCH] chenjingjing gx
---
gx_tieta/WebRoot/batt-life-manage.jsp | 40 +++++++++++++++++++++++++++-------------
gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java | 4 ++--
2 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index ae9cfb8..09f4171 100644
--- a/gx_tieta/WebRoot/batt-life-manage.jsp
+++ b/gx_tieta/WebRoot/batt-life-manage.jsp
@@ -86,14 +86,14 @@
</select>
</td>
<td>
- <select id="">
+ <select id="is_stand">
<option value=100>鍏ㄩ儴</option>
<option value=1>鏄�</option>
<option value=0>鍚�</option>
</select>
</td>
<td>
- <select id="">
+ <select id="actual_timelong">
<option value =0>鍏ㄩ儴</option>
<option value=60>瀹為檯缁埅鏃堕棿灏忎簬1灏忔椂</option>
<option value=120>瀹為檯缁埅鏃堕棿灏忎簬2灏忔椂</option>
@@ -378,7 +378,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
@@ -393,20 +393,34 @@
//鏋勯�犳煡璇㈡潯浠�
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 = {
+ stationName:$('#station_name').val(), //鏈烘埧鍚�
+ stationName2:$('#city').val(), //甯�
+ stationName1:$('#station_name1').val(), //鐪�
+ is_out_stand:$('#is_stand').val(), //鏄惁鎺夌珯
+ endurance_actual_timelong:$('#actual_timelong').val(), //瀹為檯
};
- //console.info(temp);
+ console.info(temp);
return temp;
}
-
+ function searchBattLife(){
+ var temp = createSearchParam();
+ var json = JSON.stringify(temp);
+ $.ajax({
+ type:"post",
+ url:"Batt_enduranceAction!serchByCondition",
+ async:true,
+ datatype:'text',
+ data:"json="+json,
+ success:function(data){
+ console.info(data);
+ var data = JSON.parse(data.result);
+
+ console.info(data);
+ }
+ })
+ }
//棣栭〉
$('#home').click(function(){
if(Page!=undefined){
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
index 0f02da4..55123a3 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -50,7 +50,7 @@
sql+=stationSql;
//瀹為檯缁埅鏃堕棿
String timelongSqlT=" and endurance_actual_timelong<=? ";//灏忎簬鏌愪竴鏃堕棿
- String timelongSqlF=" and endurance_actual_timelong!=? ";//鍏ㄩ儴
+ String timelongSqlF=" and endurance_actual_timelong>=? ";//鍏ㄩ儴
if(bendurance.getEndurance_actual_timelong()==0){
sql+=timelongSqlF;
}else{
@@ -108,7 +108,7 @@
ben.setStationName("");
ben.setStationName1("");
ben.setStationName2("");
- ben.setEndurance_actual_timelong(120);
+ ben.setEndurance_actual_timelong(60);
ben.setIs_out_stand(100);
List list=bimpl.serchByCondition(ben);
System.out.println(list.size());
--
Gitblit v1.9.1