From d2ac4b1be087011c2e060e218397432ea5508cd6 Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期二, 09 十月 2018 16:22:49 +0800
Subject: [PATCH] 包机组管理页面和电池组信息配置页面中上方的筛选条件查询所有的省,市,机房,维护区
---
gx_tieta/WebRoot/elegroup.jsp | 15 ++++++++-------
gx_tieta/WebRoot/ele-param.jsp | 6 +++---
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-param.jsp b/gx_tieta/WebRoot/ele-param.jsp
index 555548b..48c6c00 100644
--- a/gx_tieta/WebRoot/ele-param.jsp
+++ b/gx_tieta/WebRoot/ele-param.jsp
@@ -587,7 +587,7 @@
$(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("BattInfAction!serchAllStation",null,function(data){
+ $.post("BattInfAction!serchAllStation_all",null,function(data){
data=data.result;
data=eval("("+data+")");
if(data.code==1 && data.data.length>0){
@@ -616,7 +616,7 @@
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
- url: "BattInfAction!serchStationName2",
+ url: "BattInfAction!serchStationName2_all",
async:true,
dataType:'json',
data:"json = "+JSON.stringify(data),
@@ -660,7 +660,7 @@
};
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
- $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+ $.post("BattInfAction!serchStationName3_all","json="+JSON.stringify(tmp),function(data){
var rs = JSON.parse(data.result);
if(rs.code==1){
var _data = rs.data;
diff --git a/gx_tieta/WebRoot/elegroup.jsp b/gx_tieta/WebRoot/elegroup.jsp
index 14a8051..1ba172c 100644
--- a/gx_tieta/WebRoot/elegroup.jsp
+++ b/gx_tieta/WebRoot/elegroup.jsp
@@ -891,7 +891,8 @@
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
$(document).ready(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
+ $.post("BattInfAction!serchAllStation_all",null,function(data){
+ //console.info(data);
data=data.result;
data=eval("("+data+")");
//console.info(data);
@@ -904,13 +905,13 @@
$option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
$option.attr("value", "");
}else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
+ $option.text(data.data[i-1].StationName1);
+ $option.attr("value",data.data[i-1].StationName1);
}
$select.append($option);
}
}else{
- $("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
+ $("#station_name1").text('').html('<option>鏆傛湭娣诲姞鐪�</option>');
}
findCity();
});
@@ -924,7 +925,7 @@
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
- url: "BattInfAction!serchStationName2",
+ url: "BattInfAction!serchStationName2_all",
async:true,
dataType:'json',
data:"json = "+JSON.stringify(data),
@@ -968,7 +969,7 @@
};
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
- $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+ $.post("BattInfAction!serchStationName3_all","json="+JSON.stringify(tmp),function(data){
var rs = JSON.parse(data.result);
if(rs.code==1){
var _data = rs.data;
@@ -1012,7 +1013,7 @@
//var station_name1=$("#station_name1 option:selected").val();
//var station_name=$("#station_name option:selected").val();
- $.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
+ $.post("BattInfAction!serchBattByStation_all","json="+JSON.stringify(tmp),function(data){
data=data.result;
//console.info(data);
data=eval("("+data+")");
--
Gitblit v1.9.1