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/batt-approved.html |  346 +++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 213 insertions(+), 133 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index 8a90ac3..f39a91b 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">
@@ -87,11 +88,14 @@
 		    margin: 0;
             padding-top: 0.1em;
             padding-bottom: 0.1em;
-            margin-left:7em;
+            
 		}
 		.ui-table-reflow td .ui-table-cell-label, .ui-table-reflow th .ui-table-cell-label{
 		    width:35%;
 		} 
+		.fr{
+		float:right;
+		}
 	</style>
 	<link rel="stylesheet" href="css/fgpanel.css">
 </head>
@@ -123,9 +127,12 @@
 			</div>		
 		</div>   
 		
-		<input style="visibility:hidden" id="getnumber"  type="text" name="customer_area_id" >
+	
     </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>
@@ -134,21 +141,65 @@
 <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">
           /* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳   */
-          function getButIndex(t){
-			    var index = $(t).attr("but-index");   
-			   // index=(index/33-1);
-			   	console.info(index);
-			   	setcookiedit(index);
-			   	window.location.href="control.html"; 	
-			    return ;
-			}
-    
- 
-    var arrTd=new Array();		//褰撳墠琛ㄦ牸td鏁版嵁
+	function getButIndex(t){ //鏌ョ湅瀹炴椂鏁版嵁 
+	    var index = $(t).attr("but-index");   
+	   // index=(index/33-1);
+	   	console.info(index);
+	   	setcookiedit(index);
+	   	window.location.href="control.html"; 	
+	    return ;
+	}
+	
+	var iframePopup = '';		// 寮瑰嚭闈㈡澘鏍囪瘑绗�
+	function getApplyYanshouIndex(t){
+		var index = $(t).attr("but-index");
+		console.info(index);
+		var arr=setApplyYanshou(index);
+		console.log(arr);							//鏂规硶涓�锛�1鎸夐挳鎼炲畾鎵�鏈夈�傝鍦ㄦ瀵规帴鍔犲叆寮瑰嚭妗嗭紝涓婁紶瑙嗛缁忕含搴︾瓑
+		
+		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'
+            });
+            layer.full(iframePopup);
+		
+		// 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 = {
 		pageSize:20, 				//姣忛〉鐨勮鏁�
@@ -158,8 +209,8 @@
 
        
     
