From 4b5d2f2decf9b70654fd8add12789e87c50ff79b Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 07 一月 2019 17:56:14 +0800
Subject: [PATCH] 检测机房已存在

---
 gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html |   62 +++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index d92f858..1e55d78 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -41,6 +41,7 @@
         .ui-select .ui-btn select{
             width:77%;
         }
+        table tr td{width:1000em;padding-right:1em;}
 	</style>
 	<link rel="stylesheet" href="css/fgpanel.css">
 </head>
@@ -97,8 +98,7 @@
 										<tr>
 											<td>*鏈烘埧鍚嶇О</td>
 											<td>
-												<input type="text" id="homeName"  data-mini="true">
-									            	
+												<textarea id="homeName"  data-mini="true"></textarea>		
 											</td>
 										</tr>
 	
@@ -159,6 +159,13 @@
 												
 												<input type="hidden" id="MonVolLowToAvg" data-mini="true" />
 										
+												<input type="hidden" id="fuchongfazhi0" data-mini="true" />
+												
+												<input type="hidden" id="fuchongfazhi1" data-mini="true" />
+												
+												<input type="hidden" id="lixiandianyafazhi0" data-mini="true" />
+												
+												<input type="hidden" id="lixiandianyafazhi1" data-mini="true" />
 										<tr>
 											<td>*璐熻浇鐢垫祦(A)</td>
 											<td>
@@ -167,6 +174,7 @@
 										</tr>
 										
 												<input type="hidden" id="DisCurrMax" data-mini="true" />
+												<input type="hidden" id="judgeBatt" data-mini="true" />
 											
 										
 										<tr>
@@ -408,9 +416,6 @@
    
 
 	$(function () {
-		//setTimes($("#startTestrecord"),'2000-01-01');
-		//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
-		
 		//creatgroupid();//濡傛灉妫�娴嬩负NEW ,鍒欐墽琛屾坊鍔營D锛屽鏋滀负淇敼锛屽垯鎵ц涓烘嬁鍒癐D;
 		installstartdata(temp);
 	});
@@ -470,10 +475,8 @@
   		var chargeVol = (vol*1.117*monnum).toFixed(1);		// 娴厖鐢靛帇闃�鍊�
 		var outlineVol = (vol*1.073*monnum).toFixed(1);		// 绂荤嚎鐢靛帇闃�鍊�
 	
-		//$('#BattFloatCurrent').val(chargeVol);		// 娴厖鐢靛帇闃�鍊�
-		//$('#OfflineVolLevel').val(outlineVol);	// 绂荤嚎鐢靛帇闃�鍊�
-		fuchongfazhi[index] = chargeVol;
-		lixiandianyafazhi[index] = outlineVol;
+		$("#fuchongfazhi"+index).val(chargeVol);       // 娴厖鐢靛帇闃�鍊�
+		$("#lixiandianyafazhi"+index).val(outlineVol);   // 绂荤嚎鐢靛帇闃�鍊�
 		console.info(vol);
  	}
  	
@@ -510,7 +513,7 @@
                 ,BattGroupName: '鐢垫睜缁�1'
                 ,FloatVolLevel: 54
                 ,OfflineVolLevel: 42.9 
-                ,BattFloatCurrent: 10
+                ,BattFloatCurrent: 5
                 ,MonCount: 24
                 ,MonCapStd: 300
                 ,MonVolStd: 2
@@ -565,7 +568,7 @@
 			//setTimes($("#endTestrecord"),data.useDate);
 			document.getElementById("install_user").value = data.install_user;			
 			setFloatAndoutLine(1);
-		//setFloatAndoutLine();
+			//setFloatAndoutLine();
 	}
 	
 		function getUpdateArr(){
@@ -609,8 +612,8 @@
 						BattGroupId : $("#BattGroupId").val(),				//鐢垫睜缁刬d
 						BattGroupNum : $("#BattGroupNum").val(),			//鏈烘埧鍐呯數姹犵粍缂栧彿
 						BattGroupName : $(battString).val(),
-						FloatVolLevel : fuchongfazhi[i],			//娴厖鐢靛帇闃�鍊�
-						OfflineVolLevel : lixiandianyafazhi[i],			//绂荤嚎鐢靛帇闃�鍊�
+						FloatVolLevel : $("#fuchongfazhi"+i).val(),			//娴厖鐢靛帇闃�鍊�
+						OfflineVolLevel : $("#lixiandianyafazhi"+i).val(),			//绂荤嚎鐢靛帇闃�鍊�
 						BattFloatCurrent : $("#BattFloatCurrent").val(),		//娴厖鐢垫祦闃�鍊�
 						MonCount :$("#MonCount"+i).val(),				//鍗曚綋鏁伴噺
 						MonCapStd : $("#MonCapStd"+i).val(),				//鏍囩О瀹归噺
@@ -635,7 +638,7 @@
 			console.info(arr);
 			return arr;
 		}
-	
+	 
 </script> 
 <script type="text/javascript">  
 	$(function(){
@@ -646,12 +649,10 @@
 		$("#sure").click(function(){
 			if(nullOrn()){	
 				creatgroupid();//鎻愪氦涔嬪墠鍐嶆楠岃瘉锛屽垱寤篒D
-				addBattnew(); 	//鎻愪氦
-					
+				JudegeBattIn();//鎻愪氦鍓嶉獙璇佽鐢垫睜缁勫湪BATTINF琛ㄤ腑鏄惁宸插瓨鍦�
+				//addBattnew(); 	//鎻愪氦		
 			}else{
 			}				//楠岃瘉閲嶈椤规槸鍚︿负绌猴紝涓虹┖鍒欐彁绀猴紱   
-	   		//function backpage(){window.location.href="ele-param1.html";}
-	 		// setTimeout(backpage,500); 
 		});
 		$("#cancel").click(function(){
 	    	window.location.href="ele-param2.html";
@@ -668,8 +669,31 @@
  		}
  	}
  	
+ 	function JudegeBattIn(){
+ 		var battinff ={
+			StationName: ($("#mainteArea").val()+"-"+$("#city").val()+"-"+$("#homeName").val()+"-"+$("#StationName4").val()),	// 鎷兼帴鏈烘埧鍚嶇О		
+ 		}
+ 		console.info(battinff);
+ 		$.ajax({
+ 			type: 'post',
+			async: true,
+			url: '../BattInfAction!judgeBatt',
+			data: "json="+JSON.stringify(battinff),
+			dataType: 'json',
+			success:function(data) {
+				data = JSON.parse(data.result);
+				console.info(data);
+				if(data.code!=1){
+					addBattnew()
+				}else{
+					alert("璇ユ満鎴垮凡瀛樺湪锛岃杩斿洖涓婁竴椤垫悳绱㈡淇敼");
+				}
+			}
+		});
+ 	}
+ 	
  	function addBattnew(){//鏂板缓鐢垫睜缁勶紝娣诲姞鍒扮敵璇�
- 	console.info(getUpdateArr());
+ 		console.info(getUpdateArr());
  		var temp = JSON.stringify(getUpdateArr());
  		console.info(temp);
  		$.ajax({

--
Gitblit v1.9.1