From ee2c6ed5cd4aaf0a2e66c96f7262a9d156a90024 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期四, 17 一月 2019 17:31:51 +0800
Subject: [PATCH] 修改基站信息
---
gx_tieta/WebRoot/mobil/testdata.html | 61 ++++++++++++++++++++++++++++++
gx_tieta/WebRoot/mobil/control.html | 5 +-
gx_tieta/WebRoot/mobil/hcheckAccpet.html | 1
3 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index b8d9cdf..5b58311 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -68,7 +68,7 @@
<script>
var arrTh = ['鐢垫睜鐘舵�侊細', '绔數鍘嬶細', '鐢垫睜鐢垫祦锛�', '娴嬭瘯鏃ユ湡锛�', '娴嬭瘯鏃堕暱锛�', '娴嬭瘯瀹归噺锛�', '鍓╀綑瀹归噺锛�', '缁埅鏃堕棿锛�'];
var tbl = $('.tbl-container').eq(1);
- var jifangarrTh = ['SD鍗�','閫氳璁℃暟','閫氫俊涓㈠寘鐜�','璁惧宸ヤ綔鐘舵��']
+ var jifangarrTh = ['SD鍗�','閫氳璁℃暟','閫氫俊涓㈠寘鐜�','娴嬭瘯缁勫彿','璁惧宸ヤ綔鐘舵��']
var tbl1 = $('.tbl-container').eq(0);
var arrtdjifangstate = new Array;
var temp = getCookie("batt");
@@ -258,7 +258,8 @@
arrTd1.push(jishu);
var diubao=(data.dev_commcount==0?0:(data.dev_errcommcount*100/data.dev_commcount)).toFixed(2);
arrTd1.push(diubao);
- arrTd1.push(workstate(data.dev_workstate))
+ arrTd1.push("鐢垫睜缁�"+data.dev_testgroupnum);
+ arrTd1.push(workstate(data.dev_workstate));
createTbl(tbl1, jifangarrTh, arrTd1);
}else{
var arrTd2 = new Array();
diff --git a/gx_tieta/WebRoot/mobil/hcheckAccpet.html b/gx_tieta/WebRoot/mobil/hcheckAccpet.html
index 748e036..9a14f05 100644
--- a/gx_tieta/WebRoot/mobil/hcheckAccpet.html
+++ b/gx_tieta/WebRoot/mobil/hcheckAccpet.html
@@ -261,6 +261,7 @@
,lng: lng
,lat: lat
}
+ console.info(temp);
// 鏄剧ず鏆傛棤鍙绔欑偣
if(homeId == 0) {
layer.msg(homeName);
diff --git a/gx_tieta/WebRoot/mobil/testdata.html b/gx_tieta/WebRoot/mobil/testdata.html
index 3d4fb43..068db47 100644
--- a/gx_tieta/WebRoot/mobil/testdata.html
+++ b/gx_tieta/WebRoot/mobil/testdata.html
@@ -52,12 +52,14 @@
<a href="battinfors.html" target="_top" data-ajax="false">鐢垫睜缁勪俊鎭�</a>
</li>
<li>
- <a href="base-station-info.html" target="_top" data-ajax="false">鍩虹珯淇℃伅</a>
+ <a href="" id="jizhandata" target="_top" data-ajax="false">鍩虹珯淇℃伅</a>
</li>
</ul>
</div>
+ <div id="homeInfoIframe"></div>
<script type="text/javascript" src="js/battNav.js"></script>
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
$(function() {
//console.warn(111133);
@@ -73,6 +75,63 @@
console.info(data);
addBreadCrumb($('.breadcrumb').eq(0), data);
});
+
+ $("#jizhandata").off('click').on('click.cjj1123',function(){
+ var temp = getCookie("batt");
+ temp = JSON.parse(temp);
+ console.info(temp);
+ var data = temp;
+ var lng = 0; // 鑾峰彇缁忓害
+ var lat = 0; // 鑾峰彇绾害
+ var addr = ""; // 鑾峰彇鍦板潃
+ var homeId = data.StationId; // 鏈烘埧Id
+ var homeName = data.StationName; // 鏈烘埧鍚嶇О
+ var _temp = {
+ homeId: homeId
+ ,homeName: homeName
+ ,addr: addr
+ ,lng: lng
+ ,lat: lat
+ }
+ console.info(_temp);
+ // 鏄剧ず鏆傛棤鍙绔欑偣
+ if(homeId == 0) {
+ alert(homeName);
+ return;
+ }
+ $('#homeInfoIframe').data('homeInfo', _temp);
+ 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();
+ }
+ });
+ 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>
</div>
</body>
--
Gitblit v1.9.1