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

src/js/qcList.js

@@ -142,9 +142,7 @@ $(".abnormalClear").on("click", function(e){
     tabList = []; 
     name = ""; 
     behospitalCode="";  
-    behosDateStart="";  
     level=""; 
-    behosDateEnd="";  
     scoreSum = 0; 
     nameTemp = "";  
     behospitalCodeTemp=""; 
@@ -162,8 +160,19 @@ $(".abnormalClear").on("click", function(e){
     $('.doctorInp').val('')
     $('.doctorNumInp').val('')
     $('.doctorInp').val('')
-    $('#datepicker').val('')
-    $('#datepicker2').val('')
+    // $('#datepicker').val('')
+    // $('#datepicker2').val('')
+    //默认日期为近一个月
+    $( "#datepicker" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "-1m");
+    $( "#datepicker2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate",new Date());
     $('.selectDept ').html('选择科室')
     $(".deptList").css("display", "none")
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -173,6 +182,15 @@ $(".abnormalClear").on("click", function(e){
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $('.selectLevel ').addClass('unSelect')
     $("th[code]").removeClass("asc desc")
+    behosDateStart = $("#datepicker").val().trim()
+    behosDateEnd = $("#datepicker2").val().trim()
+    if(behosDateStart){
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
+    }
+    if(behosDateEnd){
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
+    }
+   
     getTabData(1)
 })
 function renderTab(data,hisId){

src/js/qcListDept.js

@@ -146,9 +146,7 @@ $(".abnormalClear").on("click", function(e){
     tabList = []; 
     name = ""; 
     behospitalCode="";  
-    behosDateStart="";  
     level=""; 
-    behosDateEnd="";  
     scoreSum = 0; 
     nameTemp = "";  
     behospitalCodeTemp=""; 
@@ -166,8 +164,19 @@ $(".abnormalClear").on("click", function(e){
     $('.doctorInp').val('')
     $('.doctorNumInp').val('')
     $('.doctorInp').val('')
-    $('#datepicker').val('')
-    $('#datepicker2').val('')
+   // $('#datepicker').val('')
+    // $('#datepicker2').val('')
+    //默认日期为近一个月
+    $( "#datepicker" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "-1m");
+    $( "#datepicker2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate",new Date());
     $('.selectDept ').html('选择科室')
     $(".deptList").css("display", "none")
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -177,6 +186,14 @@ $(".abnormalClear").on("click", function(e){
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $('.selectLevel ').addClass('unSelect')
     $("th[code]").removeClass("asc desc")
+    behosDateStart = $("#datepicker").val().trim()
+    behosDateEnd = $("#datepicker2").val().trim()
+    if(behosDateStart){
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
+    }
+    if(behosDateEnd){
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
+    }
     getTabData(1)
 })
 $("th[code]").on("click",function(e){

src/js/qcListPerson.js

@@ -145,9 +145,7 @@ $(".abnormalClear").on("click", function(e){
     tabList = []; 
     name = ""; 
     behospitalCode="";  
-    behosDateStart="";  
     level=""; 
-    behosDateEnd="";  
     scoreSum = 0; 
     nameTemp = "";  
     behospitalCodeTemp=""; 
@@ -165,8 +163,19 @@ $(".abnormalClear").on("click", function(e){
     $('.doctorInp').val('')
     $('.doctorNumInp').val('')
     $('.doctorInp').val('')
-    $('#datepicker').val('')
-    $('#datepicker2').val('')
+    // $('#datepicker').val('')
+    // $('#datepicker2').val('')
+    //默认日期为近一个月
+    $( "#datepicker" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "-1m");
+    $( "#datepicker2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate",new Date());
     $('.selectDept ').html('选择科室')
     $(".deptList").css("display", "none")
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -176,6 +185,14 @@ $(".abnormalClear").on("click", function(e){
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $('.selectLevel ').addClass('unSelect')
     $("th[code]").removeClass("asc desc")
+    behosDateStart = $("#datepicker").val().trim()
+    behosDateEnd = $("#datepicker2").val().trim()
+    if(behosDateStart){
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
+    }
+    if(behosDateEnd){
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
+    }
     getTabData(1)
 })
 $("th[code]").on("click",function(e){

src/js/utils.js

@@ -197,7 +197,7 @@ function focusMenuItem(code){
   ele.click();
 }
 function emptyBox(name){
-  let str = `<tr><td colspan="17" style="text-align: center;color: #aaa">
+  let str = `<tr><td colspan="18" style="text-align: center;color: #aaa">
   <img style="margin-top:50px;width:100px;" src="${require('../images/empty1.png')}" />
   <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">${name||'暂无数据~'}</p>
   </td></tr>`