diff --git a/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java b/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java
index 25b353817..c4ed10665 100644
--- a/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java
@@ -198,11 +198,14 @@ public class ConfigStatisticsController extends BaseController {
 							}
 						}
 						String cfgDesc="";
-						if(entity1.getServiceId().equals("400")){//ASN IP(特殊的业务，需单独查询)
-							cfgDesc = configStatisticService.getASNIPCfgDesc(entity1.getCfgId());
-						}else if(entity1.getServiceId().equals("1028")){// APP IP 
-							cfgDesc = configStatisticService.getAPPIPCfgDesc(entity1.getCfgId());
-						}else{
+//						if(entity1.getServiceId().equals("400")){//ASN IP(特殊的业务，需单独查询)
+//							cfgDesc = configStatisticService.getASNIPCfgDesc(entity1.getCfgId());
+//						}else if(entity1.getServiceId().equals("1028")){// APP IP 
+//							cfgDesc = configStatisticService.getAPPIPCfgDesc(entity1.getCfgId());
+//						}else{
+//							cfgDesc = configStatisticService.getCfgDescByCfgId(entity1);
+//						}
+						if(!entity1.getServiceId().equals("400") && !entity1.getServiceId().equals("1028")){
 							cfgDesc = configStatisticService.getCfgDescByCfgId(entity1);
 						}
 						entity1.setCfgDesc(cfgDesc);
@@ -293,11 +296,14 @@ public class ConfigStatisticsController extends BaseController {
 							}
 						}
 						String cfgDesc="";
-						if(entity1.getServiceId().equals("400")){//ASN IP(特殊的业务，需单独查询)
-							cfgDesc = configStatisticService.getASNIPCfgDesc(entity1.getCfgId());
-						}else if(entity1.getServiceId().equals("1028")){// APP IP 
-							cfgDesc = configStatisticService.getAPPIPCfgDesc(entity1.getCfgId());
-						}else{
+//						if(entity1.getServiceId().equals("400")){//ASN IP(特殊的业务，需单独查询)
+//							cfgDesc = configStatisticService.getASNIPCfgDesc(entity1.getCfgId());
+//						}else if(entity1.getServiceId().equals("1028")){// APP IP 
+//							cfgDesc = configStatisticService.getAPPIPCfgDesc(entity1.getCfgId());
+//						}else{
+//							cfgDesc = configStatisticService.getCfgDescByCfgId(entity1);
+//						}
+						if(!entity1.getServiceId().equals("400") && !entity1.getServiceId().equals("1028")){
 							cfgDesc = configStatisticService.getCfgDescByCfgId(entity1);
 						}
 						entity1.setCfgDesc(cfgDesc);
diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/ConfigStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/codedic/ConfigStatisticDao.xml
index 097dfe117..2b92df3a6 100644
--- a/src/main/java/com/nis/web/dao/dashboard/codedic/ConfigStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/codedic/ConfigStatisticDao.xml
@@ -11,8 +11,7 @@
     	select cfg_desc from ${tableName}
 		  
 		  <where>
-		  	 is_valid=1
-		     and service_id = #{serviceId}
+		     service_id = #{serviceId}
 		     and compile_id= #{cfgId}
 		  </where>
 		  
diff --git a/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp b/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
index f33b2484e..a72b57abf 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
@@ -186,7 +186,7 @@
 							<!-- <input name="beginDate" id="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
 										value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false)"/> -->
 							 <input name="beginDate" id="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/> 
+										value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/> 
 					</div>
 				</div>
 				<div class="pull-left">
@@ -197,7 +197,7 @@
 							<!-- <input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
 										value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false)"/> -->
 							 <input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
-										value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/> 
+										value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/> 
 					</div>
 				</div>
 				
@@ -649,14 +649,14 @@ function initTimeSize(){
 	$("#endDate").remove();
 
 	  if(size == 1){ // 5分钟
-			beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
-			endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
+			beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
+			endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
 		}else if(size == 2){ // 小时
-			beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate1','#endDate1',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
-			endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
+			beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate1','#endDate1',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
+			endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
 		}else if(size == 3){ // 天
-			beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
-			endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
+			beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
+			endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
 		}else if(size == 4){ // 月
 			beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");
 			endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");
@@ -671,14 +671,14 @@ function initTimeSize(){
 	$("#endDate").change();
 	
 	 if(size == 1){ // 5分钟
-		$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
-		$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
+		$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
+		$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
 	}else if(size == 2){ // 小时
-		$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
-		$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
+		$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
+		$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
 	}else if(size == 3){ // 天
-		$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
-		$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
+		$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
+		$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
 	}else if(size == 4){ // 月
 		$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");
 		$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");
@@ -713,14 +713,14 @@ function  selectTimeSize(){
 			endTimeObj.attr("onchange","setEndTime('#beginDate','#endDate',24,'m','yyyy-MM-dd hh:mm:ss',false,'year')");
 		}  */
 		  if(size == 1){ // 5分钟
-				beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
-				endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
+				beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
+				endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
 			}else if(size == 2){ // 小时
-				beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate1','#endDate1',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
-				endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
+				beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate1','#endDate1',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
+				endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
 			}else if(size == 3){ // 天
-				beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
-				endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
+				beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
+				endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
 			}else if(size == 4){ // 月
 				beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");
 				endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");
@@ -751,14 +751,14 @@ function  selectTimeSize(){
 			$("#endDate").attr("onchange","setEndTime('#beginDate','#endDate',24,'m','yyyy-MM-dd hh:mm:ss',false)");
 		}  */
 		 if(size == 1){ // 5分钟
-			$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
-			$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
+			$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
+			$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
 		}else if(size == 2){ // 小时
-			$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
-			$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'d','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
+			$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
+			$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh')");
 		}else if(size == 3){ // 天
-			$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
-			$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
+			$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
+			$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd')");
 		}else if(size == 4){ // 月
 			$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");
 			$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',12,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM')");