From cdd5fe1813e63adcddd61581cb886b9d154e5a3c Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期三, 16 一月 2019 19:19:38 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/mobil/batt-approved1.html |  226 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 125 insertions(+), 101 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index 1de45c5..6d44d6a 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -27,17 +27,17 @@
 			white-space: nowrap;
 		}
 		.uncheck{
-		    background-color: #dddddde0!important;
+		    background-color: #ddd!important;
             color: #000!important;
 		}
 		.ui-btn-icon-right {
             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%;
@@ -89,7 +89,7 @@
 										<tr>
 											<td>鏈烘埧鍚嶇О</td>
 											<td>
-												<input type="text" id="homeName"  class="unable" data-mini="true">        	
+												<textarea id="homeName" class="unable" data-mini="true"></textarea>		
 											</td>
 										</tr>
 										<tr>	
@@ -112,29 +112,29 @@
 										</tr>
 										
 										
-												<input type="hidden" id="StationName4" 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="StationName4" 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="BattFloatCurrent" class="unable" data-mini="true" />
+											<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="MonResStd" data-mini="true" />	
-												
-												<input type="hidden" id="MonSerStd" data-mini="true" />
-												
-												<input type="hidden" id="MonVolLowToAvg" 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" />
+								
+											<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>
 											<td>*璐熻浇鐢垫祦(A)</td>
@@ -145,7 +145,7 @@
 												<input type="hidden" id="DisCurrMax" class="unable" data-mini="true" />
 
 										<tr>
-											<td>鍩虹珯鐢佃瘽鍙风爜</td>
+											<td>*鍩虹珯鐢佃瘽鍙风爜</td>
 											<td>
 												<input type="text" id="station_phone" class="unable" data-mini="true" />
 											</td>
@@ -162,19 +162,7 @@
 											</td>
 										</tr>
 										
-										<tr>
-											<td>*閫氳璁℃暟</td>
-											<td>
-												<input type="text" id="tongxunnumber" class="unable" data-mini="true" />
-											</td>
-										</tr>
-										
-										<tr>
-											<td>*涓㈠寘鐜�</td>
-											<td>
-												<input type="text" id="diubaonumber" class="unable" data-mini="true" />
-											</td>
-										</tr>
+									
 										
 										<tr>
 											<td>*鏄惁楠屾敹</td>
@@ -264,15 +252,18 @@
 	
 	function battnumber(){
        var selected=''
-       for(var i=1;i<=temp.length;i++){
-       		selected+= '<option '+'value='+i+'>'+"鐢垫睜缁�"+i+'</option>';	
+       console.info(temp);
+       if(temp.length>0){
+	       for(var i=0;i<temp.length;i++){
+	       		selected+= '<option '+'value='+i+'>'+temp[i].binf.BattGroupName+'</option>';	
+	       }
+	       return $('#newbattnum').html(selected); 
        }
-       return $('#newbattnum').html(selected); 
   	}	
 		
    function creatBattView(index){
          var count=index+1
-            ,battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+count+'</h1>'+
+            ,battTitle='<div>'+'<h1 class="hbg">'+temp[index].binf.BattGroupName+'</h1>'+
              '<table class="layout-set">'+'<tbody>'/*+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal" >'+'<select '+'id='+'battproducer'+index+' class="unable" '+'>'
             ,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'*/
             ,battBrand='<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'battproducer'+index+' data-mini="true"'+'value='+'鐢垫睜鍝佺墝'+count+' />'+'</td>'+'</tr>' 
@@ -289,11 +280,11 @@
          return battTitle+battBrand+battType+battNum+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>';
+   		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,10 +306,10 @@
 	var arr = temp;
 	
 	function setcookieCreat(i){
-		var index=Math.ceil(i-1);
-		arrdata = temp[index].binf;
-		//console.info(index);
-		//console.info(temp);
+		console.info(temp);
+		console.info(i)
+		//var index=Math.ceil(i-1);
+		arrdata = temp[i].binf;
 		console.info(arrdata);
 		var json = JSON.stringify(arrdata);
 		setCookie("batt",json);
@@ -333,7 +324,7 @@
 		}
 		
 		// 瀛樺偍鎵�鏈夌殑鏁版嵁
-		$('#homeInfoIframeAll').data('allData', temp);
+	$('#homeInfoIframeAll').data('allData', temp);
 		var _data = temp[0];
 		var _temp = {
 			homeId: _data.binf.StationId
@@ -344,7 +335,7 @@
 		}
 		
 		// 瀛樺偍闇�瑕佺殑homeInfo淇℃伅
-		$('#homeInfoIframe').data('homeInfo', _temp);
+	$('#homeInfoIframe').data('homeInfo', _temp);
 		
 		iframePopup = layer.open({
              type: 2
@@ -354,6 +345,12 @@
              ,full: true
              ,anim: 4
              ,content: 'iframe/homeinfo1.html'
+             ,success: function() {
+             	$('div[data-role=page]').hide();
+             }
+             ,end: function() {
+             	$('div[data-role=page]').show();
+             }
          });
          layer.full(iframePopup);
 	})
@@ -364,8 +361,8 @@
 	console.info(tempgroupid);//鐢垫睜缁� ID 鏁扮粍锛岋紙鑻ユ坊鍔狅紝鍒欓渶瑕佹柊寤猴級;
 	var addbattnum = temp.length;//娣诲姞鐢垫睜缁勬暟鐩鏁�
 	var moncount = 0;
-	var fuchongfazhi = [0,0,0,0];
-	var lixiandianyafazhi = [0,0,0,0];
+	//var fuchongfazhi = [0,0,0,0];
+	//var lixiandianyafazhi = [0,0,0,0];
 	battnumber();
    $(function(){
 	   creatAllView(temp.length).trigger('create');
@@ -374,11 +371,47 @@
 
 	$(function () {
 		//setTimes($("#startTestrecord"),'2000-01-01');
-		//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
-		
-		installstartdata(temp);
+		//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));		
+		installstartdata(temp);//瀵煎叆鍒濆椤甸潰鍊�
+		//getnewnumber(temp[0].binf.FBSDeviceId);
+		updateinstalldata();
 	});
+	var timeer = '';
+	
     
+    function updateinstalldata(){
+    	console.info(temp);
+    	// 娓呴櫎璁℃椂鍣�
+    	clearInterval(updateinstalldata.timer);
+    	var data=temp[0].binf.StationId;
+ 		var _data ={ binf:{
+ 					StationId:data
+ 					}
+ 					}
+    	data=JSON.stringify(_data);
+    	//console.info(data);
+    	$.ajax({                                   //鐢宠楠屾敹
+	 			type: 'post',
+				async: true,
+				url: 'Battinf_applyAction!serchById',
+				data: "json="+data,
+				dataType: 'json',
+				success:function(data) {				
+					data = JSON.parse(data.result);
+					console.info(data);
+					if(data.code==1&&data.data.length>0){
+						data = data.data;
+						//console.info(data[0].check_en);
+						document.getElementById("check_en").value = yanshou(data[0].check_en);
+					}
+					
+					// 鏇存柊鍐呭
+					updateinstalldata.timer = setTimeout(function() {
+						updateinstalldata();
+					}, 4000);
+				}
+			});
+    }
     function applyendyanshou(arr){   //鐢宠楠屾敹
 		var temp = JSON.stringify(arr);
 			$.ajax({                                   //鐢宠楠屾敹
@@ -397,7 +430,7 @@
 			});
 		
 		}
-  	  // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�   //
+  	// 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�   //
   	function setFloatAndoutLine(index) {
   		var monvolstd = "#MonVolStd"+index;
   		var MonCount = "#MonCount" +index;
@@ -453,8 +486,7 @@
 			//setTimes($("#startTestrecord"),data.productDate);
 			//setTimes($("#endTestrecord"),data.useDate);
 				document.getElementById("install_user").value = data.install_user;
-			document.getElementById("tongxunnumber").value = getCookienumber(data.StationId);
-			document.getElementById("diubaonumber").value = getCookiediubao(data.StationId)
+			
 				
 			for(var i=0;i<temp.length;i++){
 				data=temp[i];		
@@ -476,41 +508,40 @@
 			}
 	}
 	
-	 function getCookienumber(id){//杈撳叆ID锛岃繑鍥為�氳璁℃暟銆傛暟鎹粠缂撳瓨鑾峰彇銆�
-	 	//var a = getnumber();
-	 	//console.info(a);
-	 	if(getCookie("numberget")){
-		 	var number = getCookie("numberget");
-		 	number = JSON.parse(number);
-		 	console.info(number);
-		 	if(number[0]){
-		 		for(var i =0; i<number.length;i++){
-		 			if(id == number[i].dev_id){
-		 				return number[i].dev_commcount;
-		 			}
-		 		}	
-		 	}
-	 	}
-	 	return 0;
+
+	 function getnewnumber(id){//涓㈠寘鐜囷紝閫氳璁℃暟
+	 $.ajax({
+ 			type: 'post',
+			async: true,
+			url: 'Battinf_applyAction!devCommNum',
+			data: null,
+			dataType: 'json',
+			success:function(data) {
+				console.info(data);
+				data = JSON.parse(data.result);
+				if(data.code==1){
+					console.info(data.data);
+					data=data.data;
+					console.info(data[0]);
+					for(var i=0;i<data.length;i++){
+					console.info(data[i].dev_id);
+					console.info(id)
+						if(data[i].dev_id==id){
+							console.info(id);						
+							document.getElementById("tongxunnumber").value = data[i].dev_commcount;
+							var errorCount = data[i].dev_errcommcount;
+			 				var allCount = data[i].dev_commcount+errorCount;
+			 				var parcent = (allCount==0?0:errorCount/allCount*100);
+			 				console.info(parcent);
+			 				document.getElementById("diubaonumber").value = parcent;
+						}
+					}
+				}
+			}
+		});
 	 }
-	 function getCookiediubao(id){   //涓㈠寘鐜�
-	 	if(getCookie("numberget")){
-		 	var number = getCookie("numberget");
-		 	number = JSON.parse(number);
-		 	console.info(number);
-		 	if(number[0]){
-		 		for(var i =0; i<number.length;i++){
-		 			if(id == number[i].dev_id){
-		 				var errorCount = number[i].dev_errcommcount;
-		 				var allCount = number[i].dev_commcount+errorCount;
-		 				var parcent = (allCount==0?0:errCount/allCount*100)
-		 				return parcent;
-		 			}
-		 		}	
-		 	}
-	 	}
-	 	return 0;
-	 }
+	 
+	
 	// 鏍煎紡鍖栨彁浜ゅ悗鍙颁俊鎭殑瀵硅薄鏁扮粍骞惰繑鍥� 鍗曚釜淇敼锛屾墜鏈烘柟寮忎笉淇敼澶氫釜鐢垫睜缁�
 		function getUpdateArr(){
 			mon=$('#MonVolStd').val();
@@ -590,13 +621,6 @@
 	        });  
 		});
 
- 	function nullOrn(){
-	
-	 		return true;
-	 	
- 	
- 	}
- 	
  	function editBatt(){//
  		console.info(getUpdateArr());
  		var temp = JSON.stringify(getUpdateArr());

--
Gitblit v1.9.1