4962

src/js/console.js

@@ -4,6 +4,7 @@ require("../css/reset.less")
 require("../css/console.less")
 require("../images/logo.png")
 require("../images/arrow_down.png")
+require('./modal.js');
 
 // import 'zrender/lib/svg/svg';
 const {api} = require('./api.js')
@@ -1698,7 +1699,9 @@ function getTimeDetail(){
     $(".dateDetail").html(str)
 }
 $(".sureDate").click(function(){
-    getStaticDate()
+    if(!getStaticDate()){
+        return
+    }
     getAverageScoreLis()
     getBarData(dateType)
     getEveryDeptLevel()
@@ -1741,7 +1744,7 @@ function getStaticDate(){
     const end = new Date(behosDateEnd).getTime()
     if(start > end){
         $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-        return
+        return false
     }
     if(behosDateStart){
         behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
@@ -1749,6 +1752,7 @@ function getStaticDate(){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
+    return true
 }
 $(function() {
     const  iconCalenBlue= require("./../images/darkDate.png")

src/js/deptConsole.js

@@ -3,6 +3,7 @@ require("../css/reset.less")
 require("../css/deptConsole.less")
 require("../images/logo.png")
 require("../images/arrow_down.png")
+require('./modal.js');
 
 // import 'zrender/lib/svg/svg';
 const {api} = require('./api.js')
@@ -819,7 +820,9 @@ function getTimeDetail(){
     $(".dateDetail").html(str)
 }
 $(".sureDate").click(function(){
-    getStaticDate()
+    if(!getStaticDate()){
+        return
+    }
     getBarData(dateType)
 })
 //日期联动
@@ -856,7 +859,7 @@ function getStaticDate(){
     const end = new Date(behosDateEnd).getTime()
     if(start > end){
         $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-        return
+        return false
     }
     if(behosDateStart){
         behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
@@ -864,6 +867,7 @@ function getStaticDate(){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
+    return true
 }
 $(function() {
     const  iconCalenBlue= require("./../images/darkDate.png")