From 5fe2efb71f6ad809a1cfc59beab18bbea99fff5e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 18 一月 2019 09:01:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/js/elecircle.content.js          |    9 
 gx_tieta/WebRoot/mobil/batt-edit2.html            |    6 
 gx_tieta/WebRoot/mobil/ele-param2.html            |   38 ++
 gx_tieta/WebRoot/mobil/js/tbl.js                  |  188 +++++++++++
 gx_tieta/WebRoot/mobil/iframe/searchBatt.html     |   15 
 gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html |   14 
 gx_tieta/WebRoot/mobil/hcheckAccpet.html          |    1 
 gx_tieta/WebRoot/mobil/control_battparm.html      |  181 ++++++++++
 gx_tieta/WebRoot/control.jsp                      |    3 
 gx_tieta/WebRoot/iframe/homeinfo.html             |    1 
 gx_tieta/WebRoot/mobil/batt-approved1.html        |   16 
 gx_tieta/WebRoot/mobil/testdata.html              |   61 +++
 gx_tieta/WebRoot/mobil/control_sysparm.html       |  183 ++++++++++
 gx_tieta/WebRoot/mobil/control.html               |  276 +++++++++++++++
 gx_tieta/WebRoot/mobil/iframe/homeinfo1.html      |    2 
 15 files changed, 962 insertions(+), 32 deletions(-)

diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 0c85e8a..41c33a3 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -3735,6 +3735,9 @@
 				// 璁剧疆閫氫俊璁℃暟
 				status.setText('count', "閫氫俊璁℃暟锛�"+data.dev_commcount);
 				
+				// 璁剧疆璁惧鐗堟湰鍙�
+				status.setText('devVersion', '璁惧鐗堟湰鍙凤細'+data.dev_version);
+				
 				// 璁剧疆涓㈠寘鐜�
 				var errorCount = data.dev_errcommcount;
 				var allCount = data.dev_commcount+errorCount;
diff --git a/gx_tieta/WebRoot/iframe/homeinfo.html b/gx_tieta/WebRoot/iframe/homeinfo.html
index e94a893..623d4a1 100644
--- a/gx_tieta/WebRoot/iframe/homeinfo.html
+++ b/gx_tieta/WebRoot/iframe/homeinfo.html
@@ -463,6 +463,7 @@
                         VideoOrImage: 'video'
                     })
                 }
+                ,exts: 'mp4|MOV|avi|rmvb'
                 ,accept: 'video' //瑙嗛
                 ,choose: function(obj) {
                 	var files = this.files = obj.pushFile();
diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index f887e9c..3b3767c 100644
--- a/gx_tieta/WebRoot/js/elecircle.content.js
+++ b/gx_tieta/WebRoot/js/elecircle.content.js
@@ -1045,6 +1045,15 @@
 			}
 		},
 		{
+			name:'devVersion',
+			type: 'text',
+			status: 0,
+			notShow: false,
+			content: {
+				text: '璁惧鐗堟湰鍙凤細锛燂紵锛�'
+			}
+		},
+		{
 			name: 'signal',
 			type: 'text',
 			status: 0,
diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index 7d8308c..6d44d6a 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -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>
@@ -385,7 +373,7 @@
 		//setTimes($("#startTestrecord"),'2000-01-01');
 		//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));		
 		installstartdata(temp);//瀵煎叆鍒濆椤甸潰鍊�
-		getnewnumber(temp[0].binf.FBSDeviceId);
+		//getnewnumber(temp[0].binf.FBSDeviceId);
 		updateinstalldata();
 	});
 	var timeer = '';
diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index e71a217..e6a930b 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit2.html
@@ -279,10 +279,12 @@
 
  
   function selectedIndex(index){
+ 	var battproducer = getCookie("producer");
+	battproducer = JSON.parse(battproducer);
+  	console.info(battproducer);
        var selected='',
            i=0;
-       var battproducer = ["鐞嗗+","鍦i槼","鍙岀櫥","SENRY","鍗楅兘","鐖遍粯鐢�","绉戝+杈�","閾舵嘲","涓版棩","涓叴鑳芥淳","鍏夊畤",
-       "鑹捐鏂崕杈�","闆勯煬","椋庡竼","鏂囬殕","涓北"];
+       //onsole.info(inde)
        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]){
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index c012ae3..4891500 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -259,7 +259,7 @@
   }
  
  function selectedIndex(index){
-       var selected='',
+   /*    var selected='',
            i=0;
 	       selected+= '<option '+'value='+'鐞嗗+'+'>'+'鐞嗗+'+'</option>';
 	       selected+= '<option '+'value='+'鍦i槼'+'>'+'鍦i槼'+'</option>';
@@ -280,9 +280,21 @@
 			selected+= '<option '+'value='+'涓北'+'>'+' 涓北'+'</option>';
 			selected+= '<option '+'value='+'缇庣殑'+'>'+' 缇庣殑'+'</option>';
 			selected+= '<option '+'value='+'鏈楄揪'+'>'+' 鏈楄揪'+'</option>';
+			selected+= '<option '+'value='+'鐑界伀'+'>'+' 鐑界伀'+'</option>';*/
+      var battproducer = getCookie("producer");
+		battproducer = JSON.parse(battproducer);
+       var selected='',
+           i=0;
+       for(var i=1;i<battproducer.length;i++){
+       		console.info(battproducer[i]);
+       		selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';	
+       } 
        return selected; 
   }	
   	var temp = getCookie("eleparm");
+  	var test=getCookie("eleparm2newbatt");
+  	//jifangname = JSON.parse(jifangname);
+  	console.info(test);
 	//console.info(temp);
 	temp=JSON.parse(temp);
 	console.info(temp);
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index a8de8a7..5b58311 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -46,20 +46,43 @@
 			</li> -->
 		</ul>
 		<div data-role="collapsible" data-collapsed="false">
-	      <h1 id="zhuangtai">鐢垫睜缁勭姸鎬�</h1>
+	      <h1 id="jifangzhuangtai">bts璁惧鐘舵��</h1>
 	      <div class="tbl-container"></div>
 	    </div>
