From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改

---
 gx_tieta/WebRoot/batt-state-manage.jsp |  333 ++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 241 insertions(+), 92 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index cd233d8..052a8a7 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -9,22 +9,21 @@
 <html>
   <head>
     <base href="<%=basePath%>">
-    
-    <title>鍩虹珯鐘舵�佺鐞�</title>				<!-- 鍩虹珯鐘舵�佺鐞� -->
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<meta http-equiv="expires" content="0">    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+	<meta http-equiv="description" content="This is my page">
+    <title><s:text name="Station_real_status_query"/></title>				<!-- 鏈烘埧瀹炴椂鐘舵�佹煡璇� -->
     <link href="css/basic.css" rel="stylesheet">
     <link rel="stylesheet" href="css/BrdwMaint.css">
     <link rel="stylesheet" type="text/css" href="css/loading.css">
     <link rel="stylesheet" type="text/css" href="css/basic-layout.css"/>
     <link rel="stylesheet" href="css/nocontent.css">
     <link rel="stylesheet" href="alifont/iconfont.css">	
-	<meta http-equiv="pragma" content="no-cache">
-	<meta http-equiv="cache-control" content="no-cache">
-	<meta http-equiv="expires" content="0">    
-	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
-	<meta http-equiv="description" content="This is my page">
-
+	<link href="src/css/layui.css" type="text/css" rel="stylesheet">
 	<style type="text/css">
 	     body {
 	       overflow-x: hidden !important;
@@ -83,7 +82,7 @@
 	    <!-- 涓讳綋鍐呭 -->
         <div id="main">
             <div id="eleInfor">
-                <span class="summary">鍩虹珯鐘舵�佺鐞嗘煡璇�--&gt;<s:text name="Show/hide_the_query_conditions"/></span>
+                <span class="summary"><s:text name="Station_real_status_query"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></span>
                 <div class="checkCon filter-container">
                 	<form action="" id="search_form">
                     <!-- 缁存姢鍖轰俊鎭� -->
@@ -91,24 +90,22 @@
                         <tr class="fWeight">
                             <td>鐪�</td>						<!-- 鐪� -->
                             <td>甯�</td>						<!-- 甯� -->
+                            <td>鍖�/鍘�</td>						<!-- 鍖�/鍘� -->
                             <td><s:text name="Computer_name"/></td>									<!-- 鏈烘埧鍚嶇О -->
                             
                         </tr>
                         <tr>
                             <td>
-                                <select id="station_name1" name="stationname1">
-                                    
-                                </select>
+                                <select id="station_name1" name="stationname1"></select>
                             </td>
                             <td>
-                                <select id="city">
-                                    
-                                </select>
+                                <select id="city"></select>
                             </td>
                             <td>
-                                <select id="station_name3" name="stationname">
-                                    
-                                </select>
+                                <select id="county"></select>
+                            </td>
+                            <td>
+                                <select id="station_name3" name="stationname"></select>
                             </td>
                             
                             
@@ -116,11 +113,11 @@
                     </table>
                     <table class="condi-opt">
 				<tr>
-					<td><input type="checkbox" id="ALM_TYPE_BTS9100S_POFF_ComError" name=""  value=2 class="" />鍋滅數</td>		<!-- 鍋滅數 -->
-					<td><input type="checkbox" id="ALM_TYPE_BTS9100S_XUHANG_ComError" name=""  value=4 class="">缁埅</td>		<!-- 鎺夌珯 -->
-					<td><input type="checkbox" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name=""  value=8 class="" />鍙戠數</td>	<!-- 鍙戠數 -->
-					<td><input type="checkbox" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError"	name="" value=16 class="" >寮�闂ㄥ紓甯�</td>
-					<td><input type="checkbox" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name=""  value=32 class="">鎺夌珯</td>		<!-- 鎺夌珯 -->
+					<td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_POFF_ComError" name=""  value=2 class="" /><span class="checkbox-label">鍋滅數</span></td>			<!-- 鍋滅數 -->
+					<td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_XUHANG_ComError" name=""  value=4 class=""><span class="checkbox-label">缁埅</span></td>			<!-- 鎺夌珯 -->
+					<td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name=""  value=8 class="" /><span class="checkbox-label">鍙戠數</span></td>		<!-- 鍙戠數 -->
+					<td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError"	name="" value=16 class="" ><span class="checkbox-label">寮�闂ㄥ紓甯�</span></td>	<!-- 寮�闂ㄥ紓甯� -->
+					<td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name=""  value=32 class=""><span class="checkbox-label">鎺夌珯</span></td>		<!-- 鎺夌珯 -->
 					
 				</tr>
 			</table>
@@ -171,7 +168,9 @@
         <script type="text/javascript" src="js/loading.js"></script>
         <script type="text/javascript" src="js/nocontent.js"></script>
         <script type="text/javascript" src="js/createTab.js"></script>
+        <script type="text/javascript" src="src/layui.all.js"></script>
         <script type="text/javascript" src="pages/js/common.js"></script>
+        <script type="text/javascript" src="js/rightmenu.js"></script>
         <script type="text/javascript">
         var Page={
 			pageCurr:1,
@@ -193,6 +192,16 @@
 
         // 鏍规嵁琛ㄦ牸鐨勫ご閮ㄧ敓鎴愯〃鏍奸�夐」鍜岃〃鏍肩殑鐘舵�佹暟缁�
         $(function() {
+        
+        	//褰撲粠鍏朵粬椤甸潰璺宠浆鍒板綋鍓嶉〉闈㈤�変腑鎸囧畾鐨勫紓甯哥被鍨嬪苟涓旀煡璇㈣褰�
+        	var station_state = getQueryString('station_state');
+        	if(station_state){
+        		//alert(station_state);
+        		$('#search_form .condi-opt input[type=checkbox]').prop("checked", false);
+        		$('#search_form .condi-opt [value='+station_state+']:checkbox').attr("checked", true);
+        	}
+        	
+        
             centerDiv($('#cardOption'));
             // 閬嶅巻琛ㄦ牸澶撮儴鐢熸垚鐘舵�佹暟缁�
             for(var i = 0; i < arrTh.length; i++) {
@@ -245,12 +254,38 @@
             createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
 
             $('#paging .search').click(function() {
-                
-                 searchstationstate(); 
-                //noContent.showNoContent();			//鏄剧ず鏌ヨ澶辫触妗�
-                
+                 searchstationstate(true); 
             });
-
+			
+			var menuItems = [{
+				txt: '瀹炴椂-鐩戞祴鏁版嵁',cla: 'menu-control'
+			}];
+			// 娣诲姞鍙抽敭鑿滃崟
+			tblHd.on('click', 'tbody tr', function(e) {
+				// 鍒ゆ柇鏄惁涓哄彸閿�
+				if(e.which == 3) {
+					var disX = (e || event).clientX + 10;	//鑾峰彇榧犳爣鐐瑰嚮鐨勬í鍧愭爣
+					var disY = (e || event).clientY + 10;	// 鑾峰彇榧犳爣鐐瑰嚮鐨勭旱鍧愭爣
+					var trData = $(this).data('attr');
+					menuItems[0].data = trData;
+					//console.log(trData);
+					rightMenu.showMenu(menuItems, disX, disY);
+				}
+			});
+			
+			// 鐐瑰嚮瀹炴椂-鐩戞祴鏁版嵁璺宠浆
+			$('body').on('click', '.menu-control', function() {
+				var _data = $(this).data('data');
+				//console.log(_data);
+				var province = _data.stationName1;
+				var city = _data.stationName2;
+				var county = _data.stationName5;
+				var home = _data.stationName;
+				
+				var url = skipUrl('control.jsp',province,city,county,home);
+				window.open(url);
+			});
+			
             // 鐐瑰嚮琛ㄦ牸閫夐」鏄剧ず琛ㄦ牸閫夐」寮瑰嚭妗�
             $('#paging .card-opt').click(function() {
                 var checkboxList = $('#cardOption .con_table table tbody').find('input[type="checkbox"]');
@@ -334,9 +369,13 @@
         }
         
         
-        
-         // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+        var isNewLoad = true;
+        // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+        var filterLoad;
 		$(document).ready(function(){
+			filterLoad = layer.load();
+			var pre_province = getQueryString('province');
+			
 			//椤甸潰鍔犺浇鏃舵煡璇㈢渷
 			$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
 				data=data.result;
@@ -353,6 +392,9 @@
 						}else{
 							$option.text(data.data[i-1]);
 							$option.attr("value",data.data[i-1]);	
+							if(pre_province == data.data[i-1] && isNewLoad){
+								$option.attr("selected",true);	
+							}
 						}					
 						$select.append($option);
 					}
@@ -363,10 +405,15 @@
 			});
 		});
 		
-		function findCity() {
+		function findCity(isLoad) {
 			var data = {
 				StationName1: $("#station_name1").val()
 			};
+			// 鏄惁娣诲姞绛夊緟
+			if(isLoad) {
+				filterLoad = layer.load();
+			}
+			var pre_city = getQueryString('city');
 			// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
 			$.ajax({ 	
 		        type: "post", 				
@@ -384,6 +431,9 @@
 						for(var i=0;i<_data.length;i++){
 							var __data = _data[i];
 							var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+							if(pre_city == __data.StationName2 && isNewLoad){
+								tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);
+							}
 							optsList.push(tmp);
 						}
 						// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -391,25 +441,87 @@
 		        	}else {
 		        		$select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
 		        	}
-		        	findStationNamebyStationname1();
+		        	findCounty();
 		        }
 		    });
 		}
