From 6fc40df03a5fc40a2bae976ed8fdedc4946dc584 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.21>
Date: 星期二, 20 十一月 2018 17:27:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/ele-infor-search2.html | 221 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 147 insertions(+), 74 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/ele-infor-search2.html b/gx_tieta/WebRoot/mobil/ele-infor-search2.html
index a1f3336..d02f5f5 100644
--- a/gx_tieta/WebRoot/mobil/ele-infor-search2.html
+++ b/gx_tieta/WebRoot/mobil/ele-infor-search2.html
@@ -287,9 +287,7 @@
arr[index++]=data[i].binf.MonVolStd; //鏍囩О鍗曚綋鐢靛帇
arr[index++]=data[i].binf.BattProducer; //鐢垫睜鍝佺墝
arr[index++]=data[i].binf.BattProductDate.substr(0,10); //鐢垫睜鐢熶骇鏃ユ湡
- arr[index++]=data[i].binf.BattInUseDate.substr(0,10); //鐢垫睜瀹夎鏃ユ湡
-
-
+ arr[index++]=data[i].binf.BattInUseDate.substr(0,10); //鐢垫睜瀹夎鏃ユ湡
}
console.info(Page);
createTbl(tbl, arrTh, arr);
@@ -357,7 +355,6 @@
data = eval("("+data+")");
//console.info(data);
console.info(data.code);
-
if(data.code==1&&data.data.length>0){
var $Ostation_name1=$("#mainteArea");
$Ostation_name1.text("");
@@ -378,15 +375,16 @@
}
updataSel($Ostation_name1, arr);
}
- findStationNamebyStationname1();
+ findCity();
});
//褰撶渷鏀瑰彉鏃舵洿鏂板競
function findCity(){
var data = {
- StationName1: $("#station_name1").val()
+ StationName1: $("#mainteArea").val()
};
+ console.info(data);
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -408,94 +406,169 @@
if(i == 0){
arr.push({
val:"",
- txt:"鍏ㄩ儴(鍏�"+data.sum+"涓�)",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
});
}else{
arr.push({
- val:data.data[i-1].StationName1,
- txt:data.data[i-1].StationName1,
+ val:data.data[i-1].StationName2,
+ txt:data.data[i-1].StationName2,
});
}
}
updataSel($Ostation_name1, arr);
}
- findStationNamebyStationname1();
+ findCounty();
}
});
}
-
+//褰撳競鏀瑰彉鏃舵洿鏂板尯/鍘�
+ function findCounty(){
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ };
+ console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName5",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ console.info(data);
+ console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#country");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName5,
+ txt:data.data[i-1].StationName5,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ //褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧
+ function findStationNamebyStationname1(){
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#country").val()
+ };
+ //console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName3",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ console.info(data);
+ console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#homeName");
+ $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].StationId,
+ txt:data.data[i-1].StationName3,
+ });
+ }
+ }
+ console.info(111111111111111);
+ updataSelStation($Ostation_name1, arr);
+ }
+
+ findserchByBattGroupNamebystationname();
+ }
+ });
+ }
+
+ //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�
+ function findserchByBattGroupNamebystationname(){
+
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#country").val(),
+ StationName: $("#homeName").text(),
+ StationId: $("#homeName").val()
+ };
+
+ console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName3",
+ 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:"",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName3,
+ txt:data.data[i-1].StationName3,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+
+ }
+ });
+ }
+
//褰撶淮鎶ゅ尯鏀瑰彉鏃舵洿鏂扮珯鐐�
$('#mainteArea').change(function(){
findCity();
findStationNamebyStationname1();
- });
-
- function findStationNamebyStationname1(){
- var selectvalue=$("#mainteArea option:selected").val();
- $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){
- data=data.result;
- data=eval("("+data+")");
- console.info(data);
- if(data.code==1 && data.data.length>0){
- var arr = new Array();
- for(var i=0;i<data.data.length;i++){
- //if(i == 0){
- // arr.push({
- // val:"",
- // txt:"鍏ㄩ儴(鍏�"+data.sum+"涓�)"
- // });
- //}else{
- arr.push({
- val:data.data[i].StationName,
- txt:data.data[i].StationName
- });
- //}
-
- }
- updataSel($("#homeName"), arr);
- }
- findserchByBattGroupNamebystationname();
- });
-
- }
-
+ });
$('#homeName').change(function(){
findserchByBattGroupNamebystationname();
});
-
- //鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
- var station_name1=$("#mainteArea option:selected").val();
- var station_name=$("#homeName option:selected").val();
-
- $.post("BattInfAction_serchByBattGroupName","bif.StationName1="+station_name1+"&bif.StationName="+station_name,function(data){
- data=data.result;
- //console.info(data);
- data=eval("("+data+")");
- console.info(data.data.length);
- if(data.code==1 && data.data.length>0){
- var $Obattgroup_name = $("#battgroup_name");
- var arr = new Array();
-
- for(var i=0;i<=data.data.length;i++) {
- if(i == 0) {
- arr.push({
- val: "0",
- txt: "鍏ㄩ儴(鍏�"+data.sum+"涓�)"
- });
- }else {
- arr.push({
- val: data.data[i-1].BattGroupId,
- txt: data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"鑺�"
- });
- }
- }
- updataSel($Obattgroup_name, arr);
- };
- });
- }
//鏌ヨ鐢垫睜鍝佺墝
$.post("BattInfAction_serchByBattProducer",null,function(data){
--
Gitblit v1.9.1