+		<div data-role="collapsible" data-collapsed="false">
+	      <h1 id="zhuangtai">鐢垫睜缁勭姸鎬�</h1>
+	      <div class="tbl-container"></div>
 	</div>
+		<div data-role="footer" data-position="fixed" data-theme="a">    
+			<div data-role="navbar">
+				<ul>
+				  <li><a href="" id="battparm" target="_top" data-role="button" data-icon="home" data-transition="slide">鐢垫睜鍙傛暟</a></li>
+				   <li><a href="" id ="sysparm"  class="ui-btn ui-btn-inline ui-corner-all  ui-btn-icon-check" data-icon="check" data-role="button">绯荤粺鍙傛暟</a></li>
+				  <li><a href="" id="signalqual" class="ui-btn ui-btn-inline ui-corner-all  ui-btn-icon-check" data-icon="check" data-role="button">淇″彿璐ㄩ噺</a></li>
+				</ul>
+			</div>		
+		</div> 
 	<script type="text/javascript" src="js/tbl.js"></script>
 	<script type="text/javascript" src="mobilJs/base.js"></script>
 	<script type="text/javascript" src="js/battNav.js"></script>
 	<script>
 		var arrTh = ['鐢垫睜鐘舵�侊細', '绔數鍘嬶細', '鐢垫睜鐢垫祦锛�', '娴嬭瘯鏃ユ湡锛�', '娴嬭瘯鏃堕暱锛�', '娴嬭瘯瀹归噺锛�', '鍓╀綑瀹归噺锛�', '缁埅鏃堕棿锛�'];
-		var tbl = $('.tbl-container').eq(0);
-		
+		var tbl = $('.tbl-container').eq(1);
+		var jifangarrTh = ['SD鍗�','閫氳璁℃暟','閫氫俊涓㈠寘鐜�','娴嬭瘯缁勫彿','璁惧宸ヤ綔鐘舵��']
+		var tbl1 = $('.tbl-container').eq(0);
+		var arrtdjifangstate = new Array;
+		var temp = getCookie("batt");
+		var batt = JSON.parse(temp);
+		var arrTd1 = new Array();
 		$(function() {
 			//findrtstate();
+			//searchStationSignal();
+			searchDevSDState();
 			searchBattInfo();
+			//searchdiubao();
+			createTbl(tbl1, jifangarrTh, arrTd1);
+			//searchJifangInfo();
+			//searchSysData();
 		});
 		$("#return").click(function(){
 			var temp = getCookie("batt");
@@ -81,6 +104,17 @@
 				window.location.href="testdata.html";
 			}
 		});
