Prechádzať zdrojové kódy

Merge branch 'test' of http://192.168.2.236:10080/zhouna/AIPlatform into test

zhangxc 5 rokov pred
rodič
commit
ae2b8899df

+ 6 - 2
src/js/checkControl.js

@@ -554,8 +554,12 @@ $(function() {
         const start = new Date(startDateParam).getTime()
         const end = new Date(endDateParam).getTime()
         if(start > end){
-        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-        return
+            $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+            return
+        }
+        if((end - start)/24/60/60/1000 > 7){
+            $.alerModal({"message":"最多只能导出7天",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+            return
         }
         const param = {
         "level": deptId||"",

+ 4 - 0
src/js/qcListCopy.js

@@ -969,6 +969,10 @@ $(function($){
             $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
+        if((end - start)/24/60/60/1000 > 7){
+            $.alerModal({"message":"最多只能导出7天",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+            return
+        }
         const param = {
             behospitalCode: behospitalCode,
             patName: name, //病人姓名

+ 4 - 0
src/js/qcListOutHospital.js

@@ -1016,6 +1016,10 @@ $(function($){
             $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
+        if((end - start)/24/60/60/1000 > 7){
+            $.alerModal({"message":"最多只能导出7天",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+            return
+        }
         const param = {
             behospitalCode: behospitalCode,
             patName: name, //病人姓名

+ 0 - 1
src/js/utils.js

@@ -411,7 +411,6 @@ function initScroll(el,sliderDir,sliderMode,top){
 
  
   if(sliderDir == "YX"){
-    console.log("yx", el)
     new CusScrollBar({
         contentSelector: `${'.'+el+'_scroll_cont'}`, //滚动内容区
         barSelector: `${'.'+el+'_scroll_bar'}`, //滚动条