From cc5eabb8129f374d2a9edc0ad01f3f6803ec1a29 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.23>
Date: 星期二, 20 十一月 2018 10:01:30 +0800
Subject: [PATCH] 检测数据，目录
---
gx_tieta/WebRoot/mobil/battM.html | 33 ++++++----
gx_tieta/WebRoot/mobil/ele-infor-search2.html | 61 +++++++++++++++++++-
gx_tieta/WebRoot/mobil/testdata.html | 12 +++-
gx_tieta/WebRoot/mobil/machineroomM.html | 6 +-
gx_tieta/WebRoot/mobil/selectcounty.html | 20 ++++--
gx_tieta/WebRoot/mobil/mobilJs/base.js | 9 ++
gx_tieta/WebRoot/mobil/control.html | 11 +++
gx_tieta/WebRoot/mobil/selectcity.html | 14 +++-
8 files changed, 132 insertions(+), 34 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/battM.html b/gx_tieta/WebRoot/mobil/battM.html
index 278f575..ea2dbf0 100644
--- a/gx_tieta/WebRoot/mobil/battM.html
+++ b/gx_tieta/WebRoot/mobil/battM.html
@@ -34,17 +34,18 @@
$(document).ready(function(){
setCookie('batt', '');
- init();
+ //init();
+ searchkBattByStationid();
});
- function init(){
- var temp = getCookie("station");
+ /* function init(){
+ var temp = getCookie("county");
if(temp != '' || temp != undefined) {
temp = eval('('+temp+')');
var data = [
{url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
- {url: 'machineroomM.html', txt: temp.StationName },
+ {url: 'machineroomM.html', txt: temp.StationName5 },
{url: 'javascript:;', txt: '钃勭數姹犵粍'}
];
addBreadCrumb($('.breadcrumb').eq(0),data);
@@ -53,23 +54,29 @@
}else {
window.location.href="machineroomM.html";
}
- }
+ }*/
+ var temp = getCookie("county");
+ temp = JSON.parse(temp);
+ console.info(temp);
//鏍规嵁鏈烘埧id鏌ヨ鐢垫睜缁�
- function searchkBattByStationid(stationid){
+ function searchkBattByStationid(){
loadshow();
+ var data = {
+ StationName1: temp.StationName1,
+ StationName2: temp.StationName2,
+ StationName5: temp.StationName5
+ };
$.ajax({
type: "post",
- url: "BattInfAction!serchBattByStation",
+ url: "BattInfAction!serchStationName3",
async:true,
dataType:'text',
- data:"json = "+JSON.stringify({
- StationId:stationid
- }),
+ data:"json = "+JSON.stringify(data),
success: function(data){
data = eval('('+data+')');
var model = eval('('+data.result+')');
- //console.info(model);
+ console.info(model);
if(model.code == 1){
battinlist = model.data;
createUl($('#battList2'), model.data);
@@ -98,7 +105,7 @@
for (var i = 0; i < dataList.length; i++){
var _li = $('<li></li');
- var _a = $('<a href="javascript:void(0);" target="_top" data-ajax="false" value="" data-transition="slide">'+dataList[i].BattGroupName+'</a>');
+ var _a = $('<a href="javascript:void(0);" target="_top" data-ajax="false" value="" data-transition="slide">'+dataList[i].StationName3+'</a>');
// 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
_li.append(_a);
_ul.append(_li);
@@ -135,7 +142,7 @@
$(function(){
$('.breadcrumb').on('tap', 'a[href="#page0"]', function() {
list=getList(battinlist,0,batt);
- init();
+ //init();
});
});
</script>
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index 797846c..be1daec 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -175,12 +175,21 @@
var temp = getCookie("batt");
var batt = JSON.parse(temp);
var data = [
+ {url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
+ {url: 'machineroomM.html', txt: batt.StationName1}, // 鐪�
+ {url: 'selectcity.html' , txt:batt.StationName2},//甯�
+ {url: 'selectcounty.html' , txt:batt.StationName5},
+ {url: 'battM.html', txt: batt.StationName3}, // 鐢垫睜缁�
+ {url: 'testdata.html', txt: '鐢垫睜缁勬暟鎹�'}, // 褰撳墠椤甸潰
+ {url: 'javascript:;', txt: '瀹炴椂-鐩戞祴鏁版嵁'}
+ ];
+ /*var data = [
{url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
{url: 'machineroomM.html', txt: batt.StationName}, // 鏈烘埧
{url: 'battM.html', txt: batt.BattGroupName}, // 鐢垫睜缁�
{url: 'testdata.html', txt: '鐢垫睜缁勬暟鎹�'}, // 鐢垫睜缁勬暟鎹�
{url: 'javascript:;', txt: '瀹炴椂-鐩戞祴鏁版嵁'} // 鐢垫睜缁勬暟鎹�
- ];
+ ];*/
addBreadCrumb($('.breadcrumb').eq(0), data);
});
diff --git a/gx_tieta/WebRoot/mobil/ele-infor-search2.html b/gx_tieta/WebRoot/mobil/ele-infor-search2.html
index e957c90..a1f3336 100644
--- a/gx_tieta/WebRoot/mobil/ele-infor-search2.html
+++ b/gx_tieta/WebRoot/mobil/ele-infor-search2.html
@@ -90,12 +90,20 @@
<div class="fg-panel-header">绛涢��</div>
<div class="fg-panel-content">
<fieldset data-role="controlgroup">
- <p>缁存姢鍖�</p>
+ <p>鐪�</p>
<select id="mainteArea" data-mini="true">
<option value="">鍏ㄩ儴</option>
<option value="">涓�鏋㈢航</option>
<option value="">浜屾灑绾�</option>
<option value="">鏋㈢航妤�</option>
+ </select>
+ <p>甯�</p>
+ <select id="city" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ <p>鍖�/鍘�</p>
+ <select id="country" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
</select>
<p>鏈烘埧绔欑偣</p>
<select id="homeName" data-mini="true">
@@ -310,6 +318,8 @@
},
binf:{
StationName1:$('#mainteArea').val(),
+ StationName2:$('#city').val(),
+ StationName5:$('#county').val(),
StationName:$('#homeName').val(),
BattGroupId:$('#battgroup_name').val(),
BattProducer:$('#batt_producer').val(),
@@ -341,7 +351,7 @@
return temp;
}
// stringify(createSearchForm());
- //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
+ //椤甸潰鍔犺浇鏃舵煡璇㈢渷
$.post("BattInfAction_serchByStation",null,function(data){
data = data.result;
data = eval("("+data+")");
@@ -371,8 +381,53 @@
findStationNamebyStationname1();
});
+
+//褰撶渷鏀瑰彉鏃舵洿鏂板競
+ 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){
+ data = data.result;
+ data = eval("("+data+")");
+ console.info(data);
+ console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#city");
+ $Ostation_name1.text("");
+ 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-1].StationName1,
+ txt:data.data[i-1].StationName1,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+
//褰撶淮鎶ゅ尯鏀瑰彉鏃舵洿鏂扮珯鐐�
- $('#mainteArea').change(function(){
+ $('#mainteArea').change(function(){
+ findCity();
findStationNamebyStationname1();
});
diff --git a/gx_tieta/WebRoot/mobil/machineroomM.html b/gx_tieta/WebRoot/mobil/machineroomM.html
index d4602ea..d32aa37 100644
--- a/gx_tieta/WebRoot/mobil/machineroomM.html
+++ b/gx_tieta/WebRoot/mobil/machineroomM.html
@@ -64,8 +64,8 @@
station = getbatt(stationlist,aLi);
var json=window.JSON.stringify(station);
- setCookie("station",json);
- window.location.href="battM.html";
+ setCookie("StationName1",json);
+ window.location.href="selectcity.html";
});
});
@@ -79,7 +79,7 @@
addBreadCrumb($('.breadcrumb').eq(0),data);
});
- //鏌ヨ鎵�鏈夋満鎴�
+ //鏌ヨ鎵�鏈夊競
function seachAllStation(){
loadshow();
$.ajax({
diff --git a/gx_tieta/WebRoot/mobil/mobilJs/base.js b/gx_tieta/WebRoot/mobil/mobilJs/base.js
index 0bb9858..15337e3 100644
--- a/gx_tieta/WebRoot/mobil/mobilJs/base.js
+++ b/gx_tieta/WebRoot/mobil/mobilJs/base.js
@@ -278,10 +278,17 @@
function addBreadCrumb(breadcrumb, data) {
// 娓呯悊瀵艰埅鍐呭
breadcrumb.text("");
-
+
+
+
+
+
+ console.log(data);
+
// 閬嶅巻data鍚戝鍣ㄤ腑娣诲姞鍐呭
for(var i = 0; i < data.length; i++) {
var li;
+ console.warn(data[i].txt);
if(data[i].txt.trim().length > 0) {
if(i == data.length-1) {
li= $('<li><a href="'+data[i].url+'" class="active">'+data[i].txt+'</a></li>');
diff --git a/gx_tieta/WebRoot/mobil/selectcity.html b/gx_tieta/WebRoot/mobil/selectcity.html
index 8c330d6..2438891 100644
--- a/gx_tieta/WebRoot/mobil/selectcity.html
+++ b/gx_tieta/WebRoot/mobil/selectcity.html
@@ -79,16 +79,22 @@
];
addBreadCrumb($('.breadcrumb').eq(0),data);
});
-
+ var temp=getCookie("StationName1");
+ temp = JSON.parse(temp);
+ console.info(temp);
//鏌ヨ鎵�鏈夋満鎴�
function seachAllCity(){
loadshow();
+ var data = {
+ StationName1: temp.StationName1
+ };
+ console.info(data);
$.ajax({
type: "post",
- url: "",
+ url: "BattInfAction!serchStationName2",
async:true,
dataType:'text',
- data:null,
+ data:"json = "+JSON.stringify(data),
success: function(data){
data = eval('('+data+')');
var model = eval('('+data.result+')');
@@ -125,7 +131,7 @@
for (var i = 0; i < dataList.length; i++){
var _li = $('<li></li');
- var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i].StationName+'</a>');
+ var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i].StationName2+'</a>');
// 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
_li.append(_a);
diff --git a/gx_tieta/WebRoot/mobil/selectcounty.html b/gx_tieta/WebRoot/mobil/selectcounty.html
index ddfba49..2007bb1 100644
--- a/gx_tieta/WebRoot/mobil/selectcounty.html
+++ b/gx_tieta/WebRoot/mobil/selectcounty.html
@@ -47,7 +47,7 @@
</body>
<script type="text/javascript" src="js/battNav.js"></script>
<script type="text/javascript">
- var countylist = new Array();
+ var countrylist = new Array();
// 鍒濆鍖栭〉闈㈠唴瀹�
$(document).ready(function(){
@@ -80,22 +80,30 @@
];
addBreadCrumb($('.breadcrumb').eq(0),data);
});
-
+ //var temp=getCookie("StationName1");
+ var temp = getCookie("city");
+ temp = JSON.parse(temp);
+ //console.info(temp);
+ //console.info(temp2);
//鏌ヨ鎵�鏈夋満鎴�
function seachAllCounty(){
loadshow();
+ var data = {
+ StationName1: temp.StationName1,
+ StationName2: temp.StationName2
+ };
$.ajax({
type: "post",
- url: "",
+ url: "BattInfAction!serchStationName5",
async:true,
dataType:'text',
- data:null,
+ data:"json = "+JSON.stringify(data),
success: function(data){
data = eval('('+data+')');
var model = eval('('+data.result+')');
console.info(model);
if(model.code == 1){
- countylist = model.data;
+ countrylist = model.data;
createUl($('#battList'),model.data);
}else {
//alert(213);
@@ -126,7 +134,7 @@
for (var i = 0; i < dataList.length; i++){
var _li = $('<li></li');
- var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i].StationName+'</a>');
+ var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i].StationName5+'</a>');
// 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
_li.append(_a);
diff --git a/gx_tieta/WebRoot/mobil/testdata.html b/gx_tieta/WebRoot/mobil/testdata.html
index faf2022..9839d58 100644
--- a/gx_tieta/WebRoot/mobil/testdata.html
+++ b/gx_tieta/WebRoot/mobil/testdata.html
@@ -11,7 +11,7 @@
<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
<script type="text/javascript" src="mobilJs/base.js"></script>
- <script type="text/javascript" src="js/battNav.js"></script>
+ <!-- <script type="text/javascript" src="js/battNav.js"></script> -->
<!--<link rel="stylesheet" type="text/css" href="./styles.css">-->
<style>
span {
@@ -52,14 +52,20 @@
</ul>
</div>
+ <script type="text/javascript" src="js/battNav.js"></script>
<script type="text/javascript">
$(function() {
+ console.warn(111133);
+ console.info(batt);
var data = [
{url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
- {url: 'machineroomM.html', txt: batt.StationName}, // 鏈烘埧
- {url: 'battM.html', txt: batt.BattGroupName}, // 鐢垫睜缁�
+ {url: 'machineroomM.html', txt: batt.StationName1}, // 鐪�
+ {url: 'selectcity.html' , txt:batt.StationName2},//甯�
+ {url: 'selectcounty.html' , txt:batt.StationName5},
+ {url: 'battM.html', txt: batt.StationName3}, // 鐢垫睜缁�
{url: 'javascript:;', txt: '鐢垫睜缁勬暟鎹�'} // 褰撳墠椤甸潰
];
+ console.info(data);
addBreadCrumb($('.breadcrumb').eq(0), data);
});
</script>
--
Gitblit v1.9.1