From f0bb5c3c5b95ec825e4e444b7688c595d5ebebc7 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期六, 29 十二月 2018 14:24:54 +0800
Subject: [PATCH] 修改。

---
 gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html |  111 +++++++++++++++++++++----------------------------------
 1 files changed, 42 insertions(+), 69 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index b528e22..d92f858 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -33,10 +33,10 @@
             padding-right: 8.5em;
         }
         .hbg{
-            background-color:#ddd9;
+            background-color:#ddd;
         }
         #battdata {
-            background-color:#dddddd54
+            background-color:#eee;
         }
         .ui-select .ui-btn select{
             width:77%;
@@ -101,29 +101,22 @@
 									            	
 											</td>
 										</tr>
-										
-											
+	
 												<input type="hidden" id="StationName4" data-mini="true" />
 											
-										
-												<input type="hidden" id="StationIp" data-mini="true" />
-											
+												<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" />
 											
-										
 												<input type="hidden" id="FloatVolLevel" data-mini="true" />
 											
-										
-											
 												<input type="hidden" id="OfflineVolLevel" class="unable" data-mini="true" />
-											
-										
 											
 												<input type="hidden" id="BattFloatCurrent" class="unable" data-mini="true" />
 											
@@ -161,7 +154,9 @@
 										</tr> -->
 										
 												<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>
@@ -182,6 +177,7 @@
 										</tr>
 
 											<input id="startTestrecord"  type="hidden" name="appDate" class="appDatefir"  value="2000-01-01 00:00:00" />
+											
 											<input id="endTestrecord" type="hidden" name="appDate" class="appDatesec"  value="2017-01-01 00:00:00" />
 											
 										<tr>
@@ -234,20 +230,10 @@
             ,battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+count+'</h1>'+
              '<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>'  
-             
-             
-             
-             
-             
-            
-             
+            ,battType='<tr>'+'<td>'+'鐢垫睜鍨嬪彿'+'</td>'+'<td>'+'<input type="text" '+'id='+'batttype'+index+' data-mini="true"'+'value='+'鐢垫睜鍨嬪彿'+count+' />'+'</td>'+'</tr>'   
              
             ,battNum='<tr>'+'<td>'+'*鍗曚綋鏁伴噺'+'</td>'+'<td>'+'<fieldset data-role="controlgroup"  data-type="horizontal">'+'<select '+ 'id='+'MonCount'+index+'>'
-            ,battNumOpt=selectedNum(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'  
-             
-             
-             
+            ,battNumOpt=selectedNum(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'           
              
             ,MonVolStd='<tr>'+'<td>'+'*鏍囩О鍗曚綋鐢靛帇(V)'+'</td>'+'<td>'+'<input type="text" '+'id='+'MonVolStd'+index+' data-mini="true"'+' class="unable" '+'/>'+'</td>'+'</tr>'
             ,nomCap='<tr>'+'<td>'+'*鏍囩О瀹归噺(AH)'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" >'+'<select '+'id='+'MonCapStd'+index+' data-mini="true"'+'>'+creatMonCapOpt()+'</select>'
@@ -267,25 +253,25 @@
  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>';
+	       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");
@@ -582,7 +568,6 @@
 		//setFloatAndoutLine();
 	}
 	
-
 		function getUpdateArr(){
 			mon=$('#MonVolStd').val();
 			var moncount = 0;
@@ -674,13 +659,13 @@
 	});
  	
  	function nullOrn(){
-	 //	if($("#BattFloatCurrent").val()&&$("#MonCapStd").val()){
-	 		return true;
-	 	//}else{
-	 		//alert("*椤逛负蹇呭~椤癸紝涓嶈兘涓虹┖锛岃閲嶆柊杈撳叆");
-	 		//return false;
-	 //	}	
- 	
+ 		console.info($("#homeName").val());
+ 		console.info($("#station_phone").val());
+ 		if($("#homeName").val!=""&&$("#station_phone").val()!=""&&$("#install_user").val()!=""){
+	 		return true;	
+ 		}else{
+ 			alert("璇峰~鍐�*鍐呭");
+ 		}
  	}
  	
  	function addBattnew(){//鏂板缓鐢垫睜缁勶紝娣诲姞鍒扮敵璇�
@@ -709,24 +694,14 @@
    
    
    
-   function creatMonCapOpt(suoyin){
-        
-       var k,optionStr='',allString;
-       
+   function creatMonCapOpt(suoyin){       
+       var k,optionStr='',allString   
         for(var i=1;i<11;i++){
-        
-          k=i*50;
-          
+          k=i*50;         
            //optionStr+='<option'+' value='+k+'>'+k+'</option>';
           optionStr+='<option'+' value='+k+'>'+k+'</option>';
-           
-          
-           
           }
         return  allString=optionStr+'<option'+' selected = selected '+' value='+1000+'>'+1000+'</option>';
-           
-      
-        
    }
    
    function getRadioValue(na){
@@ -748,8 +723,7 @@
 	                 if($(this).find("option:selected").val()==4){$(vol).val(12);}
 	                 if($(this).find("option:selected").val()==24){$(vol).val(2);} 
 	          })
-          })(u)
-               
+          })(u)               
          }    
    }
    setchangedMonVolStd(suoyin);
@@ -757,8 +731,7 @@
           for(var i=0;i<index;i++){
              var s='#MonVolStd'+i;
              $(s).val(12);
-          }
-         
+          }         
     }
    
     /* 鎿嶄綔鎴愬姛 

--
Gitblit v1.9.1