-     
-    var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','閫氳璁℃暟','鏄惁楠屾敹',''];
+   	var arrdata = new Array();  
+    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');
@@ -183,28 +234,49 @@
 			success:function(data) {
 				data = JSON.parse(data.result);
 				if(data.code==1){
+					console.info(data.data);
 					var json =JSON.stringify(data.data);
 					setCookie("numberget",json);
+					//return data.data;	
 				}
 			}
 		});
 	 }
 	 function getCookienumber(id){//杈撳叆ID锛岃繑鍥為�氳璁℃暟銆傛暟鎹粠缂撳瓨鑾峰彇銆�
-	 	//id = 0;
-	 	var number = getCookie("numberget");
-	 	number = JSON.parse(number);
-	 	console.info(number);
-	 	if(number[0].dev_id){
-	 	console.info(number);
-	 		for(var i =0; i<number.length;i++){
-	 			if(id == number[i].dev_id){
-	 				return number[i].dev_commcount;
-	 			}
-	 		}	
+	 	//var a = getnumber();
+	 	//console.info(a);
+	 	if(getCookie("numberget")){
+		 	var number = getCookie("numberget");
+		 	number = JSON.parse(number);
+		 	console.info(number);
+		 	if(number[0]){
+		 		for(var i =0; i<number.length;i++){
+		 			if(id == number[i].dev_id){
+		 				return number[i].dev_commcount;
+		 			}
+		 		}	
+		 	}
 	 	}
 	 	return 0;
 	 }
-	 
+	 function getCookiediubao(id){
+	 	if(getCookie("numberget")){
+		 	var number = getCookie("numberget");
+		 	number = JSON.parse(number);
+		 	console.info(number);
+		 	if(number[0]){
+		 		for(var i =0; i<number.length;i++){
+		 			if(id == number[i].dev_id){
+		 				var errorCount = number[i].dev_errcommcount;
+		 				var allCount = number[i].dev_commcount+errorCount;
+		 				//var parcent = (allCount==0?0:errCount/allCount*100)
+		 				//return parcent;
+		 			}
+		 		}	
+		 	}
+	 	}
+	 	return 0;
+	 }
 	 function getcreatArr(){
 		obj = {
 			apply_en : 1,
@@ -214,11 +286,22 @@
 		}
 		return obj;
 	}
+	
+	function yanshou(check_en){
+		if(check_en==0){
+			return "鏈獙鏀�";
+		}else if(check_en==2){
+			return "宸茬敵璇烽獙鏀�";
+		}else if(check_en==1){
+			return"宸插畬鎴愰獙鏀�";s
+		}
+	}
 	// 鏌ヨ鍐呭
 	function searchBattLife(){
 		var temp = JSON.stringify(getcreatArr());
 		//console.info(temp);
 		arrTd = new Array();
+		arrdata = new Array();
 		getnumber();
  		var index = 0;
  		getCookienumber();
@@ -233,7 +316,9 @@
  				if(data.code!=0&&data.data.length>0){
  					data=data.data
  					console.info(data);
+ 					Page.pageAll=data[data.length-1].num;
  					for(var i=0;i<data.length;i++){
+ 					arrdata.push(data[i]);//瀛樺偍鏁版嵁
  					arrTd[index++] = data[i].binf.StationId;
  					arrTd[index++] = data[i].binf.StationName1;
  					arrTd[index++] = data[i].binf.StationName2;
@@ -268,26 +353,116 @@
  					arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10);
  					arrTd[index++] = data[i].binf.install_user;
  					arrTd[index++] = getCookienumber(data[i].binf.FBSDeviceId);
- 					arrTd[index++] = "";
- 					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>';
+ 					arrTd[index++] = getCookiediubao(data[i].binf.FBSDeviceId);
+ 					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鎸夐挳瑙e紑浠ヤ笅涓�鏉℃敞閲婃寜閽�
+ 					//'<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);
+ 				console.info(arrdata);
+ 				//Page.pageCurr=Math.ceil(Page.pageAll/Page.pageSize);
+ 				//console.info(Page.pageCurr);
+ 				setPage();
  				createTbl(tblCon, arrTh, arrTd);
- 				timeer = window.setTimeout(function() {
+ 				/*timeer = window.setTimeout(function() {
 							searchBattLife();
-						}, 5000);	
+						}, 5000);	*/
  			}
  		});			
 	}
 		
+		function setApplyYanshou(index){
+			console.info(arrdata);
+			if(arrdata.length>0){   //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁		                                      
+				var arr= creatYanshouObj(arrdata,index);//鐢宠楠屾敹鏂规硶銆�
+				return arr;
+			}else{
+				alert("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
+			}
+		}
+		
+		function creatYanshouObj(arrdata,index){
+			var StationId = arrdata[index].binf.StationId;
+			//console.info(StationId);
+			var arr = new Array(); //鍒濆鍖栦紶鍙傛暟缁�
+			for(var i=0;i<arrdata.length;i++){//涓�娆¢獙鏀惰鏈烘埧涓嬬殑鎵�鏈夌數姹犵粍鏋勫缓瀵硅薄 銆�
+				if(StationId == arrdata[i].binf.StationId){		
+					var obj = {
+						binf:{
+							StationId : arrdata[i].binf.StationId,	// 鏈烘埧缂栧彿
+							StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName5+"-"+arrdata[i].binf.StationName3),	// 鎷兼帴鏈烘埧鍚嶇О
+							StationName1 :arrdata[i].binf.StationName1,		// 鐪�
+							StationName2 : arrdata[i].binf.StationName2,		// 甯�
+							StationName5 :  arrdata[i].binf.StationName5,		// 鍖�/鍘�
+							StationName3 :  arrdata[i].binf.StationName3,		// 鏈烘埧鍚嶇О
+							StationName4 : arrdata[i].binf.StationName5,		// 璁惧鍚嶇О
+							StationIp :arrdata[i].binf.StationIp,				//鏈烘埧ip
+							FBSDeviceId : arrdata[i].binf.FBSDeviceId,				//璁惧id
+							FbsDeviceIp : arrdata[i].binf.FbsDeviceIp,				//璁惧ip
+							FbsDeviceIp_YM :  arrdata[i].binf.FbsDeviceIp_YM,			// 璁惧鎺╃爜
+							FbsDeviceIp_WG : arrdata[i].binf.FbsDeviceIp_WG ,			// 缃戝叧
+							FBSDeviceName : arrdata[i].binf.FBSDeviceName,			//璁惧鍚嶇О
+							GroupIndexInFBSDevice : arrdata[i].binf.GroupIndexInFBSDevice,	//fbs璁惧绱㈠紩
+							BattGroupId : arrdata[i].binf.BattGroupId,				//鐢垫睜缁刬d
+							BattGroupNum : arrdata[i].binf.BattGroupNum ,			//鏈烘埧鍐呯數姹犵粍缂栧彿
+							BattGroupName :arrdata[i].binf.BattGroupName,        //鐢垫睜缁勭储寮�
+							FloatVolLevel : arrdata[i].binf.FloatVolLevel,			//娴厖鐢靛帇闃�鍊�
+							OfflineVolLevel : arrdata[i].binf.OfflineVolLevel,			//绂荤嚎鐢靛帇闃�鍊�
+							BattFloatCurrent : arrdata[i].binf.BattFloatCurrent,		//娴厖鐢垫祦闃�鍊�
+							MonCount : arrdata[i].binf.MonCount,				//鍗曚綋鏁伴噺
+							MonCapStd : arrdata[i].binf.MonCapStd,				//鏍囩О瀹归噺
+							MonVolStd : arrdata[i].binf.MonVolStd,				//鏍囩О鐢靛帇
+							MonResStd : arrdata[i].binf.MonResStd,				//鏍囩О鍐呴樆
+							MonSerStd : arrdata[i].binf.MonSerStd,				//鏍囩О鐢靛
+							MonVolLowToAvg : arrdata[i].binf.MonVolLowToAvg,			//鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
+					
+							Load_curr : arrdata[i].binf.Load_curr,				//璐熻浇鐢垫祦
+							DisCurrMax : arrdata[i].binf.DisCurrMax,				//鏈�澶ф牳瀹圭數娴�
+							station_phone : arrdata[i].binf.station_phone,			//鍩虹珯鍙风爜
+											
+							BattProducer : arrdata[i].binf.BattProducer,			//鐢垫睜鍝佺墝
+							BattModel : arrdata[i].binf.BattModel,				//鐢垫睜鍨嬪彿
+							BattProductDate :  arrdata[i].binf.BattProductDate+" 00:00:00",		//鐢垫睜鐢熶骇鏃ユ湡
+							BattInUseDate :  arrdata[i].binf.BattInUseDate+" 00:00:00",			//鐢垫睜浣跨敤鏃ユ湡
+							install_user : arrdata[i].binf.install_user,			//瀹夎浜哄憳
+						}
+					}
+					arr.push(obj);
+				}
+			}
+			console.info(arr);
+			
+					
+			return arr;
+			//applyendyanshou(arr);//鐢宠楠屾敹鏂规硶銆�
+		}
+		
+		function applyendyanshou(arr){
+		var temp = JSON.stringify(arr);
+			$.ajax({                                   //鐢宠楠屾敹
+	 			type: 'post',
+				async: true,
+				url: 'Battinf_applyAction!checkPro',
+				data: "json="+temp,
+				dataType: 'json',
+				success:function(data) {
+					console.info(data);
+					data = JSON.parse(data.result);
+					if(data.code==1){
+						alert("鐢宠楠屾敹鎴愬姛");					
+					}
+				}
+			});
+		
+		}
  		function setcookiedit(index){
  				var arrcookie = new Array();	
-			   	for(var i=0;i<33;i++){//鍏�34椤癸紝鏈�鍚庝竴椤逛负鎸夐挳锛屼笉蹇匰ET杩涙暟鎹�
-				   	var value = Math.floor(34*index);
-				   	//console.info(value);
+			   	for(var i=0;i<33;i++){//鍏盿rrTh.length椤癸紝鏈�鍚庡嚑椤逛负鎸夐挳锛屼笉蹇匰ET杩涙暟鎹�
+				   	var value = Math.floor(arrTh.length*index);
 				   	value = Math.floor(value+i);
-				   	//console.info(value);
 			   		arrcookie.push(arrTd[value]);
 			   	}
 			   	console.info(arrcookie);
@@ -336,102 +511,8 @@
 			   	setCookie("eleparm",json);  //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
  				setCookie("batt",json1);
  		}
- 		
- 		function setcookieCreat(index){
- 				var arrcookie = new Array();	
-			   	for(var i=0;i<33;i++){//鍏�34椤癸紝鏈�鍚庝竴椤逛负鎸夐挳锛屼笉蹇匰ET杩涙暟鎹�
-				   	var value = Math.floor(34*index);
-				   	//console.info(value);
-				   	value = Math.floor(value+i);
-				 	if(i==13){//鏂板缓鍔熻兘锛岀數姹犵粍ID榛樿涓哄綋椤垫渶鍚庝竴涓數姹犵粍ID鍙峰姞1
-				 		var groupid = Math.floor(arrTd[value]+1);
-				 		console.info(groupid);
-				 		arrcookie.push(groupid);
-				 	}else{
-				   		//console.info(value);
-			   			arrcookie.push(arrTd[value]);
-			   		}
-			   	}
-			   	arrcookie.push("new");
-			   	//console.info(arrcookie);
-			   	var json=window.JSON.stringify(arrcookie);
-			   	setCookie("eleparm",json);  //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
- 		}
 		
-	// 鏌ヨ鍐呭
-	/*	function searchBattLife(){
-			
-		
-			/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
-			
-		/*	for(var i=0;i<340;i++){
-				if(i%34==33){
-				//<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
-				console.info(i);
-				arrTd[i]='<a onclick="getButIndex(this)"  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</a>';
-				
-				continue;
-			
-			}   if(i==13){
-					arrTd[i]=1002102;
-				}else{
-					arrTd[i]=i*10;
-				}
-			}
-						
-			createTbl(tblCon, arrTh, arrTd);
-					
-			/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */				
-		//}
-
-		function getUpdateArr(temp){
-			var arr = new Array();
-			var obj = new Object();
-			obj.StationId = temp[0];	// 鏈烘埧缂栧彿
-			obj.StationName = (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]);	// 鎷兼帴鏈烘埧鍚嶇О
-			obj.StationName1 = temp[1];		// 鐪�
-			obj.StationName2 = temp[2];		// 甯�
-			obj.StationName5 = temp[3];		// 鍖�/鍘�
-			obj.StationName3 = temp[4];		// 鏈烘埧鍚嶇О
-			obj.StationName4 = temp[5];		// 璁惧鍚嶇О
-			obj.StationIp = temp[6];				//鏈烘埧ip
-			obj.FBSDeviceId = temp[7];				//璁惧id
-			obj.FbsDeviceIp = temp[8];				//璁惧ip
-			obj.FbsDeviceIp_YM = temp[9];			// 璁惧鎺╃爜
-			obj.FbsDeviceIp_WG = temp[10];			// 缃戝叧
-			obj.FBSDeviceName = temp[11];			//璁惧鍚嶇О
-			obj.GroupIndexInFBSDevice = temp[12];	//fbs璁惧绱㈠紩
-			obj.BattGroupId = temp[13];				//鐢垫睜缁刬d
-			obj.BattGroupNum = temp[14];			//鏈烘埧鍐呯數姹犵粍缂栧彿
-			obj.BattGroupName = temp[15];			//鐢垫睜缁勫悕绉�
-			obj.FloatVolLevel = temp[16];			//娴厖鐢靛帇闃�鍊�
-			obj.OfflineVolLevel = temp[17];			//绂荤嚎鐢靛帇闃�鍊�
-			obj.BattFloatCurrent = temp[18];		//娴厖鐢垫祦闃�鍊�
-			obj.MonCount = temp[19];				//鍗曚綋鏁伴噺
-			obj.MonCapStd = temp[20];				//鏍囩О瀹归噺
-			obj.MonVolStd = temp[21];				//鏍囩О鐢靛帇
-			obj.MonResStd = temp[22];				//鏍囩О鍐呴樆
-			obj.MonSerStd = temp[23];				//鏍囩О鐢靛
-			obj.MonVolLowToAvg = temp[24];			//鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
-			
-			
-			obj.Load_curr = temp[25];				//璐熻浇鐢垫祦
-			obj.DisCurrMax = temp[26];				//鏈�澶ф牳瀹圭數娴�
-			obj.station_phone = temp[27];			//鍩虹珯鍙风爜
-							
-			obj.BattProducer = temp[28];			//鐢垫睜鍝佺墝
-			obj.BattModel = temp[29];				//鐢垫睜鍨嬪彿
-			obj.BattProductDate =  temp[30];		//鐢垫睜鐢熶骇鏃ユ湡
-			obj.BattInUseDate =  temp[31];			//鐢垫睜浣跨敤鏃ユ湡
-			obj.install_user = temp[32];			//瀹夎浜哄憳
-			arr.push(obj);
-			console.info(arr);
-			return arr;
-		}	
-	
-	
-			
-	function createSearchForm(){
+	function createSearchForm(){//鏌ヨ宸插鏍镐紶鍙傘��
 		var temp={
 				page:Page,
 				StationName1:$('#mainteArea').val(),
@@ -456,8 +537,7 @@
 				},
 			};
 			console.info(temp);
-			return temp;
-			
+			return temp;		
 		}	
 	
 	$(function() {

--
Gitblit v1.9.1