From 6d0d9ee5e761d990449be40b9d579e3bdb2b6acf Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期三, 26 十二月 2018 11:50:48 +0800
Subject: [PATCH] 修改

---
 gx_tieta/WebRoot/mobil/batt-edit2.html |  347 ++++++++++++++++++++-------------------------------------
 1 files changed, 120 insertions(+), 227 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index 50786cd..bf17e2b 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit2.html
@@ -290,7 +290,7 @@
   function creatBattView(index){
          var count=index+1
             ,battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+count+'</h1>'+
-             '<table class="layout-set">'+'<tbody>'+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal">'+'<select>'
+             '<table class="layout-set">'+'<tbody>'+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal"id="battproducer'+index+'">'+'<select>'
             ,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>' 
             ,battType='<tr>'+'<td>'+'鐢垫睜鍨嬪彿'+'</td>'+'<td>'+'<input type="text" '+'id='+'batttype'+index+' data-mini="true"'+'value='+'鐢垫睜鍨嬪彿'+count+' />'+'</td>'+'</tr>' 
             ,battNum='<tr>'+'<td>'+'鐢垫睜鏁伴噺'+'</td>'+'<td>'+'<input type="text" '+'id='+'battnum'+index+' data-mini="true"'+'value='+'鐢垫睜鏁伴噺'+count+' />'+'</td>'+'</tr>' 
@@ -316,26 +316,40 @@
   function selectedIndex(index){
        var selected='',
            i=0;
-       for(i=0;i<4;i++){  
-          if(i==index){selected+='<option '+'value='+i+' selected'+'>'+'鐢垫睜鍝佺墝'+i+'</option>';continue;}
-          selected+='<option value='+i+'>'+'鐢垫睜鍝佺墝'+i+'</option>';
-          
-       }
-       
+       selected+= '<option '+'value='+'鐞嗗+'+'>'+'鐞嗗+'+'</option>';
+       selected+= '<option '+'value='+'鍦i槼'+'>'+'鍦i槼'+'</option>';
+       selected+= '<option '+'value='+'鍙岀櫥'+'>'+'鍙岀櫥'+'</option>';
+       selected+= '<option '+'value='+'SENRY'+'>'+'SENRY'+'</option>';
+       selected+= '<option '+'value='+'鍗楅兘'+'>'+'鍗楅兘'+'</option>';
+       selected+= '<option '+'value='+'鐖遍粯鐢�'+'>'+'鐖遍粯鐢�'+'</option>';
+       selected+= '<option '+'value='+'绉戝+杈�'+'>'+'绉戝+杈�'+'</option>';
+       selected+= '<option '+'value='+'閾舵嘲'+'>'+' 閾舵嘲'+'</option>';
+       selected+= '<option '+'value='+'涓版棩'+'>'+' 涓版棩'+'</option>';
+       selected+= '<option '+'value='+'涓叴鑳芥淳'+'>'+' 涓叴鑳芥淳'+'</option>';
+		selected+= '<option '+'value='+'鍏夊畤'+'>'+' 鍏夊畤'+'</option>';  
+		selected+= '<option '+'value='+'鑹捐鏂崕杈�'+'>'+'鑹捐鏂崕杈�'+'</option>';
+		selected+= '<option '+'value='+'闆勯煬'+'>'+' 闆勯煬'+'</option>';
+		selected+= '<option '+'value='+'椋庡竼'+'>'+' 椋庡竼'+'</option>';
+		selected+= '<option '+'value='+'鏂囬殕'+'>'+' 鏂囬殕'+'</option>';
+		selected+= '<option '+'value='+'椋庡竼'+'>'+' 椋庡竼'+'</option>';
+		selected+= '<option '+'value='+'涓北'+'>'+' 涓北'+'</option>';
+  		selected+= '<option '+'value='+'缇庣殑'+'>'+' 缇庣殑'+'</option>';
+  		selected+= '<option '+'value='+'鏈楄揪'+'>'+' 鏈楄揪'+'</option>';
        return selected; 
   }	
   	var temp = getCookie("eleparm");
 	//console.info(temp);
 	temp=JSON.parse(temp);
 	console.info(temp);
-	console.info(temp[30]);
-	console.info(temp[33]);
-	console.info(temp[34]);
-	var suoyin = temp[33];
-	
+	var tempgroupid = new Array() ;
+	for(var i=0;i<temp.length;i++){
+		tempgroupid.push(temp[i].binf.BattGroupId);
+	}
+	console.info(tempgroupid);//鐢垫睜缁� ID 鏁扮粍锛岋紙鑻ユ坊鍔狅紝鍒欓渶瑕佹柊寤猴級;
+	var addbattnum = temp.length;//娣诲姞鐢垫睜缁勬暟鐩鏁�
    $(function(){
-   creatAllView(suoyin).trigger('create');
-   creatBa(suoyin).trigger('create');
+   creatAllView(temp.length).trigger('create');
+   creatBa(temp.length).trigger('create');
    });
  
     
@@ -345,13 +359,7 @@
 	$(function () {
 		//setTimes($("#startTestrecord"),'2000-01-01');
 		//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
-		console.info()
-		if(temp[34]!="edit")
-		{
-		//console.warn("sssss")
-			creatgroupid();//濡傛灉妫�娴嬩负NEW ,鍒欐墽琛屾坊鍔營D锛屽鏋滀负淇敼锛屽垯鎵ц涓烘嬁鍒癐D
-		}else{
-		}
+		
 		installstartdata(temp);
 	});
 	
@@ -399,10 +407,11 @@
     	console.info(ip);
     	return ip;
     }
