From 5973f0a18285eec0e0b4d5187e725591b4d112a4 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.16>
Date: 星期二, 11 十二月 2018 15:26:01 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/ele-param1.jsp             |   88 +++-
 gx_tieta/WebRoot/mobil/batt-approved.html   |  368 ++++++++++++++++++++++++
 gx_tieta/WebRoot/mobil/index.html           |    5 
 gx_tieta/WebRoot/mobil/auditDetail.html     |   37 ++
 gx_tieta/WebRoot/mobil/batt-unapproved.html |  365 ++++++++++++++++++++++++
 gx_tieta/WebRoot/iframe/batt-info-add.html  |    5 
 6 files changed, 837 insertions(+), 31 deletions(-)

diff --git a/gx_tieta/WebRoot/ele-param1.jsp b/gx_tieta/WebRoot/ele-param1.jsp
index 8949974..aee382c 100644
--- a/gx_tieta/WebRoot/ele-param1.jsp
+++ b/gx_tieta/WebRoot/ele-param1.jsp
@@ -653,38 +653,68 @@
 					if(len) {
 						_rsData = tOptions.data[len-1];
 					}
-					 
-					// 鎵撳紑闈㈡澘璁剧疆鏂板缓鐢垫睜缁勪釜鏁�
-					layer.open({
-						type: 1
-						,title: '閫夋嫨鏂板缓鐢垫睜缁勪釜鏁�'
-						,content: addGroupContent
-						,fixed: true
-						,resize: false
-						,btn:['纭畾', '鍙栨秷']
-						,yes: function(index) {
-							var groupNum = $('#addGroupnum').val();
-							layer.close(index);
-							// 鐢熸垚鏁扮粍
-							var _arr = [];
-							for(var i=0; i<groupNum; i++) {
-								_arr.push(i+1);
+					getMaxDevId(function(id) {
+						// 鎵撳紑闈㈡澘璁剧疆鏂板缓鐢垫睜缁勪釜鏁�
+						layer.open({
+							type: 1
+							,title: '閫夋嫨鏂板缓鐢垫睜缁勪釜鏁�'
+							,content: addGroupContent
+							,fixed: true
+							,resize: false
+							,btn:['纭畾', '鍙栨秷']
+							,yes: function(index) {
+								var groupNum = $('#addGroupnum').val();
+								layer.close(index);
+								// 鐢熸垚鏁扮粍
+								var _arr = [];
+								for(var i=0; i<groupNum; i++) {
+									_arr.push(i+1);
+								}
+								
+								_rsData.addGroupNum = _arr;
+								_rsData.FBSDeviceId = id;
+								$('#iframeEdit').data('data', _rsData);
+								
+								iframePopup = layer.open({
+									type: 2
+									,title: '鏂板缓鐢垫睜缁�'
+									,area:['1200px', '520px']
+									,resize: false
+									,content: 'iframe/batt-info-add.html'
+								});
 							}
-							
-							_rsData.addGroupNum = _arr;
-							$('#iframeEdit').data('data', _rsData);
-							
-							iframePopup = layer.open({
-								type: 2
-								,title: '鏂板缓鐢垫睜缁�'
-								,area:['1200px', '520px']
-								,resize: false
-								,content: 'iframe/batt-info-add.html'
-							});
-						}
-					});
+						});
+					}); 
+					
 				});
 				
