zhouna преди 3 години
родител
ревизия
7b4e6f0bcc
променени са 4 файла, в които са добавени 35 реда и са изтрити 37 реда
  1. 13 4
      src/css/cdssPlan.less
  2. 10 21
      src/js/cdss.js
  3. 9 9
      src/js/cdssPlan.js
  4. 3 3
      src/js/followUp.js

+ 13 - 4
src/css/cdssPlan.less

@@ -1,26 +1,35 @@
 @import './common.less';
 body{
-    overflow: hidden;
     position: relative;
     background: #fff;
 }
-.bodyWrap{
+/*.bodyWrap{
     position: fixed;
     width: 100%;
     height: 100%;
+}*/
+.followUpWrap{
+    margin: 0 84px;
 }
 .operaNameBox {
     padding: 5px 14px;
 }
+.operaNameWrap{
+    position: fixed;
+    width: calc(100% - 168px);
+    z-index: 1;
+}
+.infoWrap{
+    padding-top: 32px;
+    overflow-y: hidden;
+}
 .iframeWrap {
     margin: 0 auto 50px;
     // padding: 0 20px 20px 20px;
     min-width: 340px;
-    overflow-y: hidden;
 }
 .contentWrapper{
     position: relative;
-    overflow-y: hidden;
     // overflow-y: auto;
 }
 .responsibility {

+ 10 - 21
src/js/cdss.js

@@ -294,12 +294,12 @@ function renderPushData(){
       renderOperationPush(operationsPush,operationsNum)
       rendergeneraTreatPush(generaTreatPush)
       renderNurse(nursePush, nurseNum)
-      if(hasCompleteTnterface === allInterface){
-        $('.loading').css("display","none")
+      //if(hasCompleteTnterface === allInterface){
+        //$('.loading').css("display","none")
         //if(moduleNum === 0){
           empty()
         //}
-      }
+      //}
       bindOpenInfo()
       moreInfo()
       bindSlide()
@@ -373,12 +373,12 @@ function renderPushWarning(){
       // renderBillingPush(dubugStr,'注意调试信息')
      
     }
-    if(hasCompleteTnterface === allInterface){
-      $('.loading').css("display","none")
+    //if(hasCompleteTnterface === allInterface){
+      //$('.loading').css("display","none")
       //if(moduleNum === 0){
         empty()
       //}
-    }
+    //}
     
   })
 }
@@ -390,12 +390,12 @@ function renderWriteStandard(){
       let casewritingNum = $(".moduleItem.casewriting").attr("data-num") || 5
       renderwriteStandardPage(list,casewritingNum)
     }
-    if(hasCompleteTnterface === allInterface){
-      $('.loading').css("display","none")
+    //if(hasCompleteTnterface === allInterface){
+      //$('.loading').css("display","none")
       //if(moduleNum === 0){
         empty()
       //}
-    }
+    //}
   })
 }
 function  renderwriteStandardPage(list,casewritingNum){
@@ -817,19 +817,8 @@ $(function(){
             }  
         })    
     }  
-  });  
-  // $(".iframeWrap").preventScroll();  
-   /* $(".iframeWrap").preventScroll();
-    $(".recommendWrap").preventScroll();
-    $(".tcmWarp").preventScroll();
-    $(".infoWrap").preventScroll();
-  $(".medicalKonwledgeWrap .staticSearchB ul").preventScroll(); */
+  });
   $(window).on("resize", function(){
-    /*$(".iframeWrap").preventScroll();
-    $(".recommendWrap").preventScroll();
-      $(".tcmWarp").preventScroll();
- 
-    $(".medicalKonwledgeWrap .staticSearchB ul").preventScroll(); */
     adjustHei() 
   })
 });

+ 9 - 9
src/js/cdssPlan.js

@@ -104,15 +104,15 @@ $(function(){
     }  
   });  
   // $(".iframeWrap").preventScroll();  
-  $(".iframeWrap").preventScroll();  
+  /*$(".iframeWrap").preventScroll();
   $(".recommendWrap").preventScroll();  
   $(".infoWrap").preventScroll();  
-  $(".medicalKonwledgeWrap .staticSearchB ul").preventScroll();  
-  $(window).on("resize", function(){
-    $(".iframeWrap").preventScroll();  
-    $(".recommendWrap").preventScroll();  
- 
-    $(".medicalKonwledgeWrap .staticSearchB ul").preventScroll(); 
-    adjustHei() 
-  })
+  $(".medicalKonwledgeWrap .staticSearchB ul").preventScroll(); */
+    /*$(window).on("resize", function(){
+    /*$(".iframeWrap").preventScroll();
+      $(".recommendWrap").preventScroll();
+
+      $(".medicalKonwledgeWrap .staticSearchB ul").preventScroll();
+      adjustHei()
+    })*/
 });

+ 3 - 3
src/js/followUp.js

@@ -36,7 +36,7 @@ function renderPage(data, type) {
     } else {
         renderBtn(operaItemDetail)
         renderDetail(operaItemDetail)
-        checkDom()
+        //checkDom()
     }
 }
 function renderName(data) {
@@ -214,12 +214,12 @@ function followEmpty() {
     $(".followUpWrap").append(str)
 }
 
-$(window).on('resize', function () {
+/*$(window).on('resize', function () {
     if (window.location.href.indexOf('cdssHorizontal') > -1) {
         return
     }
     adjustHeight()
-})
+})*/
 
 module.exports = {
     renderFollowUp,