-		//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
+		
+		// 鏌ヨ鍖�/鍘�
+		function findCounty(isLoad) {
+			var tmp = {
+				StationName1:$("#station_name1").val(),
+				StationName2:$("#city").val(),
+			};
+			// 鏄惁娣诲姞绛夊緟
+			if(isLoad) {
+				filterLoad = layer.load();
+			}
+			var pre_county = getQueryString('county');
+			// 鏌ヨ鍖哄幙
+			$.ajax({
+				type: 'post',
+				async: true,
+				url: "BattInfAction!serchStationName5",
+				data: "json="+JSON.stringify(tmp),
+				success:function(data) {
+					var rs = JSON.parse(data.result);
+					var $select = $("#county");
+					if(rs.code==1){
+						var _data = rs.data;
+						// 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+						var optsList = [];
+						for(var i=0;i<_data.length;i++){
+							var __data = _data[i];
+							var _attr = {
+								StationId: __data.StationId
+							};
+							var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);
+							if(pre_county == __data.StationName5 && isNewLoad){
+								tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);
+							}
+							optsList.push(tmp);
+						}
+						
+						// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+						createOptions($select, optsList, true);
+					}else{
+						$select.text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+					}
+					findStationNamebyStationname1();
+				}
+			});
+		}
+		
+		// 褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
 		$('#station_name1').change(function(){
-			findCity();
+			findCity(true);
 		});
