From 0e1721488e6d8f091d13403e20f0bbf5cf397b96 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期二, 18 十二月 2018 18:08:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html |   47 ++++-
 gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html      |  144 +++++++++++++++-----
 gx_tieta/WebRoot/mobil/batt-unapproved.html            |  172 +++++++++++++++++++-----
 3 files changed, 279 insertions(+), 84 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index 1f4be94..de28ba3 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -416,41 +416,115 @@
 	//瀵煎叆琛ㄦ牸榛樿鏁版嵁
 	function installstartdata(temp){
 		creatgroupid();
-		document.getElementById("StationId").value = temp[0];
-		document.getElementById("station_name1").value = temp[1];
-		document.getElementById("city").value = temp[2];			//甯�
-		document.getElementById("county").value = temp[3];			//鍖哄幙
-		document.getElementById("StationName3").value = temp[4];   //鏈烘埧鍚嶇О
-		document.getElementById("StationName4").value = temp[5];    //璁惧鍚嶇О
-		document.getElementById("StationIp").value = temp[6];		//璁惧IP
-		//document.getElementById("FBSDeviceId").value = dev_id;	
-		document.getElementById("FbsDeviceIp").value = temp[8];
-		document.getElementById("FbsDeviceIp_YM").value = temp[9];
-		document.getElementById("FbsDeviceIp_WG").value = temp[10];
-		document.getElementById("FBSDeviceName").value = temp[11];
-		//document.getElementById("GroupIndexInFBSDevice").value = temp[12];
-		document.getElementById("BattGroupId").value = temp[13];
-		document.getElementById("BattGroupNum").value = suoyin;
-		//document.getElementById("BattGroupName").value = temp[15];
-		document.getElementById("FloatVolLevel").value = temp[16];
-		document.getElementById("OfflineVolLevel").value = temp[17];
-		document.getElementById("BattFloatCurrent").value = temp[18];
-		document.getElementById("MonCount").value = temp[19];
-		document.getElementById("MonCapStd").value = temp[20];
-		document.getElementById("MonVolStd").value = temp[21];
-		document.getElementById("MonResStd").value = temp[22];
-		document.getElementById("MonSerStd").value = temp[23];
-		document.getElementById("MonVolLowToAvg").value = temp[24];
-		document.getElementById("Load_curr").value = temp[25];
-		document.getElementById("DisCurrMax").value = temp[26];
-		document.getElementById("station_phone").value = temp[27];
-		document.getElementById("BattProducer").value = temp[28];
-		document.getElementById("BattModel").value = temp[29];
-		//document.getElementById("startTestrecord").value = temp[30];
-		//document.getElementById("endTestrecord").value = temp[31];
-		setTimes($("#startTestrecord"),temp[30]);
-		setTimes($("#endTestrecord"),temp[31]);
-		document.getElementById("install_user").value = temp[32];
+		var data = {
+                StationId: '4011100'
+                ,StationName1: '骞胯タ鐪�'
+                ,StationName2: '鐧借壊甯�'
+                ,StationName5: '涔愪笟鍘�'
+                ,StationName3: 'GX鐧捐壊涔愪笟鍘跨珛鏂板皬鍖篧F'
+                ,StationName4: 'BTS璁惧'
+                ,StationIp: '192.168.0.1'
+                ,FBSDeviceId: '960000111'
+                ,FbsDeviceIp: '127.0.0.1'
+                ,FbsDeviceIp_YM: '255.255.255.0'
+                ,FbsDeviceIp_WG: '127.0.0.1'
+                ,FBSDeviceName: '璁惧鍚嶇О'
+                ,GroupIndexInFBSDevice: 1 
+                ,BattGroupId: 1000005
+                ,BattGroupNum: 2
+                ,BattGroupName: '鐢垫睜缁�1'
+                ,FloatVolLevel: 54
+                ,OfflineVolLevel: 42.9 
+                ,BattFloatCurrent: 10
+                ,MonCount: 24
+                ,MonCapStd: 300
+                ,MonVolStd: 2
+                ,MonResStd: 0.2
+                ,MonSerStd: 5000
+                ,MonVolLowToAvg: 0.05 
+                ,Load_curr: 15
+                ,DisCurrMax: '0'
+                ,station_phone: 12345678912
+                ,BattProducer: '鍗囬槼'
+                ,BattModel: ''
+                ,productDate: '2018-09-18 00:00:00'
+                ,useDate: '2018-09-18 00:00:00'
+                ,install_user: '鍛靛懙'
+            };
+            console.info(data.StationId);
+		if(temp.length>0){
+			document.getElementById("StationId").value = data.StationId;
+	//		document.getElementById("station_name1").value = data.StationName1;
+	//		document.getElementById("city").value = data.StationName2;			//甯�
+	//		document.getElementById("county").value = data.StationName5;			//鍖哄幙
+	//		document.getElementById("StationName3").value = data.StationName3;   //鏈烘埧鍚嶇О
+	//		document.getElementById("StationName4").value = data.StationName4;    //璁惧鍚嶇О
+			document.getElementById("StationIp").value = data.StationIp;		//璁惧IP
+			//document.getElementById("FBSDeviceId").value = dev_id;	
+			document.getElementById("FbsDeviceIp").value = data.FbsDeviceIp;
+			document.getElementById("FbsDeviceIp_YM").value = data.FbsDeviceIp_YM;
+			document.getElementById("FbsDeviceIp_WG").value = data.FbsDeviceIp_WG;
+	//		document.getElementById("FBSDeviceName").value = data.FBSDeviceName;
+			//document.getElementById("GroupIndexInFBSDevice").value = temp[12];
+			document.getElementById("BattGroupId").value = data.BattGroupId;
+			document.getElementById("BattGroupNum").value = data.BattGroupNum;
+			//document.getElementById("BattGroupName").value = temp[15];
+	//		document.getElementById("FloatVolLevel").value = data.FloatVolLevel;
+	//		document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel;
+	//		document.getElementById("BattFloatCurrent").value = data.BattFloatCurrent;
+	//		document.getElementById("MonCount").value = data.MonCount;
+	//		document.getElementById("MonCapStd").value = data.MonCapStd;
+	//		document.getElementById("MonVolStd").value = data.MonVolStd;
+	//		document.getElementById("MonResStd").value = data.MonResStd;
+	//		document.getElementById("MonSerStd").value = data.MonSerStd;
+	//		document.getElementById("MonVolLowToAvg").value = data.MonVolLowToAvg;
+	//		document.getElementById("Load_curr").value = data.Load_curr;
+	//		document.getElementById("DisCurrMax").value = data.DisCurrMax;
+	//		document.getElementById("station_phone").value = data.station_phone;
+	//		document.getElementById("BattProducer").value = data.BattProducer;
+			document.getElementById("BattModel").value = data.BattModel;
+			//document.getElementById("startTestrecord").value = temp[30];
+			//document.getElementById("endTestrecord").value = temp[31];
+			setTimes($("#startTestrecord"),data.productDate);
+			setTimes($("#endTestrecord"),data.useDate);
+	//		document.getElementById("install_user").value = data.install_user;			
+		}else{
+			document.getElementById("StationId").value = temp[0];
+			document.getElementById("station_name1").value = temp[1];
+			document.getElementById("city").value = temp[2];			//甯�
+			document.getElementById("county").value = temp[3];			//鍖哄幙
+			document.getElementById("StationName3").value = temp[4];   //鏈烘埧鍚嶇О
+			document.getElementById("StationName4").value = temp[5];    //璁惧鍚嶇О
+			document.getElementById("StationIp").value = temp[6];		//璁惧IP
+			//document.getElementById("FBSDeviceId").value = dev_id;	
+			document.getElementById("FbsDeviceIp").value = temp[8];
+			document.getElementById("FbsDeviceIp_YM").value = temp[9];
+			document.getElementById("FbsDeviceIp_WG").value = temp[10];
+			document.getElementById("FBSDeviceName").value = temp[11];
+			//document.getElementById("GroupIndexInFBSDevice").value = temp[12];
+			document.getElementById("BattGroupId").value = temp[13];
+			document.getElementById("BattGroupNum").value = suoyin;
+			//document.getElementById("BattGroupName").value = temp[15];
+			document.getElementById("FloatVolLevel").value = temp[16];
+			document.getElementById("OfflineVolLevel").value = temp[17];
+			document.getElementById("BattFloatCurrent").value = temp[18];
+			document.getElementById("MonCount").value = temp[19];
+			document.getElementById("MonCapStd").value = temp[20];
+			document.getElementById("MonVolStd").value = temp[21];
+			document.getElementById("MonResStd").value = temp[22];
+			document.getElementById("MonSerStd").value = temp[23];
+			document.getElementById("MonVolLowToAvg").value = temp[24];
+			document.getElementById("Load_curr").value = temp[25];
+			document.getElementById("DisCurrMax").value = temp[26];
+			document.getElementById("station_phone").value = temp[27];
+			document.getElementById("BattProducer").value = temp[28];
+			document.getElementById("BattModel").value = temp[29];
+			//document.getElementById("startTestrecord").value = temp[30];
+			//document.getElementById("endTestrecord").value = temp[31];
+			setTimes($("#startTestrecord"),temp[30]);
+			setTimes($("#endTestrecord"),temp[31]);
+			document.getElementById("install_user").value = temp[32];
+		}
 		setFloatAndoutLine();
 	}
 	
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
index 99d31c9..1906444 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
@@ -84,7 +84,7 @@
 		           
 		           
 			            <select id="newbattnum" data-mini="true">
