wangjianguo 8 rokov pred
rodič
commit
e1bb4240b0

+ 8 - 0
VisualInspection/js/statistics/assess_ranking.js

@@ -32,6 +32,14 @@ function queryEmpClick(){
         start_date += " 23:00:00";
         end_date += " 23:00:00";
     }
+    var startStr = start_date.replace(/-/g, '/');
+    var endStr = end_date.replace(/-/g, '/');
+    var start = new Date(startStr);
+    var end = new Date(endStr);
+    if(start>end){
+        tip("开始时间不能比结束时间大");
+        return;
+    }
     var param = {
         "parent_dept_id":GV("#center-manager"),
         "dept_id": GV("#fsList"),

+ 8 - 1
VisualInspection/js/statistics/assess_situation.js

@@ -17,7 +17,14 @@ function querySituationClick(){
         start_date += " 23:00:00";
         end_date += " 23:00:00";
     }
-  
+    var startStr = start_date.replace(/-/g, '/');
+    var endStr = end_date.replace(/-/g, '/');
+    var start = new Date(startStr);
+    var end = new Date(endStr);
+    if(start>end){
+        tip("开始时间不能比结束时间大");
+        return;
+    }
     var param = {
         "dept_id": $("#fsList").val(),
         "start_date": start_date,

+ 8 - 1
VisualInspection/js/statistics/assess_type.js

@@ -21,7 +21,14 @@ function queryTypeClick(){
         start_date += " 23:00:00";
         end_date += " 23:00:00";
     }
-  
+    var startStr = start_date.replace(/-/g, '/');
+    var endStr = end_date.replace(/-/g, '/');
+    var start = new Date(startStr);
+    var end = new Date(endStr);
+    if(start>end){
+        tip("开始时间不能比结束时间大");
+        return;
+    }
     var param = {
         "dept_id": $("#fsList").val(),
         "start_date": start_date,

+ 3 - 0
VisualInspection/js/statistics/total_company_statistics.js

@@ -574,6 +574,9 @@ $(function(){
 				calculable : true,
 				xAxis : [
 					{
+						axisLabel: {  
+						interval:0
+						}  ,
 						type : 'category',
 						data : array_allStation
 					}