+				// 鑾峰彇鏈�澶ц澶噄d
+				function getMaxDevId(callback) {
+					var load = layer.load(1);
+					// 鏌ヨ鍚庡彴
+					$.ajax({
+						type: 'post'
+						,async: true
+						,url: 'BattInfAction!searchmaxdev_id'
+						,data:null
+						,dataType: 'json'
+						,success:function(res) {
+							var rs = JSON.parse(res.result);
+							if(rs.data.length != 0) {
+								if(isFunction(callback)) {
+									callback(rs.data);
+								}
+							}else {
+								layer.msg('璁$畻璁惧id澶辫触锛�')
+							}
+						}
+						,complete: function() {
+							layer.close(load);
+						}
+						
+					});
+				}
+				
 				
 				// 鏌ヨ鐢垫睜缁勪俊鎭�
 				function search(temp, newLoad) {
diff --git a/gx_tieta/WebRoot/iframe/batt-info-add.html b/gx_tieta/WebRoot/iframe/batt-info-add.html
index 2ff4046..8f73e6c 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-add.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-add.html
@@ -96,7 +96,7 @@
             <div class="layui-block">
                 <label class="layui-form-label">璁惧ID<span class="red">*</span></label>
                 <div class="layui-input-block">
-                    <input type="text" name="FBSDeviceId" lay-verify="devid" id="devid" autocomplete="off" class="layui-input" value="{{= d.FBSDeviceId }}">
+                    <input type="text" name="FBSDeviceId" lay-verify="devid" id="devid" autocomplete="off" disabled="" class="layui-input layui-bg-gray" value="{{= d.FBSDeviceId }}">
                 </div>
             </div>
         </div>
@@ -358,6 +358,9 @@
 
             var battInfoTpl = $('#battInfoTpl').html();
 			var editInfo = parent.$('#iframeEdit').data('data');
+			
+			
+			editInfo.FbsDeviceIp = getDevIp(editInfo.FBSDeviceId);
 			//console.log(editInfo);
             var data = {
                 StationId: '4011100'
diff --git a/gx_tieta/WebRoot/mobil/auditDetail.html b/gx_tieta/WebRoot/mobil/auditDetail.html
new file mode 100644
index 0000000..b85ab19
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/auditDetail.html
@@ -0,0 +1,37 @@
+<!doctype html>
+	<html>
+	<head>
+		<meta charset="utf-8">
+		<title>瀹℃壒璇︽儏</title>
+		<meta name="viewport" content="width=device-width,initial-scale=1">
+		<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.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>
+
+	</head>
+	<body>
+		<div data-role="page">
+			<div data-role="header" data-position="fixed">
+				<a href="index.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
+				<h1>瀹℃壒璇︽儏</h1>
+				
+			</div>
+			<div data-role="content">
+				<ul data-role="listview" data-inset="true">
+					<li>
+						<a href="batt-approved.html" target="_top">宸查�氳繃鐢宠</a>
+					</li>
+					 <li>
+						<a href="batt-unapproved.html" target="_top">鏈�氳繃鐢宠</a>
+					</li>
+					
+				</ul>
+				
+			</div>
+			<!-- <div data-role="footer" data-position="fixed">
+				<h1>绂忓厜鐢靛瓙鏈夐檺鍏徃</h1>
+			</div> -->
+			
+		</div>
+	</body>
+	</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
new file mode 100644
index 0000000..00e7bf0
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -0,0 +1,368 @@
+<!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">
+	<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%;
+		} 
+	</style>
+	<link rel="stylesheet" href="css/fgpanel.css">
+</head>
+<body>
+	<div data-role="page">
+		
+		<!-- 澶撮儴鍐呭 -->
+		<div data-role="header" data-position="fixed">
+			<a href="auditDetail.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="pre-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-l ui-btn-icon-notext">鍥炬爣</a></div>
+			<div class="next-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext">鍥炬爣</a></div>	
+			<!-- 琛ㄦ牸瀹瑰櫒 -->
+			<div class="tbl-container"></div>
+			<table data-role="table" class="ui-responsive ui-shadow" id="tab" >
+					
+			</table>
+		</div>
+		<div data-role="footer" data-position="fixed" data-theme="a">    
+			<div data-role="navbar">
+				<ul>
+				  <li><a href="index.html" target="_top" data-role="button" data-icon="home" data-transition="slide">棣栭〉</a></li>
+				  <li><a href="batt-unapproved.html" target="_top" data-role="button" data-icon="delete" data-transition="slide">鏈�氳繃</a></li>
+				</ul>
+			</div>		
+		</div>   
+		
+		
+    </div>    
+	</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">
+          /* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳   */
+          function getButIndex(t){
+			    //console.warn($(t).attr("but-index"));
+			    var index = $(t).attr("but-index");   
+			   	setcookiedit(index);
+			    return ;
+			}
+    
+ 
+    var arrTd=new Array();		//褰撳墠琛ㄦ牸td鏁版嵁
+    var tblCon = $('.tbl-container');
+    var Page = {
+		pageSize:20, 				//姣忛〉鐨勮鏁�
+		pageCurr:1,  				//褰撳墠椤电爜鏁�
+		pageAll:0,
+	};
+
+       
+    $("#edit").click(function(){
+        window.location.href="batt-infor-conf-temp.html";   
+    });
+    $("#delete").click(function(){  //鍒犻櫎鐢垫睜缁�
+    	var temp = getCookie("eleparm");
+    	temp = JSON.parse(temp);
+    	console.info(temp);
+        var parm = getUpdateArr(temp);
+        delBatt(parm);
+       // window.location.href="batt-infor-conf-delete.html";   
+    });
+     
+    var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','鏌ョ湅鐢垫睜缁勫疄鏃舵暟鎹�'];
+	dataArr = [];
+    var startTime = "1980-01-01";
+    var endTime = new Date().format('yyyy-MM-dd');
+    var tbl = $('.tbl-container');
+    createTbl(tbl, arrTh, dataArr);
+	$(document).ready(function(){
+		setPage();
+		
+			Page.pageCurr=1;
+			searchBattLife();
+		
+	 });
+ 		function setcookiedit(index){
+ 				var arrcookie = new Array();	
+			   	for(var i=0;i<33;i++){//鍏�34椤癸紝鏈�鍚庝竴椤逛负鎸夐挳锛屼笉蹇匰ET杩涙暟鎹�
+				   	var value = Math.floor(34*index);
+				   	//console.info(value);
+				   	value = Math.floor(value+i);
+				   	//console.info(value);
+			   		arrcookie.push(arrTd[value]);
+			   	}
+			   	var json=window.JSON.stringify(arrcookie);
+			   	setCookie("eleparm",json);  //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ 		}
+ 		
+ 		function setcookieCreat(index){
+ 				var arrcookie = new Array();	
+			   	for(var i=0;i<33;i++){//鍏�34椤癸紝鏈�鍚庝竴椤逛负鎸夐挳锛屼笉蹇匰ET杩涙暟鎹�
+				   	var value = Math.floor(34*index);
+				   	//console.info(value);
+				   	value = Math.floor(value+i);
+				 	if(i==13){//鏂板缓鍔熻兘锛岀數姹犵粍ID榛樿涓哄綋椤垫渶鍚庝竴涓數姹犵粍ID鍙峰姞1
+				 		var groupid = Math.floor(arrTd[value]+1);
+				 		console.info(groupid);
+				 		arrcookie.push(groupid);
+				 	}else{
+				   		//console.info(value);
+			   			arrcookie.push(arrTd[value]);
+			   		}
+			   	}
+			   	arrcookie.push("new");
+			   	//console.info(arrcookie);
+			   	var json=window.JSON.stringify(arrcookie);
+			   	setCookie("eleparm",json);  //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ 		}
+		
+	// 鏌ヨ鍐呭
+		function searchBattLife(){
+			
+		
+			/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
+			
+			for(i=0;i<340;i++){
+			 if(i%34==33){
+			 //<a href="count-report.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>
+			arrTd[i]='<a href=""  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >鐢垫睜缁勫疄鏃舵暟鎹�</a>';
+			console.warn(i);
+			continue;
+			
+			} 
+			       
+					 arrTd[i]=i*10;
+					}
+						
+					createTbl(tblCon, arrTh, arrTd);
+					
+			/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */				
+		}
+		function getUpdateArr(temp){
+			var arr = new Array();
+			var obj = new Object();
+			obj.StationId = temp[0];	// 鏈烘埧缂栧彿
+			obj.StationName = (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]);	// 鎷兼帴鏈烘埧鍚嶇О
+			obj.StationName1 = temp[1];		// 鐪�
+			obj.StationName2 = temp[2];		// 甯�
+			obj.StationName5 = temp[3];		// 鍖�/鍘�
+			obj.StationName3 = temp[4];		// 鏈烘埧鍚嶇О
+			obj.StationName4 = temp[5];		// 璁惧鍚嶇О
+			obj.StationIp = temp[6];				//鏈烘埧ip
+			obj.FBSDeviceId = temp[7];				//璁惧id
+			obj.FbsDeviceIp = temp[8];				//璁惧ip
+			obj.FbsDeviceIp_YM = temp[9];			// 璁惧鎺╃爜
+			obj.FbsDeviceIp_WG = temp[10];			// 缃戝叧
+			obj.FBSDeviceName = temp[11];			//璁惧鍚嶇О
+			obj.GroupIndexInFBSDevice = temp[12];	//fbs璁惧绱㈠紩
+			obj.BattGroupId = temp[13];				//鐢垫睜缁刬d
+			obj.BattGroupNum = temp[14];			//鏈烘埧鍐呯數姹犵粍缂栧彿
+			obj.BattGroupName = temp[15];			//鐢垫睜缁勫悕绉�
+			obj.FloatVolLevel = temp[16];			//娴厖鐢靛帇闃�鍊�
+			obj.OfflineVolLevel = temp[17];			//绂荤嚎鐢靛帇闃�鍊�
+			obj.BattFloatCurrent = temp[18];		//娴厖鐢垫祦闃�鍊�
+			obj.MonCount = temp[19];				//鍗曚綋鏁伴噺
+			obj.MonCapStd = temp[20];				//鏍囩О瀹归噺
+			obj.MonVolStd = temp[21];				//鏍囩О鐢靛帇
+			obj.MonResStd = temp[22];				//鏍囩О鍐呴樆
+			obj.MonSerStd = temp[23];				//鏍囩О鐢靛
+			obj.MonVolLowToAvg = temp[24];			//鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
+			
+			
+			obj.Load_curr = temp[25];				//璐熻浇鐢垫祦
+			obj.DisCurrMax = temp[26];				//鏈�澶ф牳瀹圭數娴�
+			obj.station_phone = temp[27];			//鍩虹珯鍙风爜
+							
+			obj.BattProducer = temp[28];			//鐢垫睜鍝佺墝
+			obj.BattModel = temp[29];				//鐢垫睜鍨嬪彿
+			obj.BattProductDate =  temp[30];		//鐢垫睜鐢熶骇鏃ユ湡
+			obj.BattInUseDate =  temp[31];			//鐢垫睜浣跨敤鏃ユ湡
+			obj.install_user = temp[32];			//瀹夎浜哄憳
+			arr.push(obj);
+			console.info(arr);
+			return arr;
+		}	
+	
+	
+			
+	function createSearchForm(){
+		var temp={
+				page:Page,
+				StationName1:$('#mainteArea').val(),
+				StationName2:$('#city').val(),
+				StationName5:$('#country').val(),
+				StationName:$('#homeName').val(),
+				
+		};
+		return temp;
+	}
+	
+	
+	//鏋勯�犳煡璇㈡潯浠�
+		function createSearchParam(){
+			var temp = {							
+				page:Page,
+				binf:{
+					StationName1:$('#mainteArea').val(),
+					StationName2:$('#city').val(),
+					StationName5: $('#country').val(),
+					StationName:$('#homeName').val(),
+				},
+			};
+			console.info(temp);
+			return temp;
+			
+		}	
+	
+	$(function() {
+		//鐐瑰嚮涓婁竴椤�
+		$('.pre-page').on('click', 'a', function() {
+			if(Page.pageCurr>1){
+				Page.pageCurr = Page.pageCurr - 1;
+				searchBattLife();
+			}
+		});
+		
+		//鐐瑰嚮涓嬩竴椤�
+		$('.next-page').on('click', 'a', function() {
+			var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+			if(Page.pageCurr<pageNum){
+				Page.pageCurr = Page.pageCurr + 1;
+				searchBattLife();
+			}
+		});
+	});
+	
+	
+	// 鍒ゆ柇鏄惁鏄剧ず缈婚〉鎸夐挳
+	function setPageTurning(isShowPre, isShowNext) {
+		if(isShowPre) {	// 鍒ゆ柇鏄惁鏄剧ず鍚戜笂缈婚〉鎸夐挳
+			$('.pre-page').show();
+		}else {
+			$('.pre-page').hide();
+		}
+
+		if(isShowNext) {	// 鍒ゆ柇鏄惁鏄剧ず鍚戜笅缈婚〉鎸夐挳
+			$('.next-page').show();
+		}else {
+			$('.next-page').hide();
+		}
+	}					
+	
+	//璁剧疆椤甸潰鐨勮烦杞摼鎺�
+	function setPage(){
+		if(Page.pageCurr <= 1){
+			$('.pre-page').hide();
+		}else{
+			$('.pre-page').show();
+		}
+		var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+		
+		if(Page.pageCurr < pageNum){
+			$('.next-page').show();
+		}else{
+			$('.next-page').hide();
+		}
+		
+	}
+	
+	 
+   </script>
+</html> 
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/batt-unapproved.html b/gx_tieta/WebRoot/mobil/batt-unapproved.html
new file mode 100644
index 0000000..ffd4fa2
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/batt-unapproved.html
@@ -0,0 +1,365 @@
+<!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">
+	<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%;
+		} 
+		.tbl-container td {
+            color: #fb0909a3;
+        }    
+	</style>
+	<link rel="stylesheet" href="css/fgpanel.css">
+</head>
+<body>
+	<div data-role="page">
+		
+		<!-- 澶撮儴鍐呭 -->
+		<div data-role="header" data-position="fixed">
+			<a href="auditDetail.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="pre-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-l ui-btn-icon-notext">鍥炬爣</a></div>
+			<div class="next-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext">鍥炬爣</a></div>	
+			<!-- 琛ㄦ牸瀹瑰櫒 -->
+			<div class="tbl-container"></div>
+			<table data-role="table" class="ui-responsive ui-shadow" id="tab" >
+					
+			</table>
+		</div>
+		<div data-role="footer" data-position="fixed" data-theme="a">    
+			<div data-role="navbar">
+				<ul>
+				  <li><a href="index.html" target="_top" data-role="button" data-icon="home" data-transition="slide">棣栭〉</a></li>
+				  <li><a href="batt-approved.html" target="_top" data-role="button" data-icon="check" data-transition="slide">宸查�氳繃</a></li>
+				</ul>
+			</div>		
+		</div>  
+		
+		
+    </div>    
+	</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">
+          /* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳   */
+          function getButIndex(t){
+			    //console.warn($(t).attr("but-index"));
+			    var index = $(t).attr("but-index");   
+			   	setcookiedit(index);
+			    return ;
+			}
+    
+ 
+    var arrTd=new Array();		//褰撳墠琛ㄦ牸td鏁版嵁
+    var tblCon = $('.tbl-container');
+    var Page = {
+		pageSize:20, 				//姣忛〉鐨勮鏁�
+		pageCurr:1,  				//褰撳墠椤电爜鏁�
+		pageAll:0,
+	};
+
+       
+    $("#edit").click(function(){
+        window.location.href="batt-infor-conf-temp.html";   
+    });
+    $("#delete").click(function(){  //鍒犻櫎鐢垫睜缁�
+    	var temp = getCookie("eleparm");
+    	temp = JSON.parse(temp);
+    	console.info(temp);
+        var parm = getUpdateArr(temp);
+        delBatt(parm);
+       // window.location.href="batt-infor-conf-delete.html";   
+    });
+     
+    var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','鏈�氳繃鍘熷洜'];
+	dataArr = [];
+    var startTime = "1980-01-01";
+    var endTime = new Date().format('yyyy-MM-dd');
+    var tbl = $('.tbl-container');
+    createTbl(tbl, arrTh, dataArr);
+	$(document).ready(function(){
+		setPage();
+		
+			Page.pageCurr=1;
+			searchBattLife();
+		
+	 });
+ 		function setcookiedit(index){
+ 				var arrcookie = new Array();	
+			   	for(var i=0;i<33;i++){//鍏�34椤癸紝鏈�鍚庝竴椤逛负鎸夐挳锛屼笉蹇匰ET杩涙暟鎹�
+				   	var value = Math.floor(34*index);
+				   	//console.info(value);
+				   	value = Math.floor(value+i);
+				   	//console.info(value);
+			   		arrcookie.push(arrTd[value]);
+			   	}
+			   	var json=window.JSON.stringify(arrcookie);
+			   	setCookie("eleparm",json);  //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ 		}
+ 		
+ 		function setcookieCreat(index){
+ 				var arrcookie = new Array();	
+			   	for(var i=0;i<33;i++){//鍏�34椤癸紝鏈�鍚庝竴椤逛负鎸夐挳锛屼笉蹇匰ET杩涙暟鎹�
+				   	var value = Math.floor(34*index);
+				   	//console.info(value);
+				   	value = Math.floor(value+i);
+				 	if(i==13){//鏂板缓鍔熻兘锛岀數姹犵粍ID榛樿涓哄綋椤垫渶鍚庝竴涓數姹犵粍ID鍙峰姞1
+				 		var groupid = Math.floor(arrTd[value]+1);
+				 		console.info(groupid);
+				 		arrcookie.push(groupid);
+				 	}else{
+				   		//console.info(value);
+			   			arrcookie.push(arrTd[value]);
+			   		}
+			   	}
+			   	arrcookie.push("new");
+			   	//console.info(arrcookie);
+			   	var json=window.JSON.stringify(arrcookie);
+			   	setCookie("eleparm",json);  //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ 		}
+		
+	// 鏌ヨ鍐呭
+		function searchBattLife(){
+			
+		
+			/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
+			
+			for(i=0;i<340;i++){
+			 
+			       
+					 arrTd[i]=i*10;
+					}
+						
+					createTbl(tblCon, arrTh, arrTd);
+					
+			/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */				
+		}
+		function getUpdateArr(temp){
+			var arr = new Array();
+			var obj = new Object();
+			obj.StationId = temp[0];	// 鏈烘埧缂栧彿
+			obj.StationName = (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]);	// 鎷兼帴鏈烘埧鍚嶇О
+			obj.StationName1 = temp[1];		// 鐪�
+			obj.StationName2 = temp[2];		// 甯�
+			obj.StationName5 = temp[3];		// 鍖�/鍘�
+			obj.StationName3 = temp[4];		// 鏈烘埧鍚嶇О
+			obj.StationName4 = temp[5];		// 璁惧鍚嶇О
+			obj.StationIp = temp[6];				//鏈烘埧ip
+			obj.FBSDeviceId = temp[7];				//璁惧id
+			obj.FbsDeviceIp = temp[8];				//璁惧ip
+			obj.FbsDeviceIp_YM = temp[9];			// 璁惧鎺╃爜
+			obj.FbsDeviceIp_WG = temp[10];			// 缃戝叧
+			obj.FBSDeviceName = temp[11];			//璁惧鍚嶇О
+			obj.GroupIndexInFBSDevice = temp[12];	//fbs璁惧绱㈠紩
+			obj.BattGroupId = temp[13];				//鐢垫睜缁刬d
+			obj.BattGroupNum = temp[14];			//鏈烘埧鍐呯數姹犵粍缂栧彿
+			obj.BattGroupName = temp[15];			//鐢垫睜缁勫悕绉�
+			obj.FloatVolLevel = temp[16];			//娴厖鐢靛帇闃�鍊�
+			obj.OfflineVolLevel = temp[17];			//绂荤嚎鐢靛帇闃�鍊�
+			obj.BattFloatCurrent = temp[18];		//娴厖鐢垫祦闃�鍊�
+			obj.MonCount = temp[19];				//鍗曚綋鏁伴噺
+			obj.MonCapStd = temp[20];				//鏍囩О瀹归噺
+			obj.MonVolStd = temp[21];				//鏍囩О鐢靛帇
+			obj.MonResStd = temp[22];				//鏍囩О鍐呴樆
+			obj.MonSerStd = temp[23];				//鏍囩О鐢靛
+			obj.MonVolLowToAvg = temp[24];			//鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
+			
+			
+			obj.Load_curr = temp[25];				//璐熻浇鐢垫祦
+			obj.DisCurrMax = temp[26];				//鏈�澶ф牳瀹圭數娴�
+			obj.station_phone = temp[27];			//鍩虹珯鍙风爜
+							
+			obj.BattProducer = temp[28];			//鐢垫睜鍝佺墝
+			obj.BattModel = temp[29];				//鐢垫睜鍨嬪彿
+			obj.BattProductDate =  temp[30];		//鐢垫睜鐢熶骇鏃ユ湡
+			obj.BattInUseDate =  temp[31];			//鐢垫睜浣跨敤鏃ユ湡
+			obj.install_user = temp[32];			//瀹夎浜哄憳
+			arr.push(obj);
+			console.info(arr);
+			return arr;
+		}	
+	
+	
+			
+	function createSearchForm(){
+		var temp={
+				page:Page,
+				StationName1:$('#mainteArea').val(),
+				StationName2:$('#city').val(),
+				StationName5:$('#country').val(),
+				StationName:$('#homeName').val(),
+				
+		};
+		return temp;
+	}
+	
+	
+	//鏋勯�犳煡璇㈡潯浠�
+		function createSearchParam(){
+			var temp = {							
+				page:Page,
+				binf:{
+					StationName1:$('#mainteArea').val(),
+					StationName2:$('#city').val(),
+					StationName5: $('#country').val(),
+					StationName:$('#homeName').val(),
+				},
+			};
+			console.info(temp);
+			return temp;
+			
+		}	
+	
+	$(function() {
+		//鐐瑰嚮涓婁竴椤�
+		$('.pre-page').on('click', 'a', function() {
+			if(Page.pageCurr>1){
+				Page.pageCurr = Page.pageCurr - 1;
+				searchBattLife();
+			}
+		});
+		
+		//鐐瑰嚮涓嬩竴椤�
+		$('.next-page').on('click', 'a', function() {
+			var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+			if(Page.pageCurr<pageNum){
+				Page.pageCurr = Page.pageCurr + 1;
+				searchBattLife();
+			}
+		});
+	});
+	
+	
+	// 鍒ゆ柇鏄惁鏄剧ず缈婚〉鎸夐挳
+	function setPageTurning(isShowPre, isShowNext) {
+		if(isShowPre) {	// 鍒ゆ柇鏄惁鏄剧ず鍚戜笂缈婚〉鎸夐挳
+			$('.pre-page').show();
+		}else {
+			$('.pre-page').hide();
+		}
+
+		if(isShowNext) {	// 鍒ゆ柇鏄惁鏄剧ず鍚戜笅缈婚〉鎸夐挳
+			$('.next-page').show();
+		}else {
+			$('.next-page').hide();
+		}
+	}					
+	
+	//璁剧疆椤甸潰鐨勮烦杞摼鎺�
+	function setPage(){
+		if(Page.pageCurr <= 1){
+			$('.pre-page').hide();
+		}else{
+			$('.pre-page').show();
+		}
+		var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+		
+		if(Page.pageCurr < pageNum){
+			$('.next-page').show();
+		}else{
+			$('.next-page').hide();
+		}
+		
+	}
+	
+	 
+   </script>
+</html> 
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/index.html b/gx_tieta/WebRoot/mobil/index.html
index 4928aee..8c87962 100644
--- a/gx_tieta/WebRoot/mobil/index.html
+++ b/gx_tieta/WebRoot/mobil/index.html
@@ -25,6 +25,9 @@
 				<a href="testControl.html" target="_top" data-i18n="main.warningmanagement">鐢垫睜閰嶇疆</a>
 			</li>
 			<li>
+				<a href="auditDetail.html" target="_top" data-i18n="main.warningmanagement">瀹℃壒璇︽儏</a>
+			</li>
+			<li>
 				<a href="datamanage.html" target="_top" data-i18n="main.datamanagement">鏁版嵁绠$悊</a>
 			</li>
 			<li>
@@ -86,4 +89,4 @@
 </div>
 	
 	</body>
-</html>
\ No newline at end of file
+</html>

--
Gitblit v1.9.1