Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection

VisualInspection/js/statistics/change_work.js

@@ -75,12 +75,8 @@ $(function(){
  */
 function getFsWorkInfo(){
 
-    // var param = {
-    //     "start_time": "2017-"+(GV("#sel_month")-1)+"-25 23:00:00" ,
-    //     "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
-    // }
     var param = {
-        "start_time": GV("#start-time")+" 23:00:00" ,
+        "start_time":dateChange(new Date(GV("#start-time")+" 00:00:00"),60*60*1000 )  ,
         "end_time": GV("#end-time")+" 23:00:00"
     }
     

VisualInspection/js/statistics/check_workload_statistics.js

@@ -1,12 +1,23 @@
 // 默认初始化日期一个月
 $(".div-start input").val(new Date().getFullYear()+"-"+new Date().getMonth()+"-26");
 $(".div-end input").val(new Date().getFullYear()+"-"+(new Date().getMonth()+1)+"-25");
-var start_date = $(".div-start input").val()+" 23:00:00";
+var start_date = dateChange(new Date($(".div-start input").val()+" 00:00:00"),60*60*1000 ) ;
 var end_date = $(".div-end input").val()+" 23:00:00";
 var user_id = $("#select-personal").val();      
 var cur_status;
 var hide = false;
 
+/**
+ * 
+ * @param {*} datet 
+ * @param {*} changVal 
+ */
+function dateChange(datet , changVal ){
+	var tempDate = new Date(datet.valueOf() - changVal);
+	return tempDate.Format("yyyy-MM-dd HH:mm:ss");
+}
+
+
 $(function(){
 
     //*************************************数据表格******************************************
@@ -73,10 +84,11 @@ $(function(){
 								);
 	}
 
+
 	// 导出excel
 	$("#export-check-info").click(function(){
 		var param = '';
-		var start_date = $(".div-start input").val()+" 23:00:00";
+		var start_date = dateChange(new Date($(".div-start input").val()+" 00:00:00"),60*60*1000 ) ;
 		var end_date = $(".div-end input").val()+" 23:00:00";
 		if( $("#select-personal").val()!=''){
 			param += "&user_id=" + $("#select-personal").val() ;
@@ -87,7 +99,7 @@ $(function(){
 
 
     $(".query button").click(function(){
-		var start_date = $(".div-start input").val()+" 23:00:00";
+		var start_date =dateChange(new Date($(".div-start input").val()+" 00:00:00"),60*60*1000 ) ;
 		var end_date = $(".div-end input").val()+" 23:00:00";
 		var startStr = start_date.replace(/-/g, '/');
 		var endStr = end_date.replace(/-/g, '/');

VisualInspection/js/statistics/common_statistic.js

@@ -245,4 +245,14 @@ function timeTranslate(str){
         month2 = 12 ;
     }
     return year2 + "-"+month2 + "-25 23:00:00" ;
+}
+
+/**
+ * 
+ * @param {*} datet 
+ * @param {*} changVal 
+ */
+function dateChange(datet , changVal ){
+	var tempDate = new Date(datet.valueOf() - changVal);
+	return tempDate.Format("yyyy-MM-dd HH:mm:ss");
 }

VisualInspection/js/statistics/common_work.js

@@ -82,7 +82,7 @@ function getFsWorkInfo() {
     //     "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
     // }
     var param = {
-        "start_time": GV("#start-time") + " 23:00:00",
+        "start_time":  dateChange(new Date(GV("#start-time")+" 00:00:00"),60*60*1000 ) ,
         "end_time": GV("#end-time") + " 23:00:00"
     }
 

VisualInspection/js/statistics/personal_data_statistics.js

@@ -11,10 +11,9 @@ var hide = false;
 // 默认初始化日期一个月
 $(".div-start input").val(new Date().getFullYear()+"-"+new Date().getMonth()+"-26");
 $(".div-end input").val(new Date().getFullYear()+"-"+(new Date().getMonth()+1)+"-25");
-var start_date = $(".div-start input").val()+" 23:00:00";
+var start_date = dateChange(new Date($(".div-start input").val()+" 00:00:00"),60*60*1000 ) ;
 var end_date = $(".div-end input").val()+" 23:00:00";
 
-
 /**
  * 预加载方法
  */		
@@ -76,7 +75,7 @@ $(function(){
 
 	$(".query button").click(function(){
         var user_id = $("#select-personal").val();
-		var start_date = $(".div-start input").val()+" 23:00:00";
+		var start_date = dateChange(new Date($(".div-start input").val()+" 00:00:00"),60*60*1000 ) ;
 		var end_date = $(".div-end input").val()+" 23:00:00";
 		var startStr = start_date.replace(/-/g, '/');
 		var endStr = end_date.replace(/-/g, '/');
@@ -239,7 +238,7 @@ $(function(){
     }
 
 	function getInit(){
-		 var start_date = $(".div-start input").val()+" 23:00:00";
+		 var start_date = dateChange(new Date($(".div-start input").val()+" 00:00:00"),60*60*1000 );
 		var end_date = $(".div-end input").val()+" 23:00:00";
 		var user_id = $("#select-personal").val();
 		// 页面初始化