+		$("#signalqual").click(function(){
+			searchStationSignal();
+		})
+		$("#battparm").click(function(){
+			searchBattparm();
+		})
+		$("#sysparm").click(function(){
+		//console.info("aaa")
+			searchSysData();
+		})
+	
 		var timeer ;
 		//鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜缁勪俊鎭�
 		/* function findrtstate(){
@@ -124,9 +158,8 @@
 		
 		//鏌ヨ鐢垫睜淇℃伅
 		function searchBattInfo(){
-			var temp = getCookie("batt");
-			var batt = JSON.parse(temp);
-			console.info(batt);
+		
+			//console.info(batt);
 			arrTd = new Array();
 			$.ajax({ 	
 		        type: "post", 				
@@ -134,7 +167,7 @@
 		        async:true,				
 		        dataType:'text',
 		        data:"rtstate.battGroupId="+batt.BattGroupId,		
-		        success: function(data){ 
+		        success: function(data){  
 					data = eval("("+data+")");
 					model = data.model;
 					if(model.code == 1){
@@ -172,6 +205,235 @@
 			});
 		}
 		
+		function searchBattparm() {
+					//console.info(temp);
+				var temp={
+					dev_id:batt.FBSDeviceId,
+				}
+				loadshow();
+				// 鏌ヨ鐢垫睜鍙傛暟
+				$.ajax({
+					type: 'post'
+					,async: true
+					,url:'Fbs9100_battparamAction_action_serchByCondition'
+					,data: 'json='+JSON.stringify(temp)
+					,dataType: 'json'
+					,success: function(res) {
+						var rs = JSON.parse(res.result);
+						console.log(rs);
+						if(rs.code==1){
+							var data = rs.data[0];
+							var json=window.JSON.stringify(data);
+		                		setCookie("control_battparm",json);
+		                		window.location.href="control_battparm.html"
+						}else{
+							alert("鏌ヨ澶辫触");
+						}
+						loadclose();
+					}
+					,complete: function() {
+						loadclose();
+					}
+				});
+			
+			}
+			
+		function searchdiubao(arrTd1){
+			$.ajax({ 	
+		        type: "post", 				
+		        url: "Fbs9100_stateAction_action_serchContactorState",				
+		        async:true,				
+		        dataType:'text',
+		        data:"json="+JSON.stringify({
+		        	dev_id:batt.FBSDeviceId
+		        }),		
+		        success: function(data){ 
+		        	data=JSON.parse(data);
+		        	data = JSON.parse(data.result);
+		        	console.info(data);
+		        	if(data.code==1&&data.data.length>0){
+		        		data = data.data[0];
+		        		var jishu = data.dev_commcount;
+		        		//console.info(jishu);
+		        		arrTd1.push(jishu);
+		        		var diubao=(data.dev_commcount==0?0:(data.dev_errcommcount*100/data.dev_commcount)).toFixed(2);
+		        		arrTd1.push(diubao);
+		        		arrTd1.push("鐢垫睜缁�"+data.dev_testgroupnum);
+		        		arrTd1.push(workstate(data.dev_workstate));
+		        		createTbl(tbl1, jifangarrTh, arrTd1);
+		        	}else{
+		        		var arrTd2 = new Array();
+		        		arrTd2.push("璁惧鏈繛鎺�")
+		        		var jifangzhuangtai=["璁惧鐘舵��"]
+		        		createTbl(tbl1,jifangzhuangtai,arrTd2);
+		        	}
+		        }
+		     });
+		}
+		function workstate(data){
+			switch (data){
+			case 0:
+				return "鍦ㄧ嚎娴厖";
+				break;
+			case 1:
+				return "鏀剧數鐘舵��";
+				break;
+			case 2:
+				return "鍏呯數鐘舵��";
+				break;
+			case 3:
+				return "鍐呴樆娴嬭瘯";
+				break;
+			case 4:
+				return "鏈煡"			
+				break;
+			default:{
+        			//鏈繛鎺�
+    			return "鏈繛鎺�";
+        		}
+        	break;	
+			}
+		}
+		//鏌ヨ璁惧鐨凷D鍗$姸鎬�
+		function searchDevSDState(){
+			arrTd1=new Array();
+			//console.info(batt);
+			//var status = GLOBAL.circleStatus.status;	
+			$.ajax({
+	            type: "post",
+	            url: "Bts_station_stateAction_action_serchSDCard",
+	            async: true,
+	            dataType: 'json',
+	            data: "json = " + JSON.stringify(batt),
+	            success: function(result) {
+	               //console.info(result);
+	                var rs = JSON.parse(result.result);
+	               	console.info(rs);
+	                var sdStatus = (rs.data == 0)?'姝e父': '<span style="color: #FF0000">鏁呴殰</span>';
+	               	arrtdjifangstate .push(sdStatus);
+	                //console.log(sdStatus);
+	               // status.setText('sdCard', "SD鍗$姸鎬侊細"+sdStatus);
+	               arrTd1.push(sdStatus);
+	               searchdiubao(arrTd1);
+	                clearTimeout(searchDevSDState.timeout);
+	                searchDevSDState.timeout = setTimeout(function() {
+	                	searchDevSDState();
+	                }, 2000);
+	            },
+	            error: function() {
+	            	clearTimeout(searchDevSDState.timeout);
+	                searchDevSDState.timeout = setTimeout(function() {
+	                	searchDevSDState();
+	                }, 5000);
+	            }
+	        });
+		}
+		
+	function searchStationSignal(){//淇″彿寮哄害
+		var param={
+					num:145,
+					AT_cmd:"CSQ",
+					dev_id:batt.FBSDeviceId,
+		}
+		loadshow();
+		console.info(param);
+		$.ajax({ 	
+	        type:"post", 								
+	        url: "Bts_gprs_stateAction_action_update?t="+(new Date().getTime()),						
+	        async:true,				
+	        dataType:'json',
+	        data:'json='+JSON.stringify(param),		
+	        success: function(data){ 
+				var model = eval('('+data.result+')');
+				console.info(model);
+				//layer.msg(model);
+				if(model.code==1){
+				console.info(model.data);
+					data = model.data;				
+					console.info(data.ack_inf);
+					var msg=formatSignal(data.ack_inf);
+					console.info(msg.signal);
+					loadclose();
+					alert(msg.signal);
+				}
+	    	},error:function(e){
+	    		var model = {
+	    			code:0,
+	    			data:e,
+	    			msg:'閫氫俊澶辫触'
+	    		};
+	    	} 				
+		});
+	}
+		// 瑙f瀽淇″彿璐ㄩ噺缁撴灉
+			function formatSignal(signal) {
+				var rs = {
+					signal: '鏈煡',
+					bitError: '鏈煡',
+					img: 0
+				};
+				var ptn = new RegExp(".*:\\s(\\d{2}),(\\d{2})");
+				var testCsq = ptn.test(signal);
+				if(testCsq) {
+					rs.signal = RegExp.$1;
+					rs.bitError = RegExp.$2;
+					if(rs.signal>25) {
+						rs.img = 1;
+						rs.signal += '锛堝己锛�';
+					}else if(rs.signal>19) {
+						rs.img = 1;
+						rs.signal += '锛堜腑锛�';
+					}else {
+						rs.signal += '锛堝急锛�';
+					}
+				}
+				//console.info(rs);
+				return rs;
+			}
+	
+	
+		// 鏌ヨ璁惧鐨勭郴缁熷弬鏁�
+		function searchSysData() {
+				// 寮�鍚瓑寰呮
+				loadshow();
+				var temp = {
+					num:128,
+					dev_id:batt.FBSDeviceId,
+				}
+				console.info(temp);
+				// 璇锋眰鍚庡彴
+				$.ajax({
+		            type: "post",
+		            url: "Fbs9100_sysparamAction_action_serchByCondition",
+		            async: true,
+		            dataType: 'json',
+		            data: "json = " + JSON.stringify(temp),
+		            success: function(result) {
+		                var rs = JSON.parse(result.result);
+		                console.info(rs);
+		                if(rs.code == 1){
+		                	var data = rs.data[0];
+		                	console.info(data);
+		                	//if(showSU) {
+		                		//alert('璇诲彇鎴愬姛', true);
+		                		var json=window.JSON.stringify(data);
+		                		setCookie("control_parm",json);
+		                		window.location.href="control_sysparm.html"
+		                		loadclose();
+		                	//}
+		                }else{
+		                	noContent.showNoContent('鏌ヨ澶辫触!');
+		                	loadclose();
+		                }
+		            },
+		            error: function() {
+		            	noContent.showNoContent('鏌ヨ澶辫触!');
+		            	loadclose();
+		            	// 鍏抽棴绛夊緟    
+		            }
+		        });
+			}
+		
 		
 		var battstate=['鏃�','娴厖','鍏呯數','鏀剧數','鍧囧厖','鐢靛/鍐呴樆','鐢靛','娓╁害','杩炴帴鏉�','鍦ㄧ嚎鐩戞祴'];
 		function getBattstate(state){
diff --git a/gx_tieta/WebRoot/mobil/control_battparm.html b/gx_tieta/WebRoot/mobil/control_battparm.html
new file mode 100644
index 0000000..fa1fc7a
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/control_battparm.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>绯荤粺鍙傛暟</title>
+	<meta name="viewport" content="width=device-width,initial-scale=1">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+	<link href="mobilCss/mobiscroll.core-2.5.2.css" rel="stylesheet" type="text/css" />
+	<link href="mobilCss/mobiscroll.animation-2.5.2.css" rel="stylesheet" type="text/css" />
+	<link rel="stylesheet" type="text/css" href="css/tbl.css">
+	<link rel="stylesheet" type="text/css" href="src/css/layui.css">
+	<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+	<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+	<style type="text/css">
+		
+		/*瑙勫畾闈㈡澘鐨勬牱寮�*/
+		.ui-panel {
+    		width: 80%;
+		}
+		.ui-panel-dismiss{
+			width: 20%;
+		}
+		.ui-panel-inner{
+			padding:0 !important;
+		}
+		.ui-collapsible-heading-toggle{
+			padding-left: 1em !important;
+		}
+		.panel-header{
+			padding: 8px 0;
+			font-size: 1.2em;
+			text-indent: 1em;
+			background-color: #DFDCDC;
+		}
+		/*瑙勫畾寮�鍏崇殑浣嶇疆*/
+		.ui-flipswitch {
+			margin-left: 0.5em;
+		}
+		
+		.ui-field-contain{
+			padding: 0 0.6em ;
+		}
+        .ui-field-contain {
+		    border-bottom-color: #828282;
+		    border-bottom-color: rgba(0,0,0,.15);
+		    border-bottom-width: 1px;
+		    border-bottom-style: none;
+		}
+        .sicon{ 
+        	display:inline-block;width:4%;margin:1em 0;float:left; 
+        }
+        .checkdata{
+	         display:inline-block;width:48%;margin:0 0 0 0;float:left; 
+	     }
+	     
+	     .next-page, .pre-page {
+			position: fixed;
+			width: 40px;
+			height: 40px;
+			top: 50%;
+			margin-top: -15px;
+		}
+		.next-page  {
+			right: 0;
+		}
+		.pre-page  {
+			left: 0;
+		}
+	     
+       
+		table {
+			margin-top:.5em;
+			border-collapse:separate; 
+			border-spacing:0 .5em;
+		}
+		
+		tbody tr td{
+			overflow: hidden;
+			text-overflow:ellipsis;
+			white-space: nowrap;
+		}
+		.bg-line{
+		    background-color:#ddd;
+		}
+		.operat-but{
+		    margin: 0;
+            padding-top: 0.1em;
+            padding-bottom: 0.1em;
+            
+		}
+		.ui-table-reflow td .ui-table-cell-label, .ui-table-reflow th .ui-table-cell-label{
+		    width:35%;
+		} 
+		.fr{
+		float:right;
+		}
+	</style>
+	<link rel="stylesheet" href="css/fgpanel.css">
+</head>
+<body>
+	<div data-role="page">
+		
+		<!-- 澶撮儴鍐呭 -->
+		<div data-role="header" data-position="fixed">
+			<a href="control.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>
+			
+		</div>
+		<!-- 涓讳綋鍐呭 -->
+		<div data-role="main">
+			<!-- 琛ㄦ牸瀹瑰櫒 -->
+			<div class="tbl-container"></div>
+			<table data-role="table" class="ui-responsive ui-shadow" id="tab" >
+					
+			</table>
+		</div>
+
+	     
+	</div>
+	<!-- 瀛樺偍homeinfo鐨勫�� -->
+	<div id="homeInfoIframe"></div>
+	<div id="homeInfoIframeAll"></div>
+</body>
+
+<script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.core-2.5.2-zh.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.datetime-2.5.1.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
+<script type="text/javascript" src="js/tbl.js"></script>
+<script type="text/javascript" src="mobilJs/base.js"></script>
+<script type="text/javascript" src="src/layui.all.js"></script>
+
+ <script type="text/javascript">
+          /* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳   */
+
+    var arrTd = new Array();		//褰撳墠琛ㄦ牸td鏁版嵁
+    var tblCon = $('.tbl-container');
+    var Page = {
+		pageSize:20, 				//姣忛〉鐨勮鏁�
+		pageCurr:1,  				//褰撳墠椤电爜鏁�
+		pageAll:0,
+	};
+    
+    var arrTh = [ '璁惧ID', '鏈烘埧鍚嶇О', '鐢垫睜鏍囩О瀹归噺','鐢垫睜鏍囩О鍐呴樆','鐢垫睜缁勬暟','姣忕粍鐢垫睜鍗曚綋鏁伴噺','鍗曚綋鏍囩О鐢靛帇','鐢垫睜缁勭鏍囩О鐢靛帇','鐢垫睜鏍囩О娓╁害','鐢垫睜娴厖鐢靛帇闃堝��','鐢垫睜娴厖鐢垫祦闃堝��','鍦ㄧ嚎鐢靛帇浣庨槇鍊�','鐢垫睜缁勮繛鎺ョ被鍨�'];
+	dataArr = [];
+    var tbl = $('.tbl-container');
+    var temp = getCookie("control_battparm");
+	temp = JSON.parse(temp);
+	console.info(temp);
+    createTbl(tbl, arrTh, dataArr);
+	$(document).ready(function(){
+		Page.pageCurr=1;		
+		console.info(temp);
+		setBattLife();
+		//searchBattLife();
+		//console.info($("#getnumber").val());		
+	 });
+  	
+	function setBattLife(){
+		data = temp;
+		var index=0;
+			arrTd[index++] = data.dev_id;
+			arrTd[index++] = data.StationName;
+			arrTd[index++] = data.STD_CAP+"AH";
+			arrTd[index++] = data.STD_RES+"u惟";
+			arrTd[index++] = data.BattGroupCount;
+			arrTd[index++] = data.EachGroupBattCount;
+			arrTd[index++] = data.MonomerVol+"V";
+			arrTd[index++] = data.GroupVol+"V";
+			arrTd[index++] = data.BattTemp+"鈩�";
+			arrTd[index++] = data.FloatChargeVol+"v";
+			arrTd[index++] = data.FloatChargeCurr+"A";
+			arrTd[index++] = data.OnlineVolLow+"V";
+			arrTd[index++] = data.GroupConnType;
+		createTbl(tblCon, arrTh, arrTd);
+	}
+
+   </script>
+</html> 
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/control_sysparm.html b/gx_tieta/WebRoot/mobil/control_sysparm.html
new file mode 100644
index 0000000..47c929e
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/control_sysparm.html
@@ -0,0 +1,183 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>绯荤粺鍙傛暟</title>
+	<meta name="viewport" content="width=device-width,initial-scale=1">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+	<link href="mobilCss/mobiscroll.core-2.5.2.css" rel="stylesheet" type="text/css" />
+	<link href="mobilCss/mobiscroll.animation-2.5.2.css" rel="stylesheet" type="text/css" />
+	<link rel="stylesheet" type="text/css" href="css/tbl.css">
+	<link rel="stylesheet" type="text/css" href="src/css/layui.css">
+	<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+	<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+	<style type="text/css">
+		
+		/*瑙勫畾闈㈡澘鐨勬牱寮�*/
+		.ui-panel {
+    		width: 80%;
+		}
+		.ui-panel-dismiss{
+			width: 20%;
+		}
+		.ui-panel-inner{
+			padding:0 !important;
+		}
+		.ui-collapsible-heading-toggle{
+			padding-left: 1em !important;
+		}
+		.panel-header{
+			padding: 8px 0;
+			font-size: 1.2em;
+			text-indent: 1em;
+			background-color: #DFDCDC;
+		}
+		/*瑙勫畾寮�鍏崇殑浣嶇疆*/
+		.ui-flipswitch {
+			margin-left: 0.5em;
+		}
+		
+		.ui-field-contain{
+			padding: 0 0.6em ;
+		}
+        .ui-field-contain {
+		    border-bottom-color: #828282;
+		    border-bottom-color: rgba(0,0,0,.15);
+		    border-bottom-width: 1px;
+		    border-bottom-style: none;
+		}
+        .sicon{ 
+        	display:inline-block;width:4%;margin:1em 0;float:left; 
+        }
+        .checkdata{
+	         display:inline-block;width:48%;margin:0 0 0 0;float:left; 
+	     }
+	     
+	     .next-page, .pre-page {
+			position: fixed;
+			width: 40px;
+			height: 40px;
+			top: 50%;
+			margin-top: -15px;
+		}
+		.next-page  {
+			right: 0;
+		}
+		.pre-page  {
+			left: 0;
+		}
+	     
+       
+		table {
+			margin-top:.5em;
+			border-collapse:separate; 
+			border-spacing:0 .5em;
+		}
+		
+		tbody tr td{
+			overflow: hidden;
+			text-overflow:ellipsis;
+			white-space: nowrap;
+		}
+		.bg-line{
+		    background-color:#ddd;
+		}
+		.operat-but{
+		    margin: 0;
+            padding-top: 0.1em;
+            padding-bottom: 0.1em;
+            
+		}
+		.ui-table-reflow td .ui-table-cell-label, .ui-table-reflow th .ui-table-cell-label{
+		    width:35%;
+		} 
+		.fr{
+		float:right;
+		}
+	</style>
+	<link rel="stylesheet" href="css/fgpanel.css">
+</head>
+<body>
+	<div data-role="page">
+		
+		<!-- 澶撮儴鍐呭 -->
+		<div data-role="header" data-position="fixed">
+			<a href="control.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>
+			
+		</div>
+		<!-- 涓讳綋鍐呭 -->
+		<div data-role="main">
+			<!-- 琛ㄦ牸瀹瑰櫒 -->
+			<div class="tbl-container"></div>
+			<table data-role="table" class="ui-responsive ui-shadow" id="tab" >
+					
+			</table>
+		</div>
+
+	     
+	</div>
+	<!-- 瀛樺偍homeinfo鐨勫�� -->
+	<div id="homeInfoIframe"></div>
+	<div id="homeInfoIframeAll"></div>
+</body>
+
+<script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.core-2.5.2-zh.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.datetime-2.5.1.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
+<script type="text/javascript" src="js/tbl.js"></script>
+<script type="text/javascript" src="mobilJs/base.js"></script>
+<script type="text/javascript" src="src/layui.all.js"></script>
+
+ <script type="text/javascript">
+          /* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳   */
+
+    var arrTd = new Array();		//褰撳墠琛ㄦ牸td鏁版嵁
+    var tblCon = $('.tbl-container');
+    var Page = {
+		pageSize:20, 				//姣忛〉鐨勮鏁�
+		pageCurr:1,  				//褰撳墠椤电爜鏁�
+		pageAll:0,
+	};
+    
+    var arrTh = [ '璁惧ID', '璁惧鍚嶇О', '鎬荤画鑸椂闂�','淇濅竴娆′笅鐢电画鑸椂闂�','鐢垫祦閽抽噺绋�','涓�娆′笅鐢电數鍘�','浜屾涓嬬數鐢靛帇','DCDC妯″潡鏁伴噺','鍗曚綋鏁版嵁鏉ユ簮绫诲瀷','缁埅缁勬暟','缁埅涓嬮檺','缁埅鍚姩涓嬮檺','鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙�','鑳屽厜鏃堕暱','鍋滅數鍏呯數鐢垫祦'];
+	dataArr = [];
+    var tbl = $('.tbl-container');
+    var temp = getCookie("control_parm");
+	temp = JSON.parse(temp);
+	console.info(temp);
+    createTbl(tbl, arrTh, dataArr);
+	$(document).ready(function(){
+		Page.pageCurr=1;		
+		console.info(temp);
+		setBattLife();
+		//searchBattLife();
+		//console.info($("#getnumber").val());		
+	 });
+  	
+	function setBattLife(){
+		data = temp;
+		var index=0;
+			arrTd[index++] = data.dev_id;
+			arrTd[index++] = data.stationName;
+			arrTd[index++] = data.GroupVolRange+"鍒嗛挓";
+			arrTd[index++] = data.GroupVolSorce+"鍒嗛挓";
+			arrTd[index++] = data.CurrentRange+"A";
+			arrTd[index++] = Math.ceil(data.CurrentTyte/10)+"V";
+			arrTd[index++] = Math.ceil(data.MonomerOrder/10)+"V";
+			arrTd[index++] = data.LoaderCount;//DC鏁伴噺
+			arrTd[index++] = data.DtCardCount;
+			arrTd[index++] = data.POF_BG_Boost_Cnt;
+			arrTd[index++] = data.POF_BG_Boost_VolStop+"V";
+			arrTd[index++] = data.POF_BG_Boost_VolStart+"V";
+			arrTd[index++] = data.MajorBattGroupNum;
+			arrTd[index++] = data.BackLightTime+"鍒嗛挓";
+			arrTd[index++] = data.PowerBreakChargeCurr+"A";
+		createTbl(tblCon, arrTh, arrTd);
+	}
+
+   </script>
+</html> 
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/ele-param2.html b/gx_tieta/WebRoot/mobil/ele-param2.html
index f7778ab..68d8bfe 100644
--- a/gx_tieta/WebRoot/mobil/ele-param2.html
+++ b/gx_tieta/WebRoot/mobil/ele-param2.html
@@ -224,6 +224,7 @@
     <!-- 瀛樺湪鏈烘埧淇℃伅 -->
     <div id="homeInfoIframe"></div>
     <input id="handle_status" value="" type="hidden">
