空状态bug

src/js/cdss.js

@@ -53,8 +53,8 @@ let moduleConfig={
     followup: "followUpWrap",
     tcmiss: 'tcmWarp',
 }
-let allInterface = 0
-let hasCompleteTnterface = 0
+let allInterface = 0;  //需要调用的推送接口的个数
+let hasCompleteTnterface = 0;     //已返回的推送接口的个数
 let moduleNum = 0
 let mrId = getUrlArgObject('mrId')
 let isTcm = getUrlArgObject('isTcm')
@@ -241,7 +241,6 @@ function renderPage(pageSet){
   const hasMedical = hasTab("医学知识",setInfo)
   const hasFollowUp = hasTab("随访计划",setInfo)
   const hasTcm = hasTab("中医辅助", setInfo);
-  console.log(hasFollowUp)
   //所有模块都未开启配置，显示功能未开启（无tab)
   if(hasAuxiliary.status===0&&hasMedical.status===0&&hasFollowUp.status===0&&hasTcm.status===0){
     const nullTxt = `<div class="empty-box" style="left: -20px;display: block;">
@@ -304,12 +303,9 @@ function renderPushData(){
       let medicinesPush = result.medicines || []
       let operationsPush = result.operations ||[]
       let treatPush = result.treat&&result.treat[0] ||{}
-        let nursePush = result.nurse || []
+      let nursePush = result.nurse || []
       treatDisName = treatPush&&treatPush["name"]
       let generaTreatPush = treatPush&&treatPush["generaTreat"]
-      // let lisPush =[{name:"血常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null},{name:"尿常规",hisNameList:null}]
-      // let pacsPush = [{name:"胸部x射线",hisNameList:null},{name:"心电图",hisNameList:null}]
-      // let checkupPush = [{name:"神志表情",hisNameList:null},{name:"面部表情",hisNameList:null}]
       let lisNum = $(".moduleItem.lis").attr("data-num") || 5
       let scaleNum = $(".moduleItem.evaluation").attr("data-num") || 5
       let pacsNum = $(".moduleItem.pacs").attr("data-num") || 5
@@ -317,7 +313,7 @@ function renderPushData(){
       let symptomNum = $(".moduleItem.symptom").attr("data-num") || 5
       let medicinesNum = $(".moduleItem.medicine").attr("data-num") || 5
       let operationsNum = $(".moduleItem.operation").attr("data-num") || 5
-        let nurseNum = $(".moduleItem.nurse").attr("data-num") || 5
+      let nurseNum = $(".moduleItem.nurse").attr("data-num") || 5
      
 
       renderLis(lisPush,lisNum)
@@ -332,9 +328,9 @@ function renderPushData(){
       renderNurse(nursePush, nurseNum)
       bindOpenInfo()
       moreInfo()
-      bindSlide()
-      empty();  //判断是否显示空状态
+      bindSlide();
     }
+    empty();  //判断是否显示空状态
   })
 }
 function adjustHei(){
@@ -384,14 +380,11 @@ function renderPushWarning(){
       $(".loading").hide();
     hasCompleteTnterface++
     if(res.data.code == '0'){
-      const result = res.data.data
+      const result = res.data.data;
       let billMsgList = result.billMsgList || []  //开单合理性提醒
       let highRiskList = result.highRiskList || []  //高危药品、手术
       let criticalValList = result.criticalValList || []  //危急值提醒
-      let noteList = result.noteList || []  //检查内容注意事项
-      let dubugStr = result.dubugStr || []  //注意调试信息
       let otherList = result.otherList || []  //其他提醒
-        //$('.moduleItem.crivalue').append(titleStr('warning'))
       renderBillingPush(billMsgList,'开单合理性提醒','rationali')
       renderBillingPush(highRiskList,'高风险提示','highrisk')
       renderBillingPush(criticalValList,'危急值提醒','crivalue')
@@ -401,8 +394,8 @@ function renderPushWarning(){
       $(".moduleItem.tips").wrapAll("<div class='tips-cont'></div>");
         updatePopNum();
       $(titleStr('warning')).insertBefore('.tips-cont .moduleItem:first-child')
-      empty();
     }
+    empty();
   })
 }
 function renderWriteStandard(){
@@ -418,7 +411,7 @@ function renderWriteStandard(){
 }
 
 function  renderwriteStandardPage(list,casewritingNum){
-  let arr = Object.keys(list)
+  let arr = Object.keys(list);
   if(arr.length > 0 &&  $(".moduleItem.casewriting").length > 0){
     moduleNum++
     $(".moduleItem.casewriting").append(titleStr("casewritingPush"))
@@ -445,8 +438,8 @@ function  renderwriteStandardPage(list,casewritingNum){
     $('.moduleItem.casewriting').css("display","block")
     updatePopNum();
     bindSlideCaseWriting()
-    empty();
   }
+  empty();
 }
 function renderBillingPush(list,name,code){
   if(list.length === 0){
@@ -689,10 +682,7 @@ function renderModuleWrapper(moduleList){
         moduleStr += `<div class="moduleItem ${moduleList[i].code }"  data-num="${moduleList[i].number}" style="display:none"></div>`
       }
     }
-   
   }
-  //console.log(moduleList,moduleStr)
-
   $(".recommendWrap").append(moduleStr)
 }
 
@@ -785,13 +775,25 @@ function bindGeneralSlide(){
 
 //显示空状态
 function empty(){
-    setTimeout(function(){
-        ifInputParam = hasInputParam();
-        if(!ifInputParam){    //没有输入数据时
-            $(".recommendBox .empty-box").hide();
-            $(".recommendBox .empty").show();
-            return;
-        }
+    ifInputParam = hasInputParam();
+    if(!ifInputParam){    //没有输入数据时
+        $(".recommendBox .empty-box").hide();
+        $(".recommendBox .empty").show();
+        return;
+    }
+    if(hasCompleteTnterface===allInterface){    //需调的推送接口全部返回后
+        setTimeout(function(){
+            const emptyShownBox = $('.recommendWrap .empty-box:visible').length;
+            const configShownBox = $('.recommendWrap .moduleItem:visible').length;
+            if(configShownBox===0&&emptyShownBox===0){       //有配置但没数据
+                $('.empty-box').hide();
+                $('.recommendBox .empty-null').show();
+                return;
+            }
+            $(".empty-box").hide();
+        },200);
+    }
+    /*setTimeout(function(){
         const emptyShownBox = $('.recommendWrap .empty-box:visible').length;
         const configShownBox = $('.recommendWrap .moduleItem:visible').length;
         if(configShownBox===0&&emptyShownBox===0){       //有配置但没数据
@@ -800,7 +802,7 @@ function empty(){
             return;
         }
         $(".empty-box").hide();
-    },200);
+    },200);*/
 }
 
 $(function(){