-    // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�   //
-  	function setFloatAndoutLine() {
+    
+  	 // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�   //
+  	function setFloatAndoutLine(monnum) {
   		var vol = $('#MonVolStd').val();
-  		var monnum = $('#MonCount').val();
+  		//var monnum = $('#MonCount').val();
   		var chargeVol = (vol*1.117*monnum).toFixed(1);		// 娴厖鐢靛帇闃�鍊�
 		var outlineVol = (vol*1.073*monnum).toFixed(1);		// 绂荤嚎鐢靛帇闃�鍊�
 	
@@ -410,65 +419,32 @@
 		$('#OfflineVolLevel').val(outlineVol);	// 绂荤嚎鐢靛帇闃�鍊�
  	}
  	
- 	$('#MonVolStd').change(function(){
- 		setFloatAndoutLine();
- 	});
- 	 $('#MonCount').change(function(){
- 	 	setFloatAndoutLine();
- 	 })
+ 
     function prefixInteger(num, length) {
  		return (num/Math.pow(3,length)).toFixed(length).substr(2);
 	}
-	
+	function creatBa(a){
+        var battnum=4-a,
+            opstring='';        
+        if(a>4&&battnum<=0){return false;}
+        for(var i=0;i<=battnum;i++){
+             
+           opstring+='<option value='+i+'>鏂板缓'+i+'涓數姹犵粍</option>';
+        }
+         console.warn(opstring+'ttt'); 
+         return $('#newbattnum').html(opstring);
+   }
 	//瀵煎叆琛ㄦ牸榛樿鏁版嵁
 	function installstartdata(temp){
-		
-		var data = {
-                StationId: '4011100'
-                ,StationName1: '骞胯タ鐪�'
-                ,StationName2: '鐧借壊甯�'
-                ,StationName5: '涔愪笟鍘�'
-                ,homeName: '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: 'BTS'
-                ,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[34]!="edit"){
-			creatgroupid();
+			data=temp[0].binf;
 			document.getElementById("StationId").value = data.StationId;
-	//		document.getElementById("mainteArea").value = data.StationName1;
-	//		document.getElementById("city").value = data.StationName2;			//甯�
-	//		document.getElementById("county").value = data.StationName5;			//鍖哄幙
-	//		document.getElementById("homeName").value = data.homeName;   //鏈烘埧鍚嶇О
+			document.getElementById("mainteArea").value = data.StationName1;
+			document.getElementById("city").value = data.StationName2;			//甯�
+			document.getElementById("country").value = data.StationName5;			//鍖哄幙
+			document.getElementById("homeName").value = data.StationName3;   //鏈烘埧鍚嶇О
 			document.getElementById("StationName4").value = data.StationName4;    //璁惧鍚嶇О
 			document.getElementById("StationIp").value = data.StationIp;		//璁惧IP
-			//document.getElementById("FBSDeviceId").value = dev_id;	
+			document.getElementById("FBSDeviceId").value = data.FBSDeviceId;	
 			document.getElementById("FbsDeviceIp").value = data.FbsDeviceIp;
 			document.getElementById("FbsDeviceIp_YM").value = data.FbsDeviceIp_YM;
 			document.getElementById("FbsDeviceIp_WG").value = data.FbsDeviceIp_WG;
@@ -477,70 +453,59 @@
 			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("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("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];
+			document.getElementById("station_phone").value = data.station_phone;
+			//document.getElementById("BattProducer").value = data.BattProducer;
+			//document.getElementById("BattModel").value = data.BattModel;
+			document.getElementById("startTestrecord").value = data.BattProductDate;
+			document.getElementById("endTestrecord").value = data.BattInUseDate;
 			//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("mainteArea").value = temp[1];
-			document.getElementById("city").value = temp[2];			//甯�
-			document.getElementById("county").value = temp[3];			//鍖哄幙
-			document.getElementById("homeName").value = temp[4];   //鏈烘埧鍚嶇О
-			document.getElementById("StationName4").value = temp[5];    //璁惧鍚嶇О
-			document.getElementById("StationIp").value = temp[6];		//璁惧IP
-			document.getElementById("FBSDeviceId").value = temp[7];	
-			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();
+			document.getElementById("install_user").value = data.install_user;		
+			for(var i=0;i<temp.length;i++){
+				data=temp[i].binf;
+				var battString = "#battname"+i;
+				var battModel = "#batttype"+i;
+				var battproducer = "#battproducer"+i
+				//var battproducer ="#battproducer"+i; 
+				$(battString).val(data.BattGroupName);
+				$(battModel).val(data.BattModel);
+				$(battproducer).val(data.BattProducer);
+				console.info($(battproducer).val());
+			}
 	}
 	
 	// 鏍煎紡鍖栨彁浜ゅ悗鍙颁俊鎭殑瀵硅薄鏁扮粍骞惰繑鍥� 鍗曚釜淇敼锛屾墜鏈烘柟寮忎笉淇敼澶氫釜鐢垫睜缁�
 		function getUpdateArr(){
+			mon=$('#MonVolStd').val();
+			var moncount = 0;
+			if(mon==12){
+				console.info("aa");
+				moncount=4;
+			}else if(mon==2){
+				moncount==24;
+			}
 			var arr = new Array();
-			for(var i=0;i<suoyin;i++){
+			
+			for(var i=0;i<temp.length;i++){
+				setFloatAndoutLine(moncount);
 				var battString = "#battname"+i;
+				var battModel = "#batttype"+i;
+				var battproducer ="#battproducer"+i; 
+				var id = $('fieldset div div input[data-cacheval=\'true\']').val();
+				var inputVal = $(id).val();
+				//var input =$(four).option()
+				console.info(inputVal)
 				var index = String(i);
 				console.info(battString);
 				var obj = {
@@ -550,7 +515,7 @@
 						StationName : ($("#mainteArea").val()+"-"+$("#city").val()+"-"+$("#homeName").val()+"-"+$("#StationName4").val()),	// 鎷兼帴鏈烘埧鍚嶇О
 						StationName1 : $("#mainteArea").val(),		// 鐪�
 						StationName2 : $("#city").val(),		// 甯�
-						StationName5 : $("#county").val(),		// 鍖�/鍘�
+						StationName5 : $("#country").val(),		// 鍖�/鍘�
 						homeName : $("#homeName").val(),		// 鏈烘埧鍚嶇О
 						StationName4 : $("#StationName4").val(),		// 璁惧鍚嶇О
 						StationIp : $("#StationIp").val(),				//鏈烘埧ip
@@ -566,7 +531,7 @@
 						FloatVolLevel : $("#FloatVolLevel").val(),			//娴厖鐢靛帇闃�鍊�
 						OfflineVolLevel : $("#OfflineVolLevel").val(),			//绂荤嚎鐢靛帇闃�鍊�
 						BattFloatCurrent : $("#BattFloatCurrent").val(),		//娴厖鐢垫祦闃�鍊�
-						MonCount : $("#MonCount").val(),				//鍗曚綋鏁伴噺
+						MonCount : moncount,				//鍗曚綋鏁伴噺
 						MonCapStd : $("#MonCapStd").val(),				//鏍囩О瀹归噺
 						MonVolStd : $("#MonVolStd").val(),				//鏍囩О鐢靛帇
 						MonResStd : $("#MonResStd").val(),				//鏍囩О鍐呴樆
@@ -577,10 +542,10 @@
 						DisCurrMax : $("#DisCurrMax").val(),				//鏈�澶ф牳瀹圭數娴�
 						station_phone : $("#station_phone").val(),			//鍩虹珯鍙风爜
 										
-						BattProducer : $("#BattProducer").val(),			//鐢垫睜鍝佺墝
-						BattModel : $("#BattModel").val(),				//鐢垫睜鍨嬪彿
-						BattProductDate :  $("#startTestrecord").val()+" 00:00:00",		//鐢垫睜鐢熶骇鏃ユ湡
-						BattInUseDate :  $("#endTestrecord").val()+" 00:00:00",			//鐢垫睜浣跨敤鏃ユ湡
+						BattProducer : $(battproducer).val(),			//鐢垫睜鍝佺墝
+						BattModel : $(battModel).val(),				//鐢垫睜鍨嬪彿
+						BattProductDate :  $("#startTestrecord").val(),		//鐢垫睜鐢熶骇鏃ユ湡
+						BattInUseDate :  $("#endTestrecord").val(),			//鐢垫睜浣跨敤鏃ユ湡
 						install_user : $("#install_user").val(),			//瀹夎浜哄憳
 					}
 				}
@@ -590,70 +555,17 @@
 			return arr;
 		}
 		
-		function getUpdateArredit(){
-			var arr = new Array();
-			for(var i=0;i<suoyin;i++){
-				var battString = "#battname"+i;
-				var index = String(i);
-				console.info(battString);
-				var obj = {
-						StationId : $("#StationId").val(),	// 鏈烘埧缂栧彿
-						StationName : ($("#mainteArea").val()+"-"+$("#city").val()+"-"+$("#homeName").val()+"-"+$("#StationName4").val()),	// 鎷兼帴鏈烘埧鍚嶇О
-						StationName1 : $("#mainteArea").val(),		// 鐪�
-						StationName2 : $("#city").val(),		// 甯�
-						StationName5 : $("#county").val(),		// 鍖�/鍘�
-						homeName : $("#homeName").val(),		// 鏈烘埧鍚嶇О
-						StationName4 : $("#StationName4").val(),		// 璁惧鍚嶇О
-						StationIp : $("#StationIp").val(),				//鏈烘埧ip
-						FBSDeviceId : $("#FBSDeviceId").val(),				//璁惧id
-						FbsDeviceIp : $("#FbsDeviceIp").val(),				//璁惧ip
-						FbsDeviceIp_YM : $("#FbsDeviceIp_YM").val(),			// 璁惧鎺╃爜
-						FbsDeviceIp_WG : $("#FbsDeviceIp_WG").val(),			// 缃戝叧
-						FBSDeviceName : $("#FBSDeviceName").val(),			//璁惧鍚嶇О
-						GroupIndexInFBSDevice : i,	//fbs璁惧绱㈠紩
-						BattGroupId : $("#BattGroupId").val(),				//鐢垫睜缁刬d
-						BattGroupNum : $("#BattGroupNum").val(),			//鏈烘埧鍐呯數姹犵粍缂栧彿
-						BattGroupName : $(battString).val(),
-						FloatVolLevel : $("#FloatVolLevel").val(),			//娴厖鐢靛帇闃�鍊�
-						OfflineVolLevel : $("#OfflineVolLevel").val(),			//绂荤嚎鐢靛帇闃�鍊�
-						BattFloatCurrent : $("#BattFloatCurrent").val(),		//娴厖鐢垫祦闃�鍊�
-						MonCount : $("#MonCount").val(),				//鍗曚綋鏁伴噺
-						MonCapStd : $("#MonCapStd").val(),				//鏍囩О瀹归噺
-						MonVolStd : $("#MonVolStd").val(),				//鏍囩О鐢靛帇
-						MonResStd : $("#MonResStd").val(),				//鏍囩О鍐呴樆
-						MonSerStd : $("#MonSerStd").val(),				//鏍囩О鐢靛
-						MonVolLowToAvg : $("#MonVolLowToAvg").val(),			//鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
-				
-						Load_curr : $("#Load_curr").val(),				//璐熻浇鐢垫祦
-						DisCurrMax : $("#DisCurrMax").val(),				//鏈�澶ф牳瀹圭數娴�
-						station_phone : $("#station_phone").val(),			//鍩虹珯鍙风爜
-										
-						BattProducer : $("#BattProducer").val(),			//鐢垫睜鍝佺墝
-						BattModel : $("#BattModel").val(),				//鐢垫睜鍨嬪彿
-						BattProductDate :  $("#startTestrecord").val()+" 00:00:00",		//鐢垫睜鐢熶骇鏃ユ湡
-						BattInUseDate :  $("#endTestrecord").val()+" 00:00:00",			//鐢垫睜浣跨敤鏃ユ湡
-						install_user : $("#install_user").val(),			//瀹夎浜哄憳
-				}
-				arr.push(obj);
-			}
-			console.info(arr);
-			return arr;
-		}
+	
 </script> 
 <script type="text/javascript">  
 	$(function(){
 		$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
 	    $(function(){
-	    alert(333);
+	   
 	    })
 		$("#sure").click(function(){
 			if(nullOrn()){
-				if(temp[34]!="edit"){
-					creatgroupid();//鎻愪氦涔嬪墠鍐嶆楠岃瘉锛屽垱寤篒D
-					addBattnew(); 	//鎻愪氦
-				}else{
-					addBattnew();
-				}	
+				editBatt();
 			}else{
 			}				//楠岃瘉閲嶈椤规槸鍚︿负绌猴紝涓虹┖鍒欐彁绀猴紱   
 	   		//function backpage(){window.location.href="ele-param1.html";}
@@ -665,64 +577,45 @@
 	});
  	
  	function nullOrn(){
-	 	if($("#BattFloatCurrent").val()&&$("#MonCount").val()&&$("#MonCapStd").val()){
+	
 	 		return true;
-	 	}else{
-	 		alert("*椤逛负蹇呭~椤癸紝涓嶈兘涓虹┖锛岃閲嶆柊杈撳叆");
-	 		return false;
-	 	}	
+	 	
  	
  	}
  	
- 	function addBattnew(){//鏂板缓鐢垫睜缁勶紝娣诲姞鍒扮敵璇�
+ 	function editBatt(){//
+ 		console.info(getUpdateArr());
  		var temp = JSON.stringify(getUpdateArr());
  		console.info(temp);
  		$.ajax({
- 			type: 'post',
-			async: true,
-			url: 'Battinf_applyAction!add',
-			data: "json="+temp,
-			dataType: 'json',
-			success:function(data) {
-				data = JSON.parse(data.result);
- 				console.info(data);
- 				if(data.code==1){
- 					alert("娣诲姞鎴愬姛");
- 					window.location.href="batt-unapproved.html";
- 				}else{
- 					alert("娣诲姞澶辫触");
- 					window.location.href="batt-unapproved.html";
- 				}
- 			}
- 		});
- 	}
-    
-      //淇敼鐢垫睜缁勶紝娣诲姞鍒癇ATTINF
-	function editBatt(){
-   		var parm = getUpdateArredit();
-   		console.info(parm);	
-   		$.ajax({
 				type: "post", 				
-		        url: "BattInfAction!update",				
+		        url: "Battinf_applyAction!addPro",				
 		        async:true,				
 		        dataType:'text',
-		        data:"json="+JSON.stringify(parm),	
-		        success: function(data){							        	
-					data = eval('('+data+')');
-					var model = eval('('+data.result+')');
-					console.info(model);
+		        data:"json="+temp,	
+		        success: function(data){		
+		        	console.info(data);
+		        	data =JSON.parse(data);					        	
+					//var model= JSON.parse(data.result);
+					data = JSON.parse(data.result);
+					console.info(data);
+					var model =data;
 					if(model.code ==1){
 						alert("淇敼鎴愬姛");
+						window.location.href="batt-unapproved.html"
 					}else{
 						alert("淇敼澶辫触!");
+						window.location.href="batt-unapproved.html"
 					}		
 	        	},
 	        	error:function(){
 	        		alert("淇敼鐢垫睜缁勫け璐�!");
+	        		//window.location.href="batt-unapproved.html"
 	        	}
  		});
-   }   
-   
+ 	}
+    
+      
    
    $('input:radio[name="battnum"]').click(function(){
          var $this=$(this)

--
Gitblit v1.9.1