| 
					
				 | 
			
			
				@@ -1,4 +1,4 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-/** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+/** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  * 通用js方法封装处理 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  * Copyright (c) 2019 ruoyi 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  */ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -18,7 +18,7 @@ export function parseTime(time, pattern) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			time = parseInt(time) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} else if (typeof time === 'string') { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			time = time.replace(new RegExp(/-/gm), '/'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm),''); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		if ((typeof time === 'number') && (time.toString().length === 10)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			time = time * 1000 
			 |