-		//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+		// 褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
 		$('#city').change(function(){
-			findStationNamebyStationname1();
+			findCounty(true);
+		});
+		// 褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+		$('#county').change(function(){
+			findStationNamebyStationname1(true);
+		});
+		
+		// 褰撶數姹犵粍鐨勫�煎彉鍖栨椂鏇存柊鍐呭
+		$('#station_name3').change(function() {
+			searchstationstate(true);
 		});
 		
 		//鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
-		function findStationNamebyStationname1(){
+		function findStationNamebyStationname1(isLoad){
 			var tmp = {
 				StationName1:$("#station_name1").val(),
-				StationName2:$("#city").val()
+				StationName2:$("#city").val(),
+				StationName5:$("#county").val()
 			};
+			// 鏄惁娣诲姞绛夊緟
+			if(isLoad) {
+				filterLoad = layer.load();
+			}
+			var pre_home = getQueryString('home');
 			//var selectvalue=$("#station_name1 option:selected").val();
 			//alert(selectvalue);
 			$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -421,18 +533,14 @@
 					var optsList = [];
 					//console.info(_data[0]);
 					for(var i=0;i<_data.length;i++){
-					/*	if(i==0){
-							$select.html("<s:text name='All'/>(<s:text name='Common'/>"+data.length+"<s:text name='Species'/>)");	
-							$select.attr("value","");
-						}else{
-							$select.text(_data[i-1].StationName3);
-							$select.attr("value",_data[i-1].StationId);	
-						}*/
 						var __data = _data[i];
 						var _attr = {
 							StationId: __data.StationId
 						};
 						var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+						if(pre_home == __data.StationName && isNewLoad){
+							tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr,{},true);
+						}					
 						optsList.push(tmp);
 					}
 					// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -441,8 +549,9 @@
 					$("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
 					
 				}
-				
-				searchstationstate(); 
+				isNewLoad = false;
+				layer.close(filterLoad);
+				searchstationstate(true); 
 			});
 		}
 		
