From 864e4772eea5e0a589b6f6797d0695a3b3dd225e Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:19:31 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/testdata.html | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/testdata.html b/gx_tieta/WebRoot/mobil/testdata.html
index 068db47..faa2294 100644
--- a/gx_tieta/WebRoot/mobil/testdata.html
+++ b/gx_tieta/WebRoot/mobil/testdata.html
@@ -62,17 +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: '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: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);
});
@@ -114,22 +115,7 @@
,end: function() {
$('div[data-role=page]').show();
}
- });
- iframePopup = layer.open({
- type: 2
- ,closeBtn: 0
- ,title: false
- ,area: ['100%', '100%']
- ,full: true
- ,anim: 4
- ,content: 'iframe/seenhomeinfo.html'
- ,success: function() {
- $('div[data-role=page]').hide();
- }
- ,end: function() {
- $('div[data-role=page]').show();
- }
- });
+ });
layer.full(iframePopup);
})
</script>
--
Gitblit v1.9.1