+    <input id="jifangname" value="" type="hidden">
     <script src="src/layui.all.js"></script>
     <script type="text/javascript" src="js/tbl.js"></script>
     <script type="text/javascript" src="mobilJs/base.js"></script>
@@ -365,6 +366,11 @@
     	}else{
        		setcookieCreat(Page.pageSize-1);
        	}
+       	var test=getCookie("eleparm2newbatt");
+                        console.info(test);
+         var jiafangname = $("#jifangname").val();
+         console.info($("#jifangname").val());
+         console.info(test);
         window.location.href="batt-infor-conf-temp1.html";   
     });
     
@@ -375,6 +381,7 @@
     var endTime = new Date().format('yyyy-MM-dd');
     var tbl = $('.tbl-container');
     createTbl(tbl, arrTh, dataArr);
+    serchProducer();
 	$(document).ready(function(){
 		setPage();	
 		//newbattnum;		
@@ -555,6 +562,7 @@
 				getEditButIndex(0);		
 			}	
 		});	  
+
 
 	}
 	//鏋勯�犳煡璇㈡潯浠�
@@ -816,9 +824,33 @@
 		
 	}
 		
-
-
- 
+	function serchProducer(){
+	var battproducer = new Array();  	
+	  	$.ajax({
+			type: 'post'
+			,async: false
+			,url: 'BattInfAction!serchByBattProducer'
+			,data: null
+			,dataType: 'json'
+			,success:function(res) {
+				//console.info(res);
+				data = JSON.parse(res.result);
+				console.info(data.data);
+				if(data.code==1&&data.data.length>0){
+					data = data.data;
+					for(var i=0;i<data.length;i++){
+						//console.info(data);
+						battproducer.push(data[i].BattProducer);				
+					}	
+				}
+			var	json = window.JSON.stringify(battproducer);
+			setCookie("producer",json);
+			//var battproduce = getCookie("producer");
+  			//battproduce1 = JSON.parse(battproduce);
+  			//console.info(battproduce1);
+			}		
+		});
+	}
 
 
 
