From f24be85c9d0eb8722c16f367442d3ca9ded809c5 Mon Sep 17 00:00:00 2001
From: chenjingjing <chenjingjing@192.168.10.3>
Date: 星期四, 27 十二月 2018 16:32:34 +0800
Subject: [PATCH] 申请已审核实时数据

---
 gx_tieta/WebRoot/mobil/batt-approved1.html |   35 ++++++++++++++---------------------
 1 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index d765458..a52b1a0 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -122,7 +122,9 @@
 												<input type="hidden" id="StationIp" data-mini="true" />
 																						
 												<input type="hidden" id="FbsDeviceIp_YM" class="unable" data-mini="true" value="456"/>	
+												
 												<input type="hidden" id="FbsDeviceIp_WG" class="unable"  data-mini="true" value="456"/>
+												
 												<input type="hidden" id="FBSDeviceName" data-mini="true" />
 																						
 												<input type="hidden" readonly unselectable="on" value="123" id="BattGroupNum" class="unable" class="uncheck" data-mini="true" />
@@ -134,7 +136,9 @@
 												<input type="hidden" id="BattFloatCurrent" class="unable" data-mini="true" />
 									
 												<input type="hidden" id="MonResStd" data-mini="true" />	
+												
 												<input type="hidden" id="MonSerStd" data-mini="true" />
+												
 												<input type="hidden" id="MonVolLowToAvg" data-mini="true" />
 										
 										<tr>
@@ -270,13 +274,7 @@
        }
        return $('#newbattnum').html(selected); 
   	}	
-	
-	/* $("#sure").on('click',function(){
-	 	console.info($('#newbattnum').val());
-       	setcookieCreat($('#newbattnum').val());
-        window.location.href="batt-infor-conf-temp1.html";   
-    });*/
-    	
+		
    function creatBattView(index){
          var count=index+1
             ,battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+count+'</h1>'+
@@ -293,12 +291,11 @@
          return battTitle+battBrand+battType+battNum+battNumOpt+MonVolStd+nomCap+battIndex+battName;             
   }	
    function selectedNum(index){
-      var selected='';
+     var selected='';
     if(temp[index].binf.MonCount==4){  
     return selected='<option '+'value='+4+' selected=selected' +'>'+'4 涓�'+'</option>'+'<option '+'value='+24 +'>'+'24涓�'+'</option>';
   	}else{
-  	 return selected='<option '+'value='+24+' selected=selected' +'>'+'24 涓�'+'</option>'+'<option '+'value='+4 +'>'+'4涓�'+'</option>';
-  	
+  	 return selected='<option '+'value='+24+' selected=selected' +'>'+'24 涓�'+'</option>'+'<option '+'value='+4 +'>'+'4涓�'+'</option>';	
   	}
   }
 
@@ -315,7 +312,7 @@
        }
        return selected; 
   }	
-  	var temp = getCookie("eleparm");
+  	var temp = getCookie("eleparm1");
 	temp=JSON.parse(temp);
 	var arr = temp;
 	
@@ -326,7 +323,7 @@
 		//console.info(temp);
 		console.info(arrdata);
 		var json = JSON.stringify(arrdata);
-		setCookie("eleparm",json);
+		setCookie("batt",json);
 		window.location.href="control.html"; 
 	}
 	// 鐐瑰嚮鐢宠楠屾敹鏄剧ず闈㈡澘
@@ -373,8 +370,8 @@
 	var lixiandianyafazhi = [0,0,0,0];
 	battnumber();
    $(function(){
-   creatAllView(temp.length).trigger('create');
-   setMonVolStd(temp.length);
+	   creatAllView(temp.length).trigger('create');
+	   setMonVolStd(temp.length);
    });
 
 	$(function () {
@@ -638,7 +635,7 @@
 			$("#sure").click(function(){
 			console.info($('#newbattnum').val());
 	       	setcookieCreat($('#newbattnum').val());
-	        window.location.href="batt-infor-conf-temp1.html"; 
+	        //window.location.href="control.html"; 
 	        });  
 		});
 
@@ -750,10 +747,7 @@
           k=i*50;
           
            //optionStr+='<option'+' value='+k+'>'+k+'</option>';
-          optionStr+='<option'+' value='+k+'>'+k+'</option>';
-           
-          
-           
+          optionStr+='<option'+' value='+k+'>'+k+'</option>';   
           }
           allString=optionStr+'<option'+' selected=selected '+' value='+1000+'>'+1000+'</option>'
           return allString;
@@ -778,8 +772,7 @@
           for(var i=0;i<index;i++){
              var s='#MonVolStd'+i;
              $(s).val(12);
-          }
-         
+          }     
     }
   
     /* 鎿嶄綔鎴愬姛 

--
Gitblit v1.9.1