From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改

---
 gx_tieta/WebRoot/mobil/wapprovalBatt.html |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/wapprovalBatt.html b/gx_tieta/WebRoot/mobil/wapprovalBatt.html
index 4915da4..4cd59b1 100644
--- a/gx_tieta/WebRoot/mobil/wapprovalBatt.html
+++ b/gx_tieta/WebRoot/mobil/wapprovalBatt.html
@@ -110,8 +110,6 @@
 		</div>
 		<!-- 涓讳綋鍐呭 -->
 		<div data-role="main">
-			<div class="pre-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-l ui-btn-icon-notext">鍥炬爣</a></div>
-			<div class="next-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext">鍥炬爣</a></div>	
 			<!-- 琛ㄦ牸瀹瑰櫒 -->
 			<div class="tbl-container"></div>
 			<table data-role="table" class="ui-responsive ui-shadow" id="tab" >
@@ -152,7 +150,7 @@
 	var iframePopup = '';		// 寮瑰嚭闈㈡澘鏍囪瘑绗�
 		
 		// 瀛樺偍鎵�鏈夌殑鏁版嵁
-		$('#homeInfoIframeAll').data('allData', arr);
+	/*	$('#homeInfoIframeAll').data('allData', arr);
 		var _data = arr[0];
 		var temp = {
 			homeId: _data.binf.StationId
@@ -174,7 +172,7 @@
                 ,content: 'iframe/homeinfo1.html'
             });
             layer.full(iframePopup);
-		
+		*/
 
 
     var arrTd = new Array();		//褰撳墠琛ㄦ牸td鏁版嵁
@@ -185,7 +183,7 @@
 		pageAll:0,
 	};
     
-    var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','鐢宠鏃堕棿'];
+    var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','鐢宠鏃堕棿','鐢宠浜�'];
 	dataArr = [];
     var startTime = "1980-01-01";
     var endTime = new Date().format('yyyy-MM-dd');
@@ -241,6 +239,7 @@
 			arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10);
 			arrTd[index++] = data[i].binf.install_user;
 			arrTd[index++] = data[i].apply_date;
+			arrTd[index++] = data[i].apply_name;
 			//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>';
 		}
 		createTbl(tblCon, arrTh, arrTd);
@@ -249,6 +248,7 @@
 	// 閫氳繃瀹℃壒璇锋眰
 	function exBattGroupAjax(data) {
 		// 璇锋眰鍚庡彴
+		loadshow();
 		$.ajax({
 			type: 'post'
 			,async: true
@@ -259,9 +259,11 @@
 				var rs = JSON.parse(res.result);
 				// console.log(rs);
 				if(rs.code == 1) {
+					loadclose();
 					alert("纭瀹℃牳鎴愬姛");
 					window.location.href="wapprovalBatt-index.html";
 				}else {
+					loadclose();
 					alert('纭瀹℃牳澶辫触锛�');
 				}		
 			}

--
Gitblit v1.9.1