diff --git a/gx_tieta/WebRoot/mobil/hcheckAccpet.html b/gx_tieta/WebRoot/mobil/hcheckAccpet.html
index 748e036..9a14f05 100644
--- a/gx_tieta/WebRoot/mobil/hcheckAccpet.html
+++ b/gx_tieta/WebRoot/mobil/hcheckAccpet.html
@@ -261,6 +261,7 @@
 				,lng: lng
 				,lat: lat
 			}
+			console.info(temp);
 			// 鏄剧ず鏆傛棤鍙绔欑偣
 			if(homeId == 0) {
 				layer.msg(homeName);
diff --git a/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html b/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
index 7e00195..23b815f 100644
--- a/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
+++ b/gx_tieta/WebRoot/mobil/iframe/homeinfo1.html
@@ -363,7 +363,6 @@
             
 
             var footerMenu = new FooterMenu($('#pageFooter'));  // 瀹炰緥鍖栧簳閮ㄥ鑸爮
-            
             // 涓婁紶瑙嗛妯″潡
             var videoInfoTbl = $('#videoInfoTbl');
             // 娓叉煋骞跺垵濮嬪寲涓婁紶鎸夐挳
@@ -380,6 +379,7 @@
                         VideoOrImage: 'video'
                     })
                 }
+                ,exts: 'mp4|MOV|avi|rmvb'
                 ,accept: 'video' //瑙嗛
                 ,choose: function(obj) {
                 	
diff --git a/gx_tieta/WebRoot/mobil/iframe/searchBatt.html b/gx_tieta/WebRoot/mobil/iframe/searchBatt.html
index f8d9ce0..f80efd7 100644
--- a/gx_tieta/WebRoot/mobil/iframe/searchBatt.html
+++ b/gx_tieta/WebRoot/mobil/iframe/searchBatt.html
@@ -96,11 +96,22 @@
                 	if(data.length>0){
                 		layer.msg('璇烽�夋嫨涓嬫柟鐨勬満鎴�');
                 	}else{
+                	 	var json = window.JSON.stringify(input);
+                        setCookie("eleparm2newbatt",json);
                 		 layer.confirm('鎮ㄨ緭鍏ョ殑鏈烘埧涓嶅瓨鍦紒鏄惁瑕佽鏂板缓鏈烘埧锛�',{btn:['鏂板缓','鍙栨秷']},function(){
                         setV();
+                       	 var json = window.JSON.stringify(input);
+                        //setCookie("eleparm2newbatt",json);
+                       // $("#jifangname").val(input);
+                        //console.info(input);
+                       // var test=getCookie("eleparm2newbatt");
+                        //console.info(test);
                         });
-                        input = window.JSON.stringify(input);
-                        setCookie("ele_parm2_newbatt",input);
+                         //var test=getCookie("eleparm2newbatt");
+                        //console.info(test);
+                        //console.info(input);
+                        //var json = window.JSON.stringify(input);
+                        //setCookie("ele_parm2_newbatt",json);
                 	}   
                 }
             });