@@ -456,8 +565,9 @@
 					pageSize:$('#number').val(),
 					pageCurr:Page.pageCurr,
 				},												
-				StationName1:$('#station_name1').val(),							//甯�
-				StationName2:$('#city').val(),	
+				StationName1:$('#station_name1').val(),		// 鐪�
+				StationName2:$('#city').val(),				// 甯�
+				StationName5:$('#county').val(),			// 鍖�/鍘�	
 				StationName3:$('#station_name3').val(),				
 				StationId: stationid?stationid:0,
 				BattGroupNum:battgroupid,
@@ -465,43 +575,49 @@
 			//console.info(temp);
 			return temp;
 		}
-			function batt_condition(){
-				var POFF_ComError = 0;
-				var XUHANG_ComError = 0;
-				var FADIAN_ComError = 0;
-				var DIAOZHAN = 0;
-				var DOOROPEN_ComError = 0;
-				var condition = 0;
-				if($('#ALM_TYPE_BTS9100S_POFF_ComError').attr("checked")){
-					POFF_ComError = $('#ALM_TYPE_BTS9100S_POFF_ComError').val();
-					condition+=parseInt(POFF_ComError);
-				}
-				if($('#ALM_TYPE_BTS9100S_XUHANG_ComError').attr("checked")){
-					XUHANG_ComError = $('#ALM_TYPE_BTS9100S_XUHANG_ComError').val();
-					condition+=parseInt(XUHANG_ComError);
-				}
-				if($('#ALM_TYPE_BTS9100S_FADIAN_ComError').attr("checked")){
-					FADIAN_ComError = $('#ALM_TYPE_BTS9100S_FADIAN_ComError').val();
-					condition+=parseInt(FADIAN_ComError);
-				}
-				if($('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').attr("checked")){
-					DIAOZHAN = $('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').val();
-					condition+=parseInt(DIAOZHAN);
-				}
-				if($('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').attr("checked")){
-					DOOROPEN_ComError =	$('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').val();
-					condition+=parseInt(DOOROPEN_ComError);
-				}
-				//condition = POFF_ComError+XUHANG_ComError+DIAOZHAN+DOOROPEN_ComError+FADIAN_ComError;
-				//console.info(condition);
-				return condition;
+		
+		function batt_condition(){
+			var POFF_ComError = 0;
+			var XUHANG_ComError = 0;
+			var FADIAN_ComError = 0;
+			var DIAOZHAN = 0;
+			var DOOROPEN_ComError = 0;
+			var condition = 0;
+			if($('#ALM_TYPE_BTS9100S_POFF_ComError').attr("checked")){
+				POFF_ComError = $('#ALM_TYPE_BTS9100S_POFF_ComError').val();
+				condition+=parseInt(POFF_ComError);
 			}
+			if($('#ALM_TYPE_BTS9100S_XUHANG_ComError').attr("checked")){
+				XUHANG_ComError = $('#ALM_TYPE_BTS9100S_XUHANG_ComError').val();
+				condition+=parseInt(XUHANG_ComError);
+			}
+			if($('#ALM_TYPE_BTS9100S_FADIAN_ComError').attr("checked")){
+				FADIAN_ComError = $('#ALM_TYPE_BTS9100S_FADIAN_ComError').val();
+				condition+=parseInt(FADIAN_ComError);
+			}
+			if($('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').attr("checked")){
+				DIAOZHAN = $('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').val();
+				condition+=parseInt(DIAOZHAN);
+			}
+			if($('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').attr("checked")){
+				DOOROPEN_ComError =	$('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').val();
+				condition+=parseInt(DOOROPEN_ComError);
+			}
+			//condition = POFF_ComError+XUHANG_ComError+DIAOZHAN+DOOROPEN_ComError+FADIAN_ComError;
+			//console.info(condition);
+			return condition;
+		}
 
 		var myTimeOut;
 		//鏌ヨ鏈烘埧鐘舵��
-		function searchstationstate(){
+		function searchstationstate(isLoad){
 			var temp = createSearchParam();
 			arrTd = new Array();
+			// 鏄惁娣诲姞绛夊緟
+			var load;
+			if(isLoad) {
+				load = layer.load(1);
+			}
 			$.ajax({
 				type: "post",
 				url: "Bts_station_stateAction_action_serchByCondition",
@@ -513,7 +629,7 @@
 					var index = 0;
 					var data = JSON.parse(data.result);
 					if(data.code==1&&data.data!=null){
-						//console.info(data.data);
+						console.info(data.data);
 						var data = data.data;
 						//console.info(data[0].dev_id);
 						for(var i=0;i<data.length;i++){
@@ -559,11 +675,11 @@
 							if(_data.station_stat_xuhang){
 								arrTd[index++] = create_fa_font('fa-television','red',{msg: '缁埅寮傚父'});
 								arrTd[index++] = _data.station_xuhang_start_time;
-								arrTd[index++] = StringtoData(_data.station_xuhang_start_time);		
+								arrTd[index++] = StringtoData(_data.station_xuhang_start_time);
 							}else{
 								arrTd[index++] = create_fa_font('fa-television','green',{msg: '姝e父'});
-								arrTd[index++] = "-";
-								arrTd[index++] = formartTime(0);
+								arrTd[index++] = _data.station_xuhang_start_time;
+								arrTd[index++] = getXunHangTimeLong(_data.station_xuhang_end_time, _data.station_xuhang_start_time, _data.station_stat_xuhang);		
 							}
 							
 							// 寮�闂ㄥ叧闂ㄥ紓甯�
@@ -591,21 +707,54 @@
 						$('#total').text(Page.pageAll);
 						$('#current').text(Page.pageCurr+"/"+pageNum);
 					}
-					createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+					layer.close(load);
+					createFullTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+					
+					// 缁欐瘡涓�琛屾坊鍔犳暟鎹�
+					var trList = tblBd.find('tbody tr');
+					// 閬嶅巻鍐呭缁檛r娣诲姞attr
+					for(var i=0; i<data.length; i++) {
+						trList.eq(i).data('attr', data[i]);
+					}
 					
 					window.clearTimeout(myTimeOut);
 					myTimeOut = window.setTimeout(searchstationstate, 8000);
 				}
 			});
 		}
+		
+		// 椤甸潰瀹瑰櫒澶у皬鏀瑰彉瑙﹀彂
+		$(window).resize(function() {
+			setTblWidth(tblHd, tblBd);
+		});
+		
+		// 鑾峰彇缁埅鏃堕暱
 		function StringtoData(value){
-		var date1= value;  //寮�濮嬫椂闂�
-        var date2 = new Date();    //缁撴潫鏃堕棿
-        var date3 = date2.getTime() - new Date(date1).getTime();   //鏃堕棿宸殑姣鏁�      
-		var date4 = Math.floor(date3/(1000));
-		return formartTime(date4);
-		}		
-			//鏍煎紡鍖栨椂闂磛alue浼犲叆涓虹
+			var date1= value;  //寮�濮嬫椂闂�
+	        var date2 = new Date();    //缁撴潫鏃堕棿
+	        var date3 = date2.getTime() - new Date(date1).getTime();   //鏃堕棿宸殑姣鏁�      
+			var date4 = Math.floor(date3/(1000));
+			return formartTime(date4);
+		}
+		
+		// 閫氳繃缁埅寮�濮嬫椂闂村拰缁撴潫鏃堕棿鑾峰彇缁埅鐨勬椂闀�
+		function getXunHangTimeLong(start, end, state) {
+			var timeLong = '';
+			if(start && end) {
+				var _timeLong = new Date(end).getTime()-new Date(start).getTime();
+				timeLong = Math.floor(_timeLong/(1000));
+			}
+			
+			// 鏈�缁堟椂闂磝x澶﹛x鏃秞x鍒嗛挓
+			var rsTime = '-';
+			if(isNumber(timeLong)&&!state) {
+				rsTime = formartTime(timeLong)
+			}
+			
+			return rsTime;
+		}
+				
+		//鏍煎紡鍖栨椂闂磛alue浼犲叆涓虹
 		function formartTime(value){
 			value = Math.abs(parseInt(value));
 			//console.info(value);

--
Gitblit v1.9.1