Browse Source

Merge remote-tracking branch 'origin/TCM0513' into testNew

zhouna 4 years ago
parent
commit
7004490a02
3 changed files with 9 additions and 4 deletions
  1. 4 1
      src/css/cdssHorizontal.less
  2. 3 2
      src/js/cdss.js
  3. 2 1
      src/js/tcmiss.js

+ 4 - 1
src/css/cdssHorizontal.less

@@ -524,7 +524,7 @@
                 width: 60px;
                 position: absolute;
                 left: 502px;
-                bottom: 0;
+              bottom: 6px;
             }
             li {
                 margin-bottom: 6px;
@@ -547,6 +547,9 @@
                   overflow: hidden;
                   text-overflow: ellipsis;
                   white-space: nowrap;
+                  &:nth-child(2) {
+                    width: 442px;
+                  }
                 }
 
             }

+ 3 - 2
src/js/cdss.js

@@ -780,12 +780,13 @@ $(function(){
   // $(".iframeWrap").preventScroll();  
     $(".iframeWrap").preventScroll();
     $(".recommendWrap").preventScroll();
-    $(".TcmWrap").preventScroll();
+    $(".tcmWarp").preventScroll();
     $(".infoWrap").preventScroll();
   $(".medicalKonwledgeWrap .staticSearchB ul").preventScroll();  
   $(window).on("resize", function(){
     $(".iframeWrap").preventScroll();  
-    $(".recommendWrap").preventScroll();  
+    $(".recommendWrap").preventScroll();
+      $(".tcmWarp").preventScroll();
  
     $(".medicalKonwledgeWrap .staticSearchB ul").preventScroll(); 
     adjustHei() 

+ 2 - 1
src/js/tcmiss.js

@@ -47,7 +47,8 @@ function getTcmMr(mrId, config) {
 //获取处方推荐
 function getTcmData(param, config) {
     const item = config.planDetails.filter((it) => it.code === "treatment");
-    const num = (item[0] || {}).number || 3;
+    const isHor = window.location.pathname.indexOf("cdssHorizontal") > -1;
+    const num = isHor ? 3 : ((item[0] || {}).number || 3);
     const {tcmDiag, tcmSyndrome} = param;
     if (!tcmDiag) {     //没有推送入参时不显示推送模块
         $(".recipe").hide();