diff --git a/gx_tieta/WebRoot/mobil/js/tbl.js b/gx_tieta/WebRoot/mobil/js/tbl.js
index 26d3922..d22b711 100644
--- a/gx_tieta/WebRoot/mobil/js/tbl.js
+++ b/gx_tieta/WebRoot/mobil/js/tbl.js
@@ -230,4 +230,190 @@
 		$('.tbl-container table tbody tr').removeClass('active');
 		$(this).addClass('active');
 	});
-});
\ No newline at end of file
+});
+
+//瀵筸obile绔暟鎹〃鏍艰繘琛屾搷浣�
+var MobileTbl = function(tbl, arrTh) {
+    this.tbl = tbl;
+    this.arrTh = arrTh;
+};
+
+// 瀹氫箟瀵硅薄鐨勫師鍨嬪嚱鏁�
+MobileTbl.prototype = {
+    setArrTh:function(arrTh) {      // 璁剧疆琛ㄦ牸鐨勫ご閮ㄦ暟鎹�
+        this.arrTh = arrTh;
+    }
+    ,updateCell: function(rows, cols, value) {          // 鏇存柊鎸囧畾鐨勫崟鍏冩牸
+        var tbody = this.tbl.find('tbody');             // 鑾峰彇tbody
+        var tr = tbody.find('tr').eq(rows);             // 鑾峰彇tr
+        var td = tr.find('td').eq(cols);                // 鑾峰彇td
+        var th = this.arrTh[cols];                      // 鍒楀ご閮ㄦ暟鎹俊鎭�
+        
+        // 鐢熸垚html鏍囪瀛楃涓�
+        var tdHtml = '<b class="ui-table-cell-label">'+th+'</b>';
+        tdHtml += value;
+
+        // 娣诲姞鍐呭鍒皌d
+        td.html(tdHtml);
+    }
+};
+
+//瀵逛簬鎵嬫満绔〃鏍艰繘琛岀殑浜屾寮�鍙�
+var MobileTable = function(opts) {
+    this.opts = {};     // 鐢熸垚琛ㄦ牸鐨勯厤缃」
+    this.el = '';
+    this.cols = [];     // 琛ㄦ牸鐨勫ご閮�
+    this.data = [];     // 琛ㄦ牸鐨勫唴瀹�
+    this.render(opts);
+}
+// 瀹氫箟瀵硅薄鐨勫師鍨嬪嚱鏁�
+MobileTable.prototype = {
+    _setEl: function(el) {          // 璁剧疆琛ㄦ牸鎵�鍦ㄧ殑瀹瑰櫒
+        if(typeof el == 'object') {
+            this.el = el;
+        }else {
+            this.el = $(el);
+        }
+    }
+    ,_setOpts: function(opts) {      // 璁剧疆閰嶇疆椤�
+        this.opts = opts;
+    }
+    ,_setCols: function(cols) {     //  璁剧疆琛ㄦ牸鐨勫ご閮�
+        this.cols = cols;
+    }
+    ,_setData: function(data) {
+        this.data = data;
+    }
+    ,_init: function(opts) {
+        let cols = opts.cols;
+        let data = opts.data;
+        let el = opts.el;
+        this._setOpts(opts);        // 鍒濆鍖栭厤缃」
+        this._setEl(el);            // 鍒濆鍖杄l
+        this._setCols(cols);        // 鍒濆鍖栧ご閮ㄦ暟鎹�
+        this._setData(data);        // 鍒濆鍖栬〃鏍兼暟鎹�
+    }
+    ,render: function(opts) {
+        this._init(opts);
+        var table = $('<table data-role="table" class="ui-responsive"></table>');
+        var thead = this._getThead();
+        var tbody = this._getTbody();
+        
+        // 鐢熸垚琛ㄦ牸
+        table.append(thead);
+        table.append(tbody);
+        // 娓呯┖瀹瑰櫒
+        this.el.text('');
+        this.el.append(table).trigger('create');
+    }
+    ,_getThead: function() {    // 鑾峰彇琛ㄦ牸鐨勫ご閮�
+        var cols = this.cols;
+        var thead = $('<thead></thead>');
+        var tr = $('<tr></tr>');
+        // 閬嶅巻cols鐨勫��,鏍规嵁鏁版嵁椤箃head娣诲姞鍐呭
+        for(let i=0; i<cols.length; i++) {
+            let _cols = cols[i];
+            var th = $('<th></th>');
+            th.html(_cols.title);
+            th.attr('data-field', _cols.field);
+            tr.append(th)
+            
+        }
+        thead.append(tr);
+        return thead;
+    }
+    ,_getTbody: function() {    // 鑾峰彇琛ㄦ牸鐨勫唴瀹�
+        var cols = this.cols;
+        var data = this.data;
+        var tbody = $('<tbody></tbody>');
+
+        // 閬嶅巻data鐨勫��
+        for(let i=0; i<data.length; i++) {
+            let _data = data[i];
+            let tr = $('<tr></tr>');
+            // 閬嶅巻cols鐨勫��
+            for(let k=0; k<cols.length; k++) {
+                let _cols = cols[k];
+                var field = _cols.field;
+                var title = _cols.title;
+                var td = $('<td></td>');
+                if(field in _data) {
+                    td = $('<td>'+_data[field]+'</td>');
+                }
+                // 璁剧疆鍊�
+                td.attr('data-field', field);
+                td.attr('data-title', title);
+                tr.append(td);
+            }
+            tr.append($('<td data-field="visibility" style="visibility: hidden"></td>'));
+            // 鐢熸垚tr
+            tbody.append(tr);
+        }
+
+        // 杩斿洖缁撴灉
+        return tbody;
+    }
+    ,updateAll: function(field, data) {
+        // 閬嶅巻data鐨勫��
+        for(let i=0; i<data.length; i++) {
+            let _data = data[i];
+            if(field in _data) {
+                let fVal = _data[field];
+                this.update(field, fVal, _data);        // 鏇存柊琛ㄦ牸
+            }else {
+                console.log('璇ユ潯鏁版嵁涓嶅瓨鍦ㄦ爣璇嗕綅'+field);
+                console.log(_data);
+            }
+        }
+    }
+    ,update: function(field, fVal, data) {
+        let rowsInfo = this._getRows(field, fVal);
+        // 濡傛灉鑾峰彇鍒颁簡琛屽彿
+        if(rowsInfo.code==1) {
+            let rows = rowsInfo.data;       // 鏁版嵁鎵�鍦ㄧ殑琛屽彿
+            this.updateTr(rows, data);
+        }else {
+            console.log(rowsInfo.msg);
+        }
+    }
+    ,updateTr: function(rows, data) {
+        let tbody = this.el.find('tbody');
+        let tr = tbody.find('tr').eq(rows);
+        let td = tr.find('td');
+        // 閬嶅巻td鐨勫唴瀹�
+        td.each(function() {
+            let field = $(this).data('field');
+            let title = $(this).data('title');
+            // 鍒ゆ柇褰撳墠灞炴�ф槸鍚﹀湪data涓�
+            if(field in data) {
+                // 鐢熸垚html鏍囪瀛楃涓�
+                var tdHtml = '<b class="ui-table-cell-label">'+title+'</b>';
+                tdHtml += data[field];
+                $(this).html(tdHtml);
+            }
+        });
+
+    }
+    ,_getRows: function(field, fVal) {     // 鏍规嵁鏍囪瘑浣嶇殑鍊艰幏鍙栧綋鍓嶆暟鎹墍鍦ㄧ殑琛�
+        var rs = {
+            code: 0
+            ,data: -1
+            ,msg: '鏈幏鍙栧埌鏍囪瘑浣�'+field+':'+fVal+'鎵�鍦ㄧ殑琛�'
+        };
+        var data = this.data;
+        // 閬嶅巻data鐨勫��
+        for(let i=0; i<data.length; i++) {
+            let _data = data[i];
+            if(field in _data) {
+                let _fVal = _data[field];       // 鑾峰彇褰撳墠鏁版嵁鐨勬爣璇嗕綅鐨勫��
+                if(_fVal == fVal) {
+                    rs.code = 1;        // 鏍囪瘑鑾峰彇鍒颁簡涓嬫爣
+                    rs.data = i;        // 涓嬫爣鐨勫��
+                }
+            }
+        }
+
+        // 杩斿洖缁撴灉
+        return rs;
+    }
+};
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/testdata.html b/gx_tieta/WebRoot/mobil/testdata.html
index 3d4fb43..068db47 100644
--- a/gx_tieta/WebRoot/mobil/testdata.html
+++ b/gx_tieta/WebRoot/mobil/testdata.html
@@ -52,12 +52,14 @@
 					    <a href="battinfors.html" target="_top" data-ajax="false">鐢垫睜缁勪俊鎭�</a>
 					</li>
 					<li>