-			              <option value="0">鏂板缓鐢垫睜缁�</option>
+			              <option value=0>鏂板缓鐢垫睜缁�</option>
 			              
 			            </select>
 			            
@@ -363,7 +363,7 @@
 	tempindex = JSON.parse(tempindex);
 	tempnum =JSON.parse(tempnum);
 	var suoyin = temp[33];
-	
+	var addbattnum = tempindex.length;
    $(function(){
    creatAllView(tempindex.length).trigger('create');
    creatBa(tempindex.length).trigger('create');
@@ -430,15 +430,14 @@
 	// 鏍煎紡鍖栨彁浜ゅ悗鍙颁俊鎭殑瀵硅薄鏁扮粍淇敼
 	function getUpdateArr(){
 			var arr = new Array();
-			
-			for(var i=0;i<tempindex.length;i++){
+			console.info(addbattnum);
+			for(var i=0;i<addbattnum;i++){
 				var battString = "#battname"+i;
 				var index = String(i);
 				console.info(battString);
 				var obj = {
 					apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),
 					num : tempnum[i],
-					
 					binf:{
 						StationId : $("#StationId").val(),	// 鏈烘埧缂栧彿
 						StationName : ($("#station_name1").val()+"-"+$("#city").val()+"-"+$("#StationName3").val()+"-"+$("#StationName4").val()),	// 鎷兼帴鏈烘埧鍚嶇О
@@ -523,15 +522,37 @@
    }
  
  
- 
- 
- 
- 
+	function creatBattGroupId(addbattnum){
+		$.ajax({type: "post", 				
+		        url: "BattInfAction!searchMaxBattgroupId",				
+		        async:true,				
+		        dataType:'text',
+		        data:null,	
+		        success: function(data){
+					data=JSON.parse(data);
+					data=data.result;
+					data =JSON.parse(data);
+					//console.info(data)
+					var groupid = data.data;
+					//console.info(groupid);
+					//tempgroupid.push(groupid);
+					console.info(tempgroupid);
+					for(var i=tempgroupid.length;i<addbattnum;i++){
+						tempgroupid.push(groupid++);
+						console.info(tempgroupid);
+					}
+				}
+		});	
+	}
+
  
     $('#newbattnum').change(function(){
-    var addbattnum=$('#newbattnum').val()+tempindex.length;
-    console.warn(addbattnum+'hihihi');
-       creatAllView(3).trigger('create');
+    	var numbattnum = parseInt($('#newbattnum').val());
+    	var index =parseInt(tempindex.length);
+    	addbattnum=Math.floor((numbattnum)+(tempindex.length));
+    	console.warn(addbattnum);
+    	creatAllView(addbattnum).trigger('create');
+    	creatBattGroupId(addbattnum);
    });
  
 
@@ -542,4 +563,4 @@
    $('#changeErr').popup('open'); */
    </script>
    
-</html> 
\ No newline at end of file
+</html>
diff --git a/gx_tieta/WebRoot/mobil/batt-unapproved.html b/gx_tieta/WebRoot/mobil/batt-unapproved.html
index 1cb5ba3..8bd9940 100644
--- a/gx_tieta/WebRoot/mobil/batt-unapproved.html
+++ b/gx_tieta/WebRoot/mobil/batt-unapproved.html
@@ -130,7 +130,7 @@
 		</div>  
 		<div data-role="popup" id="myPopup" class="ui-content" data-overlay-theme="b">
 		<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
-        <a href="" id="delete" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-check" >纭畾鍒犻櫎</a>	  
+        <a href="" id="delete" value="" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-check" >纭畾鍒犻櫎</a>	  
         <a href="" id="" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-forbidden"  data-icon="delete">鍙栨秷鍒犻櫎</a>
         </div>    
 		
@@ -148,11 +148,15 @@
 
  <script type="text/javascript">
         /* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳   */
+        
     function getDeleteButIndex(t){
 	    console.warn($(t).attr("but-index")+' 鍒犻櫎');
 	    var index = $(t).attr("but-index");  
-	    console.info(index); 
-	   	setcookiedit(index);
+	    //delindex = index; 
+	     $("#delete").attr("value",index);
+	    //setCookie("delindex",index);
+	   	//setcookiedit(index);
+	   	//delparm = battDeleteparm(index);
 	   	//var parm = battDeleteparm();
         //console.info(parm);
         //delBatt(parm);
@@ -166,7 +170,7 @@
 	    return ;
 	}
     
- 
+ 	var delindex=0;
     var arrTd=new Array();		//褰撳墠琛ㄦ牸td鏁版嵁
     var tblCon = $('.tbl-container');
     var Page = {
@@ -174,17 +178,11 @@
 		pageCurr:1,  				//褰撳墠椤电爜鏁�
 		pageAll:0,
 	};
-
-       
-    $("#edit").click(function(){
-    	//searchHomeInfoByName(homename);
-        //window.location.href="batt-infor-unapproved-edit.html";   
-    });
-    $("#delete").click(function(){  //鍒犻櫎鐢垫睜缁�
-        var parm = battDeleteparm();
-        console.info(parm);
-        delBatt(parm);
-        //window.location.href="batt-unapproved.html";   
+    $("#delete").click(function(delindex){  //鍒犻櫎鐢垫睜缁�
+        var delindex = $("#delete").val();
+        //console.info($("#delete").val());
+        //console.info(delindex);
+       	battDeleteparm(delindex);   
     });
      
     var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳',''];
@@ -274,6 +272,7 @@
 					//var index = 0;
 					var num =new Array();
 					var groupId = new Array();
+					var eleditparm = new Array();
 					//var index1 = 0;
 					var temp = {
 						binf:{
@@ -294,26 +293,37 @@
 				        success: function(data){
 				        	var data = JSON.parse(data.result)
 				        	console.info(data);
-				        	data = data.data;
-				        	for(var i=0;i<data.length;i++){
-				        	console.info(data[i]);
-				        	 groupName[i] = data[i].binf.BattGroupName;
-				        	 num[i] = data[i].num;
-				        	 groupId[i] = data[i].binf.BattGroupId;
-				        	}
-				        	
+				        	if(data.code!=0){
+					        	data = data.data;
+					        	for(var i=0;i<data.length;i++){
+						        	console.info(data[i]);
+						        	groupName[i] = data[i].binf.BattGroupName;
+						        	num[i] = data[i].num;
+						        	groupId[i] = data[i].binf.BattGroupId;
+				        			var eleditparmarr={
+				        				groupname : data[i].binf.BattGroupName,
+				        				num : data[i].num,
+				        				groupId :data[i].binf.BattGroupId,
+				        			}
+				        			eleditparm.push(eleditparmarr);	
+				        		}
+				        		 console.info(eleditparm);				        		
+				        	}				      				        	
 				        var json = JSON.stringify(groupName);
 				        var json1 =JSON.stringify(num);
-				        var json2 = JSON.stringify(groupId);    
+				        var json2 = JSON.stringify(groupId);
+				        
+				        //console.info(eleditparm)
+				        var jsonedit = JSON.stringify(eleditparm);
+				        setCookie("eleditparm",jsonedit);			   
 						setCookie("eleparmindex",json);             //鐢垫睜缁勫悕绉�
 						setCookie("eleparmnum",json1);				//鐢垫睜缁勭紪鍙�
 						console.info(groupName);
 						setCookie("elegroupid",json2);
-						console.info(json2)
+						console.info(json2);
 						window.location.href="batt-infor-unapproved-edit.html";	
 				        }
-				    })
-				    
+				    });	    
 		}		        		
 	function setcookiedit(index){
  				var arrcookie = new Array();	
@@ -354,19 +364,25 @@
 					window.location.href="batt-unapproved.html"; 
 				}
 			}
-		}); 
- 		
+		}); 	
  	}	
