From 0d3439eff37ad2c5d1b998adb48be70ff4d7fd02 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期五, 18 一月 2019 14:43:36 +0800
Subject: [PATCH] 修改测试数据跳转链接
---
gx_tieta/WebRoot/mobil/battM.html | 7 ++-
gx_tieta/WebRoot/mobil/homeList.html | 20 +++++-----
gx_tieta/WebRoot/mobil/testdata.html | 11 +++--
gx_tieta/WebRoot/mobil/machineroomM.html | 13 +++++-
gx_tieta/WebRoot/mobil/selectbatt.html | 2
gx_tieta/WebRoot/mobil/index.html | 2
gx_tieta/WebRoot/mobil/mobilJs/base.js | 8 ----
gx_tieta/WebRoot/mobil/control.html | 30 ++++++++-------
gx_tieta/WebRoot/mobil/history.html | 5 ++
9 files changed, 55 insertions(+), 43 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/battM.html b/gx_tieta/WebRoot/mobil/battM.html
index 3e44dba..671441e 100644
--- a/gx_tieta/WebRoot/mobil/battM.html
+++ b/gx_tieta/WebRoot/mobil/battM.html
@@ -14,7 +14,7 @@
<!-- 涓夌骇鑿滃崟鍐呭 -->
<div data-role="page">
<div data-role="header" data-position="fixed">
- <a href="homeList.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
+ <a href="selectbatt.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
<h1>钃勭數姹犵粍</h1>
</div>
@@ -44,7 +44,10 @@
var data = [
{url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
- {url: 'homeList.html', txt: temp.StationName},
+ {url: 'javascript:JumpFirstPage();', txt:temp.StationName1},
+ {url: 'javascript:JumpcityPage();', txt: temp.StationName2},
+ {url: 'selectcounty.html', txt: temp.StationName5 },
+ {url: 'selectbatt.html', txt: temp.StationName3 },
{url: 'javascript:;', txt: '钃勭數姹犵粍'}
];
addBreadCrumb($('.breadcrumb').eq(0),data);
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index 4888c9d..911f6ce 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -23,7 +23,7 @@
</div>
<div data-role="content">
- <!-- <ul class="breadcrumb"></ul> -->
+ <ul class="breadcrumb"></ul>
<ul data-role="listview" data-inset="true">
<li>
<a href="voltageM.html" target="_top">1.鍗曚綋鐢靛帇 </a>
@@ -52,7 +52,7 @@
<div data-role="collapsible" data-collapsed="false">
<h1 id="zhuangtai">鐢垫睜缁勭姸鎬�</h1>
<div class="tbl-container"></div>
- </div>
+ </div>
<div data-role="footer" data-position="fixed" data-theme="a">
<div data-role="navbar">
<ul>
@@ -61,7 +61,8 @@
<li><a href="" id="signalqual" class="ui-btn ui-btn-inline ui-corner-all ui-btn-icon-check" data-icon="check" data-role="button">淇″彿璐ㄩ噺</a></li>
</ul>
</div>
- </div>
+ </div>
+ </div>
<script type="text/javascript" src="js/tbl.js"></script>
<script type="text/javascript" src="mobilJs/base.js"></script>
<script type="text/javascript" src="js/battNav.js"></script>
@@ -422,12 +423,12 @@
loadclose();
//}
}else{
- noContent.showNoContent('鏌ヨ澶辫触!');
+ alert('鏌ヨ澶辫触!');
loadclose();
}
},
error: function() {
- noContent.showNoContent('鏌ヨ澶辫触!');
+ alert('鏌ヨ澶辫触!');
loadclose();
// 鍏抽棴绛夊緟
}
@@ -457,14 +458,15 @@
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: '瀹炴椂-鐩戞祴鏁版嵁'}
- ];
+ {url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
+ {url: 'javascript:JumpFirstPage();', txt: batt.StationName1},
+ {url: 'javascript:JumpcityPage();', txt: batt.StationName2},
+ {url: 'selectcounty.html', txt: batt.StationName5 },
+ {url: 'selectbatt.html', txt: batt.StationName3 },
+ {url: 'battM.html', txt: batt.BattGroupName}, // 鐢垫睜缁�
+ {url: 'testdata.html', txt: '鐢垫睜缁勬暟鎹�'}, // 褰撳墠椤甸潰
+ {url: 'javascript:;', txt: '瀹炴椂-鐩戞祴鏁版嵁'}
+ ];
/*var data = [
{url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
{url: 'machineroomM.html', txt: batt.StationName}, // 鏈烘埧
@@ -475,7 +477,7 @@
if(batt.install_user||batt.install_user==0){
}else{
- //addBreadCrumb($('.breadcrumb').eq(0), data);
+ addBreadCrumb($('.breadcrumb').eq(0), data);
}
});
diff --git a/gx_tieta/WebRoot/mobil/history.html b/gx_tieta/WebRoot/mobil/history.html
index 1c88107..75ef06f 100644
--- a/gx_tieta/WebRoot/mobil/history.html
+++ b/gx_tieta/WebRoot/mobil/history.html
@@ -236,7 +236,10 @@
var batt = JSON.parse(temp);
var data = [
{url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
- {url: 'homeList.html', txt: batt.StationName}, // 鏈烘埧
+ {url: 'javascript:JumpFirstPage();', txt: batt.StationName1},
+ {url: 'javascript:JumpcityPage();', txt: batt.StationName2},
+ {url: 'selectcounty.html', txt: batt.StationName5 },
+ {url: 'selectbatt.html', txt: batt.StationName3 },
{url: 'battM.html', txt: batt.BattGroupName}, // 鐢垫睜缁�
{url: 'testdata.html', txt: '鐢垫睜缁勬暟鎹�'}, // 鐢垫睜缁勬暟鎹�
{url: 'javascript:;', txt: '鍘嗗彶-鐩戞祴鏁版嵁'} // 鐢垫睜缁勬暟鎹�
diff --git a/gx_tieta/WebRoot/mobil/homeList.html b/gx_tieta/WebRoot/mobil/homeList.html
index 320ac9d..60e0f00 100644
--- a/gx_tieta/WebRoot/mobil/homeList.html
+++ b/gx_tieta/WebRoot/mobil/homeList.html
@@ -15,12 +15,12 @@
<body>
<div data-role="page" tabindex="0" id="page0">
<div data-role="header" data-position="fixed">
- <a href="index.html" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
+ <a href="javascript:window.history.go(-1)" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
<h1>鏈烘埧鍒楄〃</h1>
</div>
<div data-role="content">
<div class="home-search-input-container">
- <input type="text" data-type="search" name="search" id="searchInput" placeholder="鎼滅储鍐呭...">
+ <input type="text" data-type="search" name="search" id="searchInput" placeholder="鎼滅储鍐呭..." autofocus="autofocus">
</div>
<div id="battList"></div>
</div>
@@ -35,14 +35,6 @@
<script type="text/javascript" src="src/layui.all.js"></script>
<script src="app/js/common.js"></script>
<script type="text/javascript">
- var stationlist = new Array();
-
- // 鍒濆鍖栭〉闈㈠唴瀹�
- $(document).ready(function(){
- setCookie("station",null);
- setCookie("batt",null);
- });
-
// 椤甸潰鍒濆鍖栧畬鎴�
$(document).on('pageinit', function(event) {
setTimeout(function() {
@@ -81,11 +73,17 @@
StationName2: homeData.city,
StationName5: homeData.county,
StationName: homeData.home,
+ StationName3: homeData.home3,
StationId: homeData.homeid
};
var json=window.JSON.stringify(temp);
+
+ //璁剧疆蹇呰鐨刢ookie
+ setCookie('StationName1', json);
+ setCookie('city', json);
+ setCookie('county', json);
setCookie("battselect",json);
window.location.href="battM.html";
});
@@ -105,6 +103,7 @@
if(rs.code==1){
homeSource = [];
var data = rs.data;
+ console.log(data);
for(var i=0; i<data.length; i++) {
var _data = data[i];
var tmp = {
@@ -112,6 +111,7 @@
province: _data.StationName1,
city: _data.StationName2,
county: _data.StationName5,
+ home3: _data.StationName3,
home: _data.StationName,
homeid: _data.StationId
};
diff --git a/gx_tieta/WebRoot/mobil/index.html b/gx_tieta/WebRoot/mobil/index.html
index b2ac67b..dcee04e 100644
--- a/gx_tieta/WebRoot/mobil/index.html
+++ b/gx_tieta/WebRoot/mobil/index.html
@@ -20,7 +20,7 @@
<div data-role="content" >
<ul data-role="listview" data-icon="false" data-inset="true">
<li>
- <a href="homeList.html" target="_top" data-i18n="main.index">娴嬭瘯鏁版嵁</a>
+ <a href="machineroomM.html" target="_top" data-i18n="main.index">娴嬭瘯鏁版嵁</a>
</li>
<li>
<a href="ele-param2.html" target="_top" data-i18n="main.warningmanagement">鐢垫睜瀹夎鐢宠</a>
diff --git a/gx_tieta/WebRoot/mobil/machineroomM.html b/gx_tieta/WebRoot/mobil/machineroomM.html
index 8bac758..ba2a943 100644
--- a/gx_tieta/WebRoot/mobil/machineroomM.html
+++ b/gx_tieta/WebRoot/mobil/machineroomM.html
@@ -20,6 +20,9 @@
<div data-role="content">
<ul class="breadcrumb"></ul>
+ <div class="home-search-input-container">
+ <input type="text" data-type="search" name="search" id="searchInput" placeholder="鎼滅储鍐呭...">
+ </div>
<div id="battList"></div>
</div>
<div data-role="popup" id="myPopup" class="defined-popup">
@@ -41,7 +44,7 @@
</div>
</div>
<div data-role="footer" data-position="fixed">
- <!-- <h1>绂忓厜鐢靛瓙鏈夐檺鍏徃</h1> -->
+
</div>
</div>
</body>
@@ -67,7 +70,13 @@
setCookie("StationName1",json);
window.location.href="selectcity.html";
});
-
+
+
+ // 鐐瑰嚮鎼滅储妗嗚烦杞埌homeList椤甸潰
+ $('#searchInput').click(function() {
+ $(this).blur();
+ window.location.href="homeList.html";
+ });
});
// 瀹氫箟闈㈠寘灞戝鑸潯
diff --git a/gx_tieta/WebRoot/mobil/mobilJs/base.js b/gx_tieta/WebRoot/mobil/mobilJs/base.js
index 8692578..e0bec83 100644
--- a/gx_tieta/WebRoot/mobil/mobilJs/base.js
+++ b/gx_tieta/WebRoot/mobil/mobilJs/base.js
@@ -278,17 +278,9 @@
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/selectbatt.html b/gx_tieta/WebRoot/mobil/selectbatt.html
index c057d5f..5461958 100644
--- a/gx_tieta/WebRoot/mobil/selectbatt.html
+++ b/gx_tieta/WebRoot/mobil/selectbatt.html
@@ -50,7 +50,7 @@
{url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
{url: 'javascript:JumpFirstPage();', txt:temp.StationName1},
{url: 'javascript:JumpcityPage();', txt: temp.StationName2},
- {url: 'machineroomM.html', txt: temp.StationName5 },
+ {url: 'selectcounty.html', txt: temp.StationName5 },
{url: 'javascript:;', txt: '鏈烘埧'}
];
addBreadCrumb($('.breadcrumb').eq(0),data);
diff --git a/gx_tieta/WebRoot/mobil/testdata.html b/gx_tieta/WebRoot/mobil/testdata.html
index e9ce303..faa2294 100644
--- a/gx_tieta/WebRoot/mobil/testdata.html
+++ b/gx_tieta/WebRoot/mobil/testdata.html
@@ -62,15 +62,18 @@
<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
$(function() {
- //console.warn(111133);
- console.info(batt);
+ //console.warn(111133);
+ temp = JSON.parse(temp);
var data = [
{url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
- {url: 'homeList.html' , txt:batt.StationName},
+ {url: 'javascript:JumpFirstPage();', txt:temp.StationName1},
+ {url: 'javascript:JumpcityPage();', txt: temp.StationName2},
+ {url: 'selectcounty.html', txt: temp.StationName5 },
+ {url: 'selectbatt.html', txt: temp.StationName3 },
{url: 'battM.html', txt: batt.BattGroupName}, // 鐢垫睜缁�
{url: 'javascript:;', txt: '鐢垫睜缁勬暟鎹�'} // 褰撳墠椤甸潰
];
- console.info(data);
+
addBreadCrumb($('.breadcrumb').eq(0), data);
});
--
Gitblit v1.9.1