-					    <a href="base-station-info.html" target="_top" data-ajax="false">鍩虹珯淇℃伅</a>
+					    <a href="" id="jizhandata" target="_top" data-ajax="false">鍩虹珯淇℃伅</a>
 					</li>
 					
 				</ul>
 			</div>
+			<div id="homeInfoIframe"></div>
 			<script type="text/javascript" src="js/battNav.js"></script>
+			<script type="text/javascript" src="src/layui.all.js"></script>
 			<script type="text/javascript">
 				$(function() {
 				//console.warn(111133);
@@ -73,6 +75,63 @@
 					console.info(data);
 					addBreadCrumb($('.breadcrumb').eq(0), data);
 				});
+				
+				$("#jizhandata").off('click').on('click.cjj1123',function(){
+					var temp = getCookie("batt");
+					temp = JSON.parse(temp);
+					console.info(temp);
+					var data = temp;
+					var lng = 0;							// 鑾峰彇缁忓害
+					var lat = 0;							// 鑾峰彇绾害
+					var addr = "";						// 鑾峰彇鍦板潃
+					var homeId = data.StationId;						// 鏈烘埧Id
+					var homeName = data.StationName;					// 鏈烘埧鍚嶇О
+					var _temp = {
+							homeId: homeId
+							,homeName: homeName
+							,addr: addr
+							,lng: lng
+							,lat: lat
+							}
+					console.info(_temp);
+				// 鏄剧ず鏆傛棤鍙绔欑偣
+				if(homeId == 0) {
+					alert(homeName);
+					return;
+				}
+				$('#homeInfoIframe').data('homeInfo', _temp);
+				iframePopup = layer.open({
+                type: 2
+                ,closeBtn: 0
+                ,title: false
+                ,area: ['100%', '100%']
+                ,full: true
+                ,anim: 4
+                ,content: 'iframe/seenhomeinfo.html'
+                ,success: function() {
+	             	$('div[data-role=page]').hide();
+	             }
+	             ,end: function() {
+	             	$('div[data-role=page]').show();
+	             }
+            });
+            	iframePopup = layer.open({
+                type: 2
+                ,closeBtn: 0
+                ,title: false
+                ,area: ['100%', '100%']
+                ,full: true
+                ,anim: 4
+                ,content: 'iframe/seenhomeinfo.html'
+                ,success: function() {
+	             	$('div[data-role=page]').hide();
+	             }
+	             ,end: function() {
+	             	$('div[data-role=page]').show();
+	             }
+            });
+            layer.full(iframePopup);
+			})
 			</script>
 		</div>
   </body>

--
Gitblit v1.9.1