From cf62668c660860e9288dab21c4066927a26cb787 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期六, 29 十二月 2018 10:02:37 +0800
Subject: [PATCH] 筛选跳转页面

---
 gx_tieta/WebRoot/mobil/batt-edit2.html |   51 ++-----------------------
 gx_tieta/WebRoot/mobil/ele-param2.html |   23 ++++++++---
 2 files changed, 22 insertions(+), 52 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index 8a895ed..d4b4fb0 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit2.html
@@ -47,9 +47,7 @@
 		    right: 0;
 		    margin:0!important; 
         }
-         #newbattnum-button{
-            padding: 1em 1.9em;
-         }
+    
 	</style>
 	<link rel="stylesheet" href="css/fgpanel.css">
 </head>
@@ -60,17 +58,7 @@
 		<div data-role="header" data-position="fixed">
 			<a href="ele-param2.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
 			<h1>淇敼鐢垫睜缁勪俊鎭厤缃�</h1>
-			<fieldset data-role="controlgroup" class="ptr0" >
-		           
-		           
-			            <select id="newbattnum" data-mini="true">
-			              <option value=0>鏂板缓鐢垫睜缁�</option>
-			              
-			            </select>
-			            
-			            
-		            	
-		        	</fieldset>
+
 			
 		</div>
 		<!-- 涓讳綋鍐呭 -->
@@ -299,18 +287,7 @@
   	
   	}
   }
-  function creatBa(a){
-        var battnum=4-a,
-            opstring='';        
-        if(a>4&&battnum<=0){return false;}
-        for(var i=0;i<=battnum;i++){
-             
-           opstring+='<option value='+i+'>鏂板缓'+i+'涓數姹犵粍</option>';
-        }
-         console.warn(opstring+'ttt'); 
-         return $('#newbattnum').html(opstring);
-   }
-  
+
  
   function selectedIndex(index){
        var selected='',
@@ -343,7 +320,6 @@
    creatAllView(temp.length).trigger('create');
    //creatMonCapOpt(temp.length);
    setchangedMonVolStd(temp.length);
-   creatBa(temp.length).trigger('create');
    
    });
  
@@ -423,17 +399,7 @@
     	return (Array(length).join('0') + num).slice(-length);
 	}
 	
-	function creatBa(a){
-        var battnum=4-a,
-            opstring='';        
-        if(a>4&&battnum<=0){return false;}
-        for(var i=0;i<=battnum;i++){
-             
-           opstring+='<option value='+i+'>鏂板缓'+i+'涓數姹犵粍</option>';
-        }
-         console.warn(opstring+'ttt'); 
-         return $('#newbattnum').html(opstring);
-   }
+
 	//瀵煎叆琛ㄦ牸榛樿鏁版嵁
 	function installstartdata(temp){
 			data=temp[0].binf;
@@ -630,14 +596,7 @@
    
    
    
-   $('#newbattnum').change(function(){
-    	var numbattnum = parseInt($('#newbattnum').val());
-    	var index =parseInt(tempindex.length);
-    	addbattnum=Math.floor((numbattnum)+(tempindex.length));
-    	console.warn(addbattnum);
-    	creatAllView(addbattnum).trigger('create');
-    	creatBattGroupId(addbattnum);
-   });
+
    /*function creatMonCapOpt(suoyin){
         var optionStr,allString;
        
diff --git a/gx_tieta/WebRoot/mobil/ele-param2.html b/gx_tieta/WebRoot/mobil/ele-param2.html
index 16c3da1..e4075f3 100644
--- a/gx_tieta/WebRoot/mobil/ele-param2.html
+++ b/gx_tieta/WebRoot/mobil/ele-param2.html
@@ -231,8 +231,9 @@
    		var iframePopup = '';
         function getEditButIndex(t){
 		    console.warn($(t).attr("but-index")+' 淇敼');
-		    var index = $(t).attr("but-index");   
-		   	var parm = seteditparm(index);
+		    var index = $(t).attr("but-index");
+		       
+		   	var parm = seteditparm(t);
 		  //	console.info(getCookie("eleparm"));
 		  	window.location.href="batt-edit2.html";		  
 		    return ;
@@ -255,9 +256,15 @@
 		//setPage();
 		$("#submit").off('click').on('click.cjj123',function(){
 			//newbattnum;
-		
+			//var homename= $('#homename').val()
 			//Page.pageCurr=1;
-			SearchParam();
+			//console.info(homename);
+			//console.info($('#homeName').val());
+			if($('#homeName').val()&&$('#homeName').val()!=""){
+				SearchParam();
+			}else{
+				alert("璇烽�夋嫨涓�涓満鎴�");
+			}
 		});
 	 });
 	
@@ -375,6 +382,8 @@
  	}
  	
  	function creatYanshouObj(arrdata,index){
+ 	console.info(arrdata[0]);
+ 	console.info(index);
 			var StationId = arrdata[index].StationId;
 			//console.info(StationId);
 			var arr = new Array(); //鍒濆鍖栦紶鍙傛暟缁�
@@ -522,7 +531,8 @@
 						arrTd.push(data[i].BattProductDate.substr(0,10));			//鐢垫睜鐢熶骇鏃ユ湡
 						arrTd.push(data[i].BattInUseDate.substr(0,10));			//鎶曞叆浣跨敤鏃ユ湡
 						arrTd.push(data[i].install_user);					// 璁惧瀹夎浜哄憳
-						arrTd.push('<a onclick="getEditButIndex(this)"  id="edit" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>淇敼</a>');
+						arrTd.push("");
+						//arrTd.push('<a onclick="getEditButIndex(this)"  id="edit" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>淇敼</a>');
 						Page.pageAll = data[i].num;
 						
 					    num.push(data.length);
@@ -533,7 +543,8 @@
 					Page.pageAll = 0;
 				}
 				setPage();	
-				createTbl(tblCon, arrTh, arrTd);			
+				//createTbl(tblCon, arrTh, arrTd);	
+				getEditButIndex(0);		
 			}	
 		});	  
 

--
Gitblit v1.9.1