-	function battDeleteparm(){
-		var arr = new Array();
+	function battDeleteparm(index){
+		console.info(arrTh.length);
+		console.info(index);
+		var delindex = Math.ceil(arrTh.length*index);
+		var stationid = arrTd[delindex];
+		console.info(stationid);
+		searchdelnum(stationid,index,delindex);
+		/*var arr = new Array();
 		var temp = getCookie("eleparm");
  		var tempindex = getCookie("eleparmindex");
 		var tempnum = getCookie("eleparmnum");
+		var tempgroupid = getCookie("elegroupid");
 		temp=JSON.parse(temp);
 		tempindex = JSON.parse(tempindex);
 		tempnum =JSON.parse(tempnum);
-		//console.info(temp);
-		//var numinsert;
+		tempid = JSON.parse(tempgroupid);
+		
 		console.info(temp[12]);
 		//for(var i=0;i<tempindex.length;i++){
 			//console.info(battString);
@@ -388,7 +404,7 @@
 					FbsDeviceIp_WG : temp[10],			// 缃戝叧
 					FBSDeviceName : temp[11],			//璁惧鍚嶇О
 					GroupIndexInFBSDevice : temp[12],	//fbs璁惧绱㈠紩
-					BattGroupId : temp[13],				//鐢垫睜缁刬d
+					BattGroupId : tempid[temp[12]],				//鐢垫睜缁刬d
 					BattGroupNum : temp[14],			//鏈烘埧鍐呯數姹犵粍缂栧彿
 					BattGroupName : temp[15],        //鐢垫睜缁勭储寮�
 					FloatVolLevel : temp[16],			//娴厖鐢靛帇闃�鍊�
@@ -415,10 +431,93 @@
 			arr.push(obj);
 		//}
 		//console.info(arr);
-		return arr;
+		return arr;*/
 		
 	}
 	
+	function searchdelnum(id,index,delindex) {
+					var groupName = new Array();
+					//var index = 0;
+					var num =new Array();
+					var groupId = new Array();
+					//var index1 = 0;
+					var temp = {
+						binf:{
+							StationId:id,						
+						}
+						,page: {
+							pageCurr: 1
+							,pageSize: 100
+						}
+					};	
+					// 璇锋眰鍚庡彴
+					$.ajax({
+						type: "post", 				
+				        url: "Battinf_applyAction!serchbystationId",				
+				        async:true,				
+				        dataType:'json',
+				        data:"json="+JSON.stringify(temp), 	
+				        success: function(data){
+				        	var data = JSON.parse(data.result)
+				        	console.info(data);
+				        	if(data.code!=0){
+				        	data = data.data;
+				        	for(var i=0;i<data.length;i++){
+				        		console.info(data[i]);
+				        	 	groupName[i] = data[i].binf.BattGroupName;
+				        	 	num[i] = data[i].num;
+				        	 	groupId[i] = data[i].binf.BattGroupId;
+				        	}
+				        	var arr = new Array();
+							var obj = {
+								//apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),
+								num : num[arrTd[delindex+12]],
+								binf:{
+									StationId : arrTd[delindex++],	// 鏈烘埧缂栧彿
+									StationName : (arrTd[delindex]+"-"+arrTd[delindex+1]+"-"+arrTd[delindex+3]+"-"+arrTd[delindex+4]),	// 鎷兼帴鏈烘埧鍚嶇О
+									StationName1 :arrTd[delindex++],		// 鐪�
+									StationName2 : arrTd[delindex++],		// 甯�
+									StationName5 : arrTd[delindex++],		// 鍖�/鍘�
+									StationName3 : arrTd[delindex++],		// 鏈烘埧鍚嶇О
+									StationName4 :arrTd[delindex++],		// 璁惧鍚嶇О
+									StationIp : arrTd[delindex++],				//鏈烘埧ip
+									FBSDeviceId : arrTd[delindex++],				//璁惧id
+									FbsDeviceIp : arrTd[delindex++],				//璁惧ip
+									FbsDeviceIp_YM : arrTd[delindex++],			// 璁惧鎺╃爜
+									FbsDeviceIp_WG : arrTd[delindex++],			// 缃戝叧
+									FBSDeviceName : arrTd[delindex++],			//璁惧鍚嶇О
+									GroupIndexInFBSDevice : arrTd[delindex++],	//fbs璁惧绱㈠紩
+									BattGroupId : arrTd[delindex++],				//鐢垫睜缁刬d
+									BattGroupNum : arrTd[delindex++],			//鏈烘埧鍐呯數姹犵粍缂栧彿
+									BattGroupName : arrTd[delindex++],        //鐢垫睜缁勭储寮�
+									FloatVolLevel : arrTd[delindex++],			//娴厖鐢靛帇闃�鍊�
+									OfflineVolLevel : arrTd[delindex++],			//绂荤嚎鐢靛帇闃�鍊�
+									BattFloatCurrent : arrTd[delindex++],		//娴厖鐢垫祦闃�鍊�
+									MonCount : arrTd[delindex++],				//鍗曚綋鏁伴噺
+									MonCapStd : arrTd[delindex++],				//鏍囩О瀹归噺
+									MonVolStd : arrTd[delindex++],				//鏍囩О鐢靛帇
+									MonResStd : arrTd[delindex++],				//鏍囩О鍐呴樆
+									MonSerStd : arrTd[delindex++],				//鏍囩О鐢靛
+									MonVolLowToAvg : arrTd[delindex++],			//鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
+							
+									Load_curr : arrTd[delindex++],				//璐熻浇鐢垫祦
+									DisCurrMax : arrTd[delindex++],				//鏈�澶ф牳瀹圭數娴�
+									station_phone : arrTd[delindex++],			//鍩虹珯鍙风爜
+													
+									BattProducer : arrTd[delindex++],			//鐢垫睜鍝佺墝
+									BattModel : arrTd[delindex++],				//鐢垫睜鍨嬪彿
+									BattProductDate :  arrTd[delindex++]+" 00:00:00",		//鐢垫睜鐢熶骇鏃ユ湡
+									BattInUseDate :  arrTd[delindex++]+" 00:00:00",			//鐢垫睜浣跨敤鏃ユ湡
+									install_user : arrTd[delindex++],			//瀹夎浜哄憳
+								}
+							}
+							arr.push(obj);
+							console.info(arr);
+							delBatt(arr);
+			        	}
+				        }
+				    })	    
+		}		
 	$(function() {
 		//鐐瑰嚮涓婁竴椤�
 		$('.pre-page').on('click', 'a', function() {
@@ -461,6 +560,7 @@
 		}else{
 			$('.pre-page').show();
 		}
+
 		var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
 		
 		if(Page.pageCurr < pageNum){
@@ -473,4 +573,4 @@
 	
 	 
    </script>
-</html> 
\ No newline at end of file
+</html>

--
Gitblit v1.9.1