竖版对接

src/css/cdss.less

@@ -319,7 +319,7 @@ body{
 }
 .tabList{
     line-height: 39px;
-    margin-bottom: 4px;
+  margin-bottom: 8px;
     padding: 0 20px 0 20px;
     box-sizing: border-box;
 }
@@ -461,7 +461,7 @@ body{
 .tcm-item {
   margin: 0 15px 10px;
   border: 1px #EEF5FD solid;
-  border-radius: 8px 8px 0px 0px;
+  border-radius: 8px;
   .title {
     background: #EEF5FD;
     height: 30px;
@@ -476,7 +476,7 @@ body{
     .h2 {
       font-weight: bold;
       font-size: 16px;
-      color: #1E1E1E;
+      color: #333;
     }
     .go {
       float: right;
@@ -492,7 +492,61 @@ body{
       }
     }
   }
-  .content {
+  .infos {
+    padding-top: 10px;
+    li {
+      margin-bottom: 5px;
+      padding-left: 18px;
+      .label {
+        display: inline-block;
+        width: 98px;
+        margin-right: 15px;
+        font-size: 14px;
+        color: #333;
+      }
+      .val {
+        color: #666;
+      }
+    }
+  }
+  .detail {
+    margin: 0 10px;
+    border-top: 1px #E6E6E6 solid;
+    padding-top: 5px;
+    max-height: 134px;
+    overflow-y: hidden;
+    .go-push {
+      width: 60px;
+      position: absolute;
+      left: 502px;
+      bottom: 0;
+    }
+    li {
+      margin: 0 0 6px 10px;
+    }
+    .label {
+      float: left;
+      border-left: 2px solid #267FD7;
+      padding-left: 5px;
+      line-height: 12px;
+      margin-top: 4px;
+    }
+    .val {
+      margin-left: 65px;
+      .name {
+        color: #333;
+      }
+      .desc {
+        color: #666;
+        overflow-x: hidden;
+        white-space: nowrap;
+        width: 100%;
+        text-overflow: ellipsis;
+      }
+
+    }
+  }
+  &.knowledge .content {
     padding: 8px 10px 12px;
     li {
       display: inline-block;

src/css/cdssHorizontal.less

@@ -478,15 +478,17 @@
                 vertical-align: inherit;
             }
         }
-        .go-btn {
-            display: inline-block;
-            width: 80px;
-            height: 25px;
-            line-height: 25px;
-            border-radius: 4px;
-            text-align: center;
-            background: #DEF1FB;
-        }
+    }
+    .go-btn, .go-push {
+        display: inline-block;
+        width: 80px;
+        height: 25px;
+        line-height: 25px;
+        border-radius: 4px;
+        text-align: center;
+        background: #DEF1FB;
+        text-decoration: none;
+        color: #409ED1;
     }
     .content {
         .infos {
@@ -501,22 +503,40 @@
                 margin-right: 40px;
             }
         }
+        .infos {
+            height: 24px;
+        }
         .detail {
-            background: #DEF1FB;
-            border-radius: 4px;
-            padding: 10px 8px;
-            margin-top: 10px;
+            padding: 0 8px 8px 4px;
             margin-right: 20px;
+            max-height: 118px;
+            overflow-y: hidden;
+            position: relative;
+            .go-push {
+                width: 60px;
+                position: absolute;
+                left: 502px;
+                bottom: 0;
+            }
+            li {
+                margin-bottom: 6px;
+            }
             .label {
-                display: inline-block;
+                float: left;
                 border-left: 2px solid #267FD7;
                 padding-left: 5px;
-                line-height: 14px;
+                line-height: 12px;
+                margin-top: 4px;
             }
             .val {
-                p {
-                    text-indent: 7px;
+                margin-left: 65px;
+                .name {
+                    color: #333;
                 }
+                .desc {
+                    color: #666;
+                }
+
             }
         }
         .a-link {

src/html/cdss.html

@@ -95,7 +95,25 @@
                         <a class="go" href="">更多 <img class="icon" src="./images/g1.png" alt=""></a>
                     </p>
                     <div class="content">
+                        <ul class="infos clearfix">
+                            <li>
+                                <span class="label">中医诊断病症：</span>
+                                <span class="val" id="jibing"></span>
+                            </li>
+                            <li>
+                                <span class="label">中医病名：</span>
+                                <span class="val" id="bingming"></span>
+                            </li>
+                            <li>
+                                <span class="label">中医症候：</span>
+                                <span class="val" id="zhenghou"></span>
+                            </li>
+                        </ul>
+                        <div class="detail">
+                            <ul>
 
+                            </ul>
+                        </div>
                     </div>
                 </div>
                 <div class="knowledge tcm-item">

src/html/cdssHorizontal.html

@@ -53,7 +53,7 @@
             <p class="title">
               <img class="icon" src="./images/t1.png" alt="">
               <span class="h2">病症推导：</span>
-              <a class="go go-btn" href="">去推导 <img class="icon" src="./images/go.png" alt=""></a>
+              <a class="go go-btn" id="goPush" href="">去推导 <img class="icon" src="./images/go.png" alt=""></a>
             </p>
           </div>
           <div class="recipe tcm-item clearfix">
@@ -76,20 +76,14 @@
                   <span class="val" id="zhenghou"></span>
                 </li>
               </ul>
-              <div class="idea">
+              <!--<div class="idea">
                 <span class="label">治法：</span>
-                <p class="zhifa" id="zhifa"><span class="val">--</span></p>
+                <p class="zhifa" id="zhifa"><span class="val">&#45;&#45;</span></p>
                 <a class="go go-text" href="">展开 <img src="../images/dn.png" alt=""></a>
-              </div>
+              </div>-->
               <div class="detail">
                 <ul>
-                  <li>
-                    <div class="label"></div>
-                    <div class="val">
-                      <p class="name">--</p>
-                      <p class="desc">----------------</p>
-                    </div>
-                  </li>
+
                 </ul>
               </div>
             </div>

src/js/cdss.js

@@ -23,7 +23,6 @@ require('./../images/t2.png').replace(/^undefined/g, '')
 require('./../images/t3.png').replace(/^undefined/g, '')
 require('./../images/go.png').replace(/^undefined/g, '')
 require('./../images/g1.png').replace(/^undefined/g, '')
-
 // require('./popupEdit.js');
 
 let infoImg = require('./../images/icon_info.png').replace(/^undefined/g, '')
@@ -214,7 +213,8 @@ function renderPage(pageSet){
   const hasAuxiliary = hasTab("辅助信息",pageSet.sysSetInfo)
   const hasMedical = hasTab("医学知识",pageSet.sysSetInfo)
   const hasFollowUp = hasTab("随访计划",pageSet.sysSetInfo)
-    const hasTcm = hasTab("中医辅助", pageSet.sysSetInfo)
+    const hasTcm = hasTab("中医辅助", pageSet.sysSetInfo);
+    console.log(hasTcm)
   if(!mrId){
     empty()
     return
@@ -776,9 +776,10 @@ $(function(){
     }  
   });  
   // $(".iframeWrap").preventScroll();  
-  $(".iframeWrap").preventScroll();  
-  $(".recommendWrap").preventScroll();  
-  $(".infoWrap").preventScroll();  
+    $(".iframeWrap").preventScroll();
+    $(".recommendWrap").preventScroll();
+    $(".TcmWrap").preventScroll();
+    $(".infoWrap").preventScroll();
   $(".medicalKonwledgeWrap .staticSearchB ul").preventScroll();  
   $(window).on("resize", function(){
     $(".iframeWrap").preventScroll();  

src/js/cdssHorizontal.js

@@ -27,7 +27,7 @@ let collapseImg = require('./../images/collapse2.png').replace(/^undefined/g, ''
 let treatDisName,treatUniqueName
 let generalTreatInfo
 const { renderFollowUp } = require('./followUp.js');
-const {getTcmData} = require('./tcmiss.js');
+require('./tcmiss.js');
 
 setWidth()
 let moduleConfig={

src/js/tcmiss.js

@@ -8,14 +8,16 @@ $(function () {
         const code = $(this).attr("code");
         openNewWin(targetUrl + '?page=' + code);
     })
-    $("#goPush").click(function () {
+    $("#goPush").on("click", function () {
         openNewWin(targetUrl + '?page=bztd');
     });
+
 });
 
 //获取参数
 function getTcmData(param) {
-    $('#jibing').text(param.tcmDiag);
+    $("#jibing").text(param.tcmDiag + "-" + param.tcmSyndrome);
+    $('#bingming').text(param.tcmDiag);
     $('#zhenghou').text(param.tcmSyndrome);
     post('/lantone/private/zycftj?jibing=' + param.tcmDiag + "&zhengxing=" + param.tcmSyndrome).then((res) => {
         console.log(res)
@@ -31,15 +33,22 @@ function getTcmData(param) {
 
 function renderTcm(data) {
     let str = ``;
-    $('#bingming').text(data.name);
     data.map((it, i) => {
-        if (i === 0) {
-            str += `<span class="val active">${it.name}</span>`;
-        } else {
-            str += `<span class="val">${it.name}</span>`;
-        }
+        str += `<li class="clearfix"><div class="label">处方${i + 1}：</div>
+                    <div class="val">
+                    <p class="name">${it.name}</p>
+                    <p class="desc">${it.matStr}</p>
+                </div></li>`;
+
     })
-    $('#zhifa').html(str);
+    if (data.length > 3) {
+        str += `<a class="go go-push" id="goTreat" href="">更多 <img class="icon" src="./images/go.png" alt=""></a>`;
+    }
+    $('.detail ul').html(str);
+
+    $("#goTreat").on('click', function () {
+        openNewWin(targetUrl + '?page=fjcx');
+    });
 }
 
 module.exports = {