From 12ae574b834fe0f4ae015faa1a4c457e5dad0057 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期三, 26 十二月 2018 19:08:36 +0800
Subject: [PATCH] 修改

---
 gx_tieta/WebRoot/mobil/batt-edit2.html |   49 +++++++++++++++++++------------------------------
 1 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index bf17e2b..74b3196 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"id="battproducer'+index+'">'+'<select>'
+             '<table class="layout-set">'+'<tbody>'+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal">'+'<select id="battproducer"'+index+'>'
             ,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,31 +316,22 @@
   function selectedIndex(index){
        var selected='',
            i=0;
-       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>';
+       var battproducer = ["鐞嗗+","鍦i槼","鍙岀櫥","SENRY","鍗楅兘","鐖遍粯鐢�","绉戝+杈�","閾舵嘲","涓版棩","涓叴鑳芥淳","鍏夊畤",
+       "鑹捐鏂崕杈�","闆勯煬","椋庡竼","鏂囬殕","涓北"];
+       selected+= '<option '+'value='+temp[index].binf.BattProducer+'>'+temp[index].binf.BattProducer+'</option>';
+       for(var i=0;i<battproducer.length;i++){
+       		if(temp[index].binf.BattProducer!=battproducer[i]){
+       			 selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';	
+       		} 
+       }
+      
        return selected; 
   }	
   	var temp = getCookie("eleparm");
 	//console.info(temp);
 	temp=JSON.parse(temp);
 	console.info(temp);
+	var moncount = 0;
 	var tempgroupid = new Array() ;
 	for(var i=0;i<temp.length;i++){
 		tempgroupid.push(temp[i].binf.BattGroupId);
@@ -488,13 +479,8 @@
 	// 鏍煎紡鍖栨彁浜ゅ悗鍙颁俊鎭殑瀵硅薄鏁扮粍骞惰繑鍥� 鍗曚釜淇敼锛屾墜鏈烘柟寮忎笉淇敼澶氫釜鐢垫睜缁�
 		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<temp.length;i++){
@@ -516,7 +502,7 @@
 						StationName1 : $("#mainteArea").val(),		// 鐪�
 						StationName2 : $("#city").val(),		// 甯�
 						StationName5 : $("#country").val(),		// 鍖�/鍘�
-						homeName : $("#homeName").val(),		// 鏈烘埧鍚嶇О
+						StationName3 : $("#homeName").val(),		// 鏈烘埧鍚嶇О
 						StationName4 : $("#StationName4").val(),		// 璁惧鍚嶇О
 						StationIp : $("#StationIp").val(),				//鏈烘埧ip
 						FBSDeviceId : $("#FBSDeviceId").val(),				//璁惧id
@@ -623,9 +609,12 @@
         if ($this.attr("checked")) { 
 銆�銆�銆�銆�銆�銆�  if($this.val()==4){
                $mon.val("12");
-              
+              	moncount = 12;
            };
-         if($this.val()==24){$mon.val("2");}  
+         if($this.val()==24){
+         	$mon.val("2");
+         	moncount = 2;
+         }  
 銆�銆�銆�銆�}
    });
    

--
Gitblit v1.9.1