From 8950b527f88b682913c4c05a5e1cdd8f18e7d468 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 25 十二月 2018 15:18:15 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-approved.html | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index c99c308..3572a83 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -10,6 +10,7 @@
<link href="mobilCss/mobiscroll.core-2.5.2.css" rel="stylesheet" type="text/css" />
<link href="mobilCss/mobiscroll.animation-2.5.2.css" rel="stylesheet" type="text/css" />
<link rel="stylesheet" type="text/css" href="css/tbl.css">
+ <link rel="stylesheet" type="text/css" href="src/css/layui.css">
<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>
<style type="text/css">
@@ -129,6 +130,9 @@
</div>
</div>
+ <!-- 瀛樺偍homeinfo鐨勫�� -->
+ <div id="homeInfoIframe"></div>
+ <div id="homeInfoIframeAll"></div>
</body>
<script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
@@ -137,7 +141,7 @@
<script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
<script type="text/javascript" src="js/tbl.js"></script>
<script type="text/javascript" src="mobilJs/base.js"></script>
-
+<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
/* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳 */
@@ -149,14 +153,51 @@
window.location.href="control.html";
return ;
}
+
+ var iframePopup = ''; // 寮瑰嚭闈㈡澘鏍囪瘑绗�
function getApplyYanshouIndex(t){
var index = $(t).attr("but-index");
console.info(index);
- setApplyYanshou(index);
+ var arr=setApplyYanshou(index);
+ console.log(arr); //鏂规硶涓�锛�1鎸夐挳鎼炲畾鎵�鏈夈�傝鍦ㄦ瀵规帴鍔犲叆寮瑰嚭妗嗭紝涓婁紶瑙嗛缁忕含搴︾瓑
- return ;
+ if(arr.length == 0) {
+ layer.msg('鑾峰彇鏁版嵁澶辫触锛侊紒');
+ return ;
+ }
+
+ // 瀛樺偍鎵�鏈夌殑鏁版嵁
+ $('#homeInfoIframeAll').data('allData', arr);
+ var _data = arr[0];
+ var temp = {
+ homeId: _data.binf.StationId
+ ,homeName: _data.binf.StationName
+ ,addr: ''
+ ,lng: 0
+ ,lat: 0
+ }
+ // 瀛樺偍闇�瑕佺殑homeInfo淇℃伅
+ $('#homeInfoIframe').data('homeInfo', temp);
+
+ iframePopup = layer.open({
+ type: 2
+ ,closeBtn: 0
+ ,title: false
+ ,area: ['100%', '100%']
+ ,full: true
+ ,anim: 4
+ ,content: 'iframe/homeinfo1.html'
+ });
+
+ // applyendyanshou(arr);
+
}
-
+ function getApplyYanshoupicture(t){
+ var index = $(t).attr("but-index");
+ console.info(index);//鏂规硶2
+ var arr=setApplyYanshou(index);
+ //璇峰湪姝ゅ鎺ュ姞鍏ュ脊鍑烘
+ }
var arrTd = new Array(); //褰撳墠琛ㄦ牸td鏁版嵁
var tblCon = $('.tbl-container');
var Page = {
@@ -226,8 +267,10 @@
function yanshou(check_en){
if(check_en==0){
return "鏈獙鏀�";
- }else{
- return "宸查獙鏀�";
+ }else if(check_en==2){
+ return "宸茬敵璇烽獙鏀�";
+ }else if(check==1){
+ return"宸插畬鎴愰獙鏀�";s
}
}
// 鏌ヨ鍐呭
@@ -290,6 +333,8 @@
arrTd[index++] = yanshou(data[i].check_en);
arrTd[index++]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</a>'+
'<a onclick="getApplyYanshouIndex(this)" href="#myPopup" id="apply_yanshou" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>鐢宠楠屾敹</a>';
+ //鏂规硶2 2鎸夐挳瑙ｅ紑浠ヤ笅涓�鏉℃敞閲婃寜閽�
+ //'<a onclick="getApplyYanshoupicture(this)" href="#myPopup" id="apply_yanshou" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>缁忕含搴﹀浘鐗囦笂浼�</a>'
}
}
console.info(arrTd);
@@ -307,9 +352,9 @@
function setApplyYanshou(index){
console.info(arrdata);
- if(arrdata.length>0){ //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
- //璇峰湪姝ゅ鎺ュ姞鍏ュ璇濇锛屾渶鍚庤皟鐢ㄧ敵璇烽獙鏀舵柟娉曪紝浼犲叆arrdata,index鍙傛暟
- creatYanshouObj(arrdata,index);//鐢宠楠屾敹鏂规硶銆�
+ if(arrdata.length>0){ //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
+ var arr= creatYanshouObj(arrdata,index);//鐢宠楠屾敹鏂规硶銆�
+ return arr;
}else{
alert("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
}
@@ -365,7 +410,14 @@
}
}
console.info(arr);
- var temp = JSON.stringify(arr);
+
+
+ return arr;
+ //applyendyanshou(arr);//鐢宠楠屾敹鏂规硶銆�
+ }
+
+ function applyendyanshou(arr){
+ var temp = JSON.stringify(arr);
$.ajax({ //鐢宠楠屾敹
type: 'post',
async: true,
@@ -380,6 +432,7 @@
}
}
});
+
}
function setcookiedit(index){
var arrcookie = new Array();
--
Gitblit v1.9.1