zhangxc 6 years ago
parent
commit
b00ecd69cc
8 changed files with 315 additions and 172 deletions
  1. 143 53
      src/css/landscape.css
  2. 9 0
      src/html/index.html
  3. 36 23
      src/html/landscape.html
  4. BIN
      src/images/collapse.png
  5. BIN
      src/images/show.png
  6. BIN
      src/images/warning.png
  7. 122 95
      src/js/landscapeDom.js
  8. 5 1
      src/landscape.js

+ 143 - 53
src/css/landscape.css

@@ -1,29 +1,52 @@
+.bodyWrap {
+  width: 1000px;
+  height: 128px;
+  overflow: hidden;
+  font-size: 13px;
+  padding: 13px 0
+}
 .iframeWrap {
-    margin: 10px auto 50px;
-    padding: 20px;
+    /* margin: 10px auto 50px;
+    padding: 20px; */
     min-width: 340px;
   }
+  .push {
+    width: 60%;
+    float: left;
+  }
+  .treat {
+    width: 35%;
+    float: left;
+  }
   .iframeWrap .conditionHintPub {
-    border: 1px solid #F2F2F2;
-    margin-bottom: 15px;
+    /* border: 1px solid #F2F2F2; */
+    margin-bottom: 8px;
+    height: 20px;
+    line-height: 20px;
+    position: relative;
   }
   .iframeWrap .conditionHintPub li {
-    padding-right: 18px;
+    padding-right: 22px;
     float: left;
-    line-height: 24px;
+    line-height: 20px;
+    position: relative;
+    margin-bottom: 8px;
   }
   .iframeWrap .conditionHintPub .conditionMain {
-    padding: 17px;
+    margin: 0 40px 0 100px;
+    height: 20px;
+    overflow: hidden;
   }
   .iframeWrap .conditionHintPub .alertModal {
     position: relative;
+    float: left;
   }
   .iframeWrap .conditionHintPub .alertModal .mayResult {
     color: #838383;
     position: relative;
   }
   .iframeWrap .conditionHintPub .alertModal .mayResultSelect {
-    line-height: 28px;
+    line-height: 20px;
   }
   .iframeWrap .conditionHintPub .alertModal .mayResultSelect .makesureResult {
     cursor: pointer;
@@ -39,18 +62,33 @@
   }
   .iframeWrap .conditionHintPub .treatPlan {
     font-weight: bold;
-    padding-bottom: 5px;
+    font-size: 13px;
+    color: #7C828E;
+    float: left;
+    width: 85px;
+    text-align: right;
+    margin-right: 10px;
   }
   .iframeWrap .conditionHintPub .treatPlanWrap {
-    padding-bottom: 10px;
-    border-bottom: 1px solid #D1D1D1;
+    height: 20px;
+    overflow: hidden;
+    position: relative;
   }
   .iframeWrap .conditionHintPub .treatMedicine {
-    padding-top: 10px;
+    margin-top: 10px;
+    height: 52px;
+    overflow: hidden;
+    position: relative;
   }
   .iframeWrap .conditionHintPub .treatMedicine .medicinePart {
-    margin: 8px 0;
+    /* margin: 8px 0; */
     position: relative;
+    height: 20px;
+    overflow: hidden;
+    line-height: 20px;
+    margin-bottom: 8px;
+    margin-left: 95px;
+
   }
   .iframeWrap .conditionHintPub .treatMedicine .medicine {
     border-bottom: 1px solid #D1D1D1;
@@ -88,19 +126,25 @@
     color: #D1D1D1;
   }
   .iframeWrap .conditionHintPub p {
-    line-height: 24px;
+    line-height: 20px;
   }
   .iframeWrap .conditionHintPub p span {
     display: inline-block;
   }
+  .iframeWrap .conditionHintRecomDiag h4 {
+    color: #FF545B;
+  }
+  .iframeWrap .conditionHintRecomDiag h4 i {
+    background: url("../images/yszd.png") center center no-repeat;
+  }
   .iframeWrap .conditionHintWz h4 {
-    background-color: #ECF4FC;
+    color: #157FD5;
   }
   .iframeWrap .conditionHintWz h4 i {
     background: url("../images/inquire.png") center center no-repeat;
   }
   .iframeWrap .conditionHintTg h4 {
-    background-color: #ECF4FC;
+    color: #157FD5;
   }
   .iframeWrap .conditionHintTg h4 i {
     background: url("../images/tgjc.png") center center no-repeat;
@@ -128,7 +172,7 @@
   }
   .iframeWrap .conditionHintWarings li {
     float: left;
-    line-height: 24px;
+    line-height: 20px;
   }
   .iframeWrap .conditionHintWarings li:hover {
     color: #267FD7;
@@ -141,19 +185,24 @@
   }
   .iframeWrap .conditionHintKnzd ul li {
     float: left;
-    line-height: 24px;
+    line-height: 20px;
   }
   .iframeWrap .conditionHintKnzd ul li:hover {
     color: #267FD7;
   }
   .iframeWrap .conditionHintZhiliao h4 {
-    background-color: #E3FEFE;
+    color: #1AB3A9;
+    margin-bottom: 8px;
+  }
+  .iframeWrap .conditionHintZhiliao h4 .treatPlan {
+    color: #1AB3A9;
   }
   .iframeWrap .conditionHintZhiliao h4 i {
     background: url("../images/zhiliao.png") center center no-repeat;
   }
   .iframeWrap .conditionHintTips .mayIllness {
     padding-bottom: 5px;
+    float: left;
   }
   .iframeWrap .conditionHintTips .mayIllness span {
     position: relative;
@@ -171,28 +220,32 @@
     border-bottom: 1px solid #D1D1D1;
   }
   .iframeWrap .conditionHintTips h4 {
-    background-color: #FDF4EE;
+    color: #E66225;
   }
   .iframeWrap .conditionHintTips h4 i {
     background: url("../images/tips.png") center center no-repeat;
   }
   .iframeWrap .illnessTable {
     color: #267FD7;
-    line-height: 28px;
+    line-height: 20px;
   }
   .iframeWrap h4 {
     color: #000;
-    height: 40px;
-    line-height: 40px;
-    background-color: #FAEBEC;
-    font-size: 16px;
+    height: 20px;
+    line-height: 20px;
+    /* background-color: #FAEBEC; */
+    font-size: 13px;
     font-weight: bold;
+    display: inline-block;
+    position: absolute;
+    left: 0;
   }
   .iframeWrap h4 i {
     content: '';
-    width: 40px;
-    height: 40px;
+    width: 16px;
+    height: 16px;
     float: left;
+    margin: 2px 8px 0 0;
   }
   .commonTreat,
   .conditionHintKnzdLis,
@@ -200,8 +253,10 @@
   .conditionHintWzLis,
   .conditionHintTgLis,
   .conditionHintInspectLis,
+  .conditionHintRecomDiagLis,
   .conditionHintAssistLis {
-    position: relative;
+    /* position: relative; */
+    background: #fff;
   }
   .conditionHintInspectNull {
     border-bottom: 1px solid #D1D1D1;
@@ -227,9 +282,10 @@
     color: #ADADAD;
   }
   .medicinePartLimitHeight {
-    height: 25px;
+    height:20px;
     overflow: hidden;
     position: relative;
+    margin-bottom: 8px;
   }
   .medicinePartLimitHeightSpec {
     height: 75px;
@@ -239,48 +295,49 @@
   .slideDown {
     background-color: #fff;
     position: absolute;
-    bottom: 0px;
-    right: 0px;
+    top: 0px;
+    right: 12px;
     color: #267FD7;
-    height: 25px;
-    line-height: 25px;
+    height: 20px;
+    line-height: 20px;
     box-shadow: -2px 0px 15px 0px #fff;
     cursor: pointer;
   }
   .slideDown i {
-    width: 10px;
-    height: 7px;
+    width: 16px;
+    height: 16px;
     display: inline-block;
     position: relative;
-    top: -2px;
-    background: url('../images/down.png') center center no-repeat;
+    top: 2px;
+    background: url('../images/show.png') center center no-repeat;
   }
-  .slideup {
+  .slideUp {
     background-color: #fff;
-    position: relative;
-    float: right;
-    bottom: 0px;
-    right: 0px;
+    position: absolute;
+    top: 0x;
+    right: 12px;
     color: #267FD7;
+    height: 20px;
+    line-height: 20px;
+    box-shadow: -2px 0px 15px 0px #fff;
     cursor: pointer;
   }
-  .slideup i {
-    width: 10px;
-    height: 7px;
+  .slideUp i {
+    width: 16px;
+    height: 16px;
     display: inline-block;
     position: relative;
-    top: -2px;
-    background: url('../images/up.png') center center no-repeat;
+    top: 2px;
+    background: url('../images/collapse.png') center center no-repeat;
   }
   .disclaimer {
-    height: 40px;
+    height: 20px;
     width: 100%;
-    line-height: 40px;
+    line-height: 20px;
     text-align: center;
     position: fixed;
     bottom: 0;
     background-color: #ececec;
-    left: 0;
     z-index: 98;
   }
   .disclaimer a {
@@ -290,9 +347,8 @@
     width: 20px;
     height: 20px;
     position: absolute;
-    top: -16px;
-    right: 50%;
-    margin-right: -10px;
+    top: 0px;
+    right: 2px;
     display: none;
     background: url('../images/msg1.png') center center no-repeat;
   }
@@ -302,13 +358,47 @@
   .infoMsgParent {
     position: relative;
   }
+  .warning {
+    background: #FFEDEE;
+    color: #FF545B;
+    border-radius: 10px;
+    height: 20px;
+  }
+  .warningImg {
+    position: relative;
+    top: 2px;
+  }
   .infoMsgParent:hover .infoMsg {
     display: block;
   }
+  .conditionHintRecomDiagLis {
+    background: #fff;
+    z-index: 2
+  }
   .responsibility {
     text-align: center;
     font-size: 12px;
     color: #979797;
     padding-top: 15px;
   }
+  .treat .conditionMain {
+    /* overflow: auto; */
+  }
+  .diseaseName {
+    color: #040428;
+  }
+  .treat h4 {
+    display: block;
+    position: relative;
+  }
+  .treat .conditionHintPub .conditionMain {
+    margin: 0;
+    height: 80px;
+  }
+  .treat .slideDown {
+    right: 0;
+  }
+  .iframeWrap .conditionHintPub .treatMedicine .slideDown {
+    top: 28px;
+  }
   

+ 9 - 0
src/html/index.html

@@ -46,6 +46,15 @@
                 </ul>
             </div>
           </li>
+          <li class="conditionHintPub conditionHintWarings">
+            <h4 href="javascript:void(0);"><i></i>推荐诊断</h4>
+            <div class="conditionMain">
+              <!-- <p class="conditionHintWaringsNull pushEmpty">暂无推荐</p> -->
+              <ul class="clearfix conditionHintWaringsLis">
+                
+              </ul>
+            </div>
+          </li>
           <li class="conditionHintPub conditionHintWarings">
             <h4 href="javascript:void(0);"><i></i>警惕</h4>
             <div class="conditionMain">

+ 36 - 23
src/html/landscape.html

@@ -14,9 +14,18 @@
 <body>
   <div class="bodyWrap">
       <div class="iframeWrap">
-        <ul>
+        <ul class="push">
+            <li class="conditionHintPub conditionHintRecomDiag">
+              <h4 href="javascript:void(0);"><i></i>推荐诊断</h4>
+              <div class="conditionMain">
+                <!-- <p class="conditionHintWaringsNull pushEmpty">暂无推荐</p> -->
+                <ul class="clearfix conditionHintRecomDiagLis">
+                  
+                </ul>
+              </div>
+            </li>
           <li class="conditionHintPub conditionHintWz">
-            <h4 href="javascript:void(0);"><i></i>推荐问诊症状1</h4>
+            <h4 href="javascript:void(0);"><i></i>问诊症状</h4>
             <div class="conditionMain">
               <p class="conditionHintWzNull pushEmpty">暂无推荐</p>
               <ul class="clearfix conditionHintWzLis">
@@ -25,7 +34,7 @@
             </div>
           </li>
           <li class="conditionHintPub conditionHintTg">
-            <h4 href="javascript:void(0);"><i></i>推荐体格检查1</h4>
+            <h4 href="javascript:void(0);"><i></i>体格检查</h4>
             <div class="conditionMain">
                 <p class="conditionHintTgNull pushEmpty">暂无推荐</p>
                 <ul class="clearfix conditionHintTgLis">
@@ -33,7 +42,7 @@
                 </ul>
             </div>
           </li>
-          <li class="conditionHintPub conditionHintInspect">
+          <!-- <li class="conditionHintPub conditionHintInspect">
             <h4 href="javascript:void(0);"><i></i>推荐检验检查项1</h4>
             <div class="conditionMain">
                 <p class="conditionHintInspectNull">化验 <span class="pushEmpty">| 暂无推荐</span></p>
@@ -45,17 +54,18 @@
                   
                 </ul>
             </div>
-          </li>
-          <li class="conditionHintPub conditionHintWarings">
+          </li> -->
+         
+          <!-- <li class="conditionHintPub conditionHintWarings">
             <h4 href="javascript:void(0);"><i></i>警惕</h4>
-            <div class="conditionMain">
+            <div class="conditionMain"> -->
               <!-- <p class="conditionHintWaringsNull pushEmpty">暂无推荐</p> -->
-              <ul class="clearfix conditionHintWaringsLis">
+              <!-- <ul class="clearfix conditionHintWaringsLis">
                 
               </ul>
             </div>
-          </li>
-          <li class="conditionHintPub conditionHintMay">
+          </li> -->
+          <!-- <li class="conditionHintPub conditionHintMay">
             <h4 href="javascript:void(0);"><i></i>疑似诊断</h4>
             <div class="conditionMain">
               <p class="pushEmpty conditionHintMayNull">暂无推荐</p>
@@ -63,32 +73,35 @@
                 
               </ul>
             </div>
-          </li>
-          <li class="conditionHintPub conditionHintKnzd">
+          </li> -->
+          <!-- <li class="conditionHintPub conditionHintKnzd">
             <h4 href="javascript:void(0);"><i></i>可能诊断</h4>
             <div class="conditionMain">
               <ul class="clearfix conditionHintKnzdLis">
                 
               </ul>
             </div>
-          </li>
-          <li class="conditionHintPub conditionHintZhiliao">
-            <h4 href="javascript:void(0);"><i></i>推荐治疗方案<span class="diseaseName"></span></h4>
-            <div class="conditionMain conditionHintZhiliaoAp">
-              <p class="conditionHintZhiliaoNull pushEmpty">暂无推荐</p>
-              <div class="treatMedicine">
-                
-              </div>
-            </div>
-          </li>
+          </li> -->
           <li class="conditionHintPub conditionHintTips">
             <h4 href="javascript:void(0);"><i></i>病情提示</h4>
             <div class="conditionMain conditionHintTipsNull">
               <span class="pushEmpty">暂无推荐</span>
             </div>
           </li>
+          
+        </ul>
+        <ul class="treat">
+            <li class="conditionHintPub conditionHintZhiliao">
+                <h4 href="javascript:void(0);"><p class="treatPlan"><i></i>治疗方案</p><span class="diseaseName"></span></h4>
+                <div class="conditionMain conditionHintZhiliaoAp">
+                  <p class="conditionHintZhiliaoNull pushEmpty">暂无推荐</p>
+                  <div class="treatMedicine">
+                    
+                  </div>
+                </div>
+              </li>
         </ul>
-        <p class="responsibility">以上推送为常见诊断及问诊内容,实际以医生临床判断为准</p>
+        <!-- <p class="responsibility">以上推送为常见诊断及问诊内容,实际以医生临床判断为准</p> -->
       </div>
       <div class="disclaimer"><a href="disclaimer.html" target="_blank">免责声明</a></div>
   </div>

BIN
src/images/collapse.png


BIN
src/images/show.png


BIN
src/images/warning.png


+ 122 - 95
src/js/landscapeDom.js

@@ -10,98 +10,98 @@ function bqtsFun(data){//病情提示
       if(tmpBqDetail.type == 1){
         tmpBqDetailStr+="<a target='_blank' href='scale.html?featureType=21&sex="+msg.sex+"&lis="+JSON.stringify(msg.lis)+"&diag="+msg.diag+"&scaleName="+tmpBqDetail.content.name+"&symptom="+msg.symptom+"&other="+msg.other+"&pacs="+msg.pacs+"&vital="+msg.vital+"&age="+msg.age+"&scaleId="+tmpBqDetail.content.id+"' class='illnessTable'>"+tmpBqDetail.content.name+"</a>"
       }
-      if(tmpBqDetail.type == 2){
-        var deepDetailName = '<div class="modalTitle">'+tmpBqDetail.content.name+'<i class="closeModal"></i></div>'
-        var deepDetailStr = ''
-        var deepDetailResultStr = ''
-        for(var n = 0;n < tmpBqDetail.content.details.length;n++){
-          var deepDetail = tmpBqDetail.content.details[n]
-          if(deepDetail.controlType == 2){//0-radio,1-checkbox,2-text,3-dropdownlist
-            deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">请输入'+deepDetail.name+': </span><input type="text" placeholder="请输入" value="'+deepDetail.value+'"><i class="uint">'+deepDetail.uint+'</i></li>'
-          }
-          if(deepDetail.controlType == 0){
-            let tooDeepDetailStr = ''
-            for(var f = 0;f<deepDetail.details.length;f++){
-              var tooDeepDetail = deepDetail.details[f]
-              if(deepDetail.name == '性别'){
-                tooDeepDetailStr+='<li class="radioChecks '+(tooDeepDetail.state == 1?"radioCheckSec":"")+'" data-select="'+(tooDeepDetail.state == 1?"select":"")+'"><i></i><span>'+tooDeepDetail.detailName+'</span></li>'
-              }else{
-                tooDeepDetailStr+='<li class="radioChecks"><i></i><span>'+tooDeepDetail.detailName+'</span>'+(tooDeepDetail.state == 1?"<a>(智能推荐)</a>":"")+'</li>'
-              }
-            }
-            deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">'+deepDetail.name+': </span>'+
-              '<ul class="clearfix caculateLis">'+
-              tooDeepDetailStr+
-              '</ul>'+
-              '</li>'
-          }
-        }
-        for(var v = 0;v < tmpBqDetail.content.result.length;v++){
-          deepDetailResultStr+='<p class="result"><span class="calculateName">'+tmpBqDetail.content.result[v].name+':</span><span class="calculateResult"></span></p>'
-        }
-        tmpBqDetailStr+='<div class="mayResult">计算公式结果:<span class="mayResultSelect" data-num="'+k+'">'+
-        '<span class="makesureResult">请选择</span>'+
-        '<span class="sanjiao"></span>'+
-        '<div class="popupModal">'+
-        deepDetailName+
-        '<div class="modalMainTwo">'+
-        '<ul class="clearfix">'+
-        deepDetailStr+
-        '</ul>'+
-        '<div class="calculate" data-num="'+k+'">计算</div>'+
-        '<p class="calculateError">请填写计算公式内容</p><div class="resultLis">'+
-        deepDetailResultStr+
-        '</div></div>'+
-        '<div class="btnWrap clearfix">'+
-        '<div class="sureScore" data-type="2">关闭</div>'+
-        '</div>'+
-        '</div>'+
-        '</span></div>'
-      }
-      if(tmpBqDetail.type == 3){
-        var deepDetailName = '<span class="modalMaintltle">'+tmpBqDetail.content.name+': </span>'
-        var deepDetailStr = ''
-        for(var n = 0;n < tmpBqDetail.content.details.length;n++){
-          var deepDetail = tmpBqDetail.content.details[n]
-          deepDetailStr+='<li class="radioChecks"><i></i><span>'+deepDetail.detailName+'</span>'+(deepDetail.state == 1?"<a>(智能推荐)</a>":"")+'</li>'
-        }
-        tmpBqDetailStr+='<div class="mayResult">可能结果:<span class="mayResultSelect" data-num="'+k+'"><span class="makesureResult">请选择</span><i class="sanjiao"></i>'+
-          '<div class="popupModal">'+
-          '<div class="modalTitle">结果选择<i class="closeModal"></i></div>'+
-          '<div class="modalMainOne">'+
-          deepDetailName+
-          '<ul class="clearfix">'+
-          deepDetailStr+
-          '</ul>'+
-          '</div>'+
-          '<div class="btnWrap clearfix">'+
-          '<div class="sureScore" data-type="3" data-num="'+k+'">确定</div>'+
-          '</div>'+
-          '</div>'+
-          '</span></div>'
-      }
+      // if(tmpBqDetail.type == 2){
+      //   var deepDetailName = '<div class="modalTitle">'+tmpBqDetail.content.name+'<i class="closeModal"></i></div>'
+      //   var deepDetailStr = ''
+      //   var deepDetailResultStr = ''
+      //   for(var n = 0;n < tmpBqDetail.content.details.length;n++){
+      //     var deepDetail = tmpBqDetail.content.details[n]
+      //     if(deepDetail.controlType == 2){//0-radio,1-checkbox,2-text,3-dropdownlist
+      //       deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">请输入'+deepDetail.name+': </span><input type="text" placeholder="请输入" value="'+deepDetail.value+'"><i class="uint">'+deepDetail.uint+'</i></li>'
+      //     }
+      //     if(deepDetail.controlType == 0){
+      //       let tooDeepDetailStr = ''
+      //       for(var f = 0;f<deepDetail.details.length;f++){
+      //         var tooDeepDetail = deepDetail.details[f]
+      //         if(deepDetail.name == '性别'){
+      //           tooDeepDetailStr+='<li class="radioChecks '+(tooDeepDetail.state == 1?"radioCheckSec":"")+'" data-select="'+(tooDeepDetail.state == 1?"select":"")+'"><i></i><span>'+tooDeepDetail.detailName+'</span></li>'
+      //         }else{
+      //           tooDeepDetailStr+='<li class="radioChecks"><i></i><span>'+tooDeepDetail.detailName+'</span>'+(tooDeepDetail.state == 1?"<a>(智能推荐)</a>":"")+'</li>'
+      //         }
+      //       }
+      //       deepDetailStr+='<li class="radioCheck"><span class="modalMaintltle">'+deepDetail.name+': </span>'+
+      //         '<ul class="clearfix caculateLis">'+
+      //         tooDeepDetailStr+
+      //         '</ul>'+
+      //         '</li>'
+      //     }
+      //   }
+      //   for(var v = 0;v < tmpBqDetail.content.result.length;v++){
+      //     deepDetailResultStr+='<p class="result"><span class="calculateName">'+tmpBqDetail.content.result[v].name+':</span><span class="calculateResult"></span></p>'
+      //   }
+      //   tmpBqDetailStr+='<div class="mayResult">计算公式结果:<span class="mayResultSelect" data-num="'+k+'">'+
+      //   '<span class="makesureResult">请选择</span>'+
+      //   '<span class="sanjiao"></span>'+
+      //   '<div class="popupModal">'+
+      //   deepDetailName+
+      //   '<div class="modalMainTwo">'+
+      //   '<ul class="clearfix">'+
+      //   deepDetailStr+
+      //   '</ul>'+
+      //   '<div class="calculate" data-num="'+k+'">计算</div>'+
+      //   '<p class="calculateError">请填写计算公式内容</p><div class="resultLis">'+
+      //   deepDetailResultStr+
+      //   '</div></div>'+
+      //   '<div class="btnWrap clearfix">'+
+      //   '<div class="sureScore" data-type="2">关闭</div>'+
+      //   '</div>'+
+      //   '</div>'+
+      //   '</span></div>'
+      // }
+      // if(tmpBqDetail.type == 3){
+      //   var deepDetailName = '<span class="modalMaintltle">'+tmpBqDetail.content.name+': </span>'
+      //   var deepDetailStr = ''
+      //   for(var n = 0;n < tmpBqDetail.content.details.length;n++){
+      //     var deepDetail = tmpBqDetail.content.details[n]
+      //     deepDetailStr+='<li class="radioChecks"><i></i><span>'+deepDetail.detailName+'</span>'+(deepDetail.state == 1?"<a>(智能推荐)</a>":"")+'</li>'
+      //   }
+      //   tmpBqDetailStr+='<div class="mayResult">可能结果:<span class="mayResultSelect" data-num="'+k+'"><span class="makesureResult">请选择</span><i class="sanjiao"></i>'+
+      //     '<div class="popupModal">'+
+      //     '<div class="modalTitle">结果选择<i class="closeModal"></i></div>'+
+      //     '<div class="modalMainOne">'+
+      //     deepDetailName+
+      //     '<ul class="clearfix">'+
+      //     deepDetailStr+
+      //     '</ul>'+
+      //     '</div>'+
+      //     '<div class="btnWrap clearfix">'+
+      //     '<div class="sureScore" data-type="3" data-num="'+k+'">确定</div>'+
+      //     '</div>'+
+      //     '</div>'+
+      //     '</span></div>'
+      // }
     }
     if(tmpBqStr != '' || tmpBqDetailStr != ''){
       $(".conditionHintTipsNull").css("display","none")
     }
-    $(".conditionHintTips").append('<div class="conditionMain clearfix">'+tmpBqStr+'<div class="alertModal">'+tmpBqDetailStr+'</div></div>')
+    $(".conditionHintTips").append('<div class="conditionMain clearfix">'+tmpBqStr+'<div class="alertModal">'+tmpBqDetailStr+'</div></div><span class="slideDown">更多 </span>')
+  
+    
   }
 }
 function ybzlFun(data){//一般治疗
-  $(".conditionHintZhiliaoAp").prepend('<div class="treatPlanWrap"><p class="treatPlan">一般治疗</p><p class="commonTreat clearfix">'+data+'</p></div>')
-  $(".diseaseName").html(' ('+msg.diag+')')
+  $(".conditionHintZhiliaoAp").prepend('<div class="treatPlanWrap"><p class="treatPlan">一般治疗: </p><p class="commonTreat clearfix">'+data+'</p></div>')
+  $(".diseaseName").html(msg.diag)
   var commonTreatHeight = $(".commonTreat").height()
   if(commonTreatHeight > 75){
-    $(".commonTreat").addClass('medicinePartLimitHeightSpec').append('<span class="slideDown">更多 <i></i></span>')
+    $(".commonTreat").addClass('medicinePartLimitHeightSpec').append('<span class="slideDown">更多 </span>')
   }
   $(".treatPlanWrap").on('click',".slideDown",function(){
-    $(this).parents(".commonTreat").removeClass("medicinePartLimitHeightSpec").append('<span class="slideup">收起 <i></i></span>')
-    $(this).remove()
-  })
-  $(".treatPlanWrap").on('click',".slideup",function(){
-    $(this).parents(".commonTreat").addClass("medicinePartLimitHeightSpec").append('<span class="slideDown">更多 <i></i></span>')
-    $(this).remove()
+    //点击更多跳转新页面
+    // $(this).parents(".commonTreat").removeClass("medicinePartLimitHeightSpec").append('<span class="slideup">收起 <i></i></span>')
+    // $(this).remove()
   })
+  
 }
 function cyywFun(data){//常用药物
   for(var i = 0;i < data.length;i++){
@@ -114,21 +114,22 @@ function cyywFun(data){//常用药物
     }
     $(".treatMedicine").append('<p class="medicinePart clearfix">'+str+strPart+'</p>')
   }
-  $(".treatMedicine").prepend('<p class="treatPlan">常用药物治疗</p>')
+  $(".treatMedicine").prepend('<p class="treatPlan">药物治疗:</p>')
   var treatList = $(".treatMedicine").find(".medicinePart")
   for(var h = 0;h < treatList.length;h++){ 
     if($(treatList[h]).height() > 25){
-      $(treatList[h]).addClass('medicinePartLimitHeight').append('<span class="slideDown">更多 <i></i></span>')
+      // $(treatList[h]).addClass('medicinePartLimitHeight').append('<span class="slideDown">更多 </span>')
     }
     $(".treatMedicine").on('click',".slideDown",function(){
-      $(this).parents(".medicinePart").removeClass("medicinePartLimitHeight").append('<span class="slideup">收起 <i></i></span>')
-      $(this).remove()
-    })
-    $(".treatMedicine").on('click',".slideup",function(){
-      $(this).parents(".medicinePart").addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
-      $(this).remove()
+      // $(this).parents(".medicinePart").removeClass("medicinePartLimitHeight").append('<span class="slideup">收起 <i></i></span>')
+      // $(this).remove()
     })
+    // $(".treatMedicine").on('click',".slideup",function(){
+    //   $(this).parents(".medicinePart").addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
+    //   $(this).remove()
+    // })
   }
+  $(".treatMedicine").append('<span class="slideDown">更多 </span>')
 }
 function knzdFun(data){//可能诊断
   var tmpStr = ''
@@ -156,8 +157,27 @@ function jtFun(data){
   $(".conditionHintWaringsLis").append(tmpStr)
   slideToggle($(".conditionHintWaringsLis"))  
 }
+function tjzdFun(data, type) {
+    var tmpStr = ''
+    for(var i = 0;i < data.length;i++){
+        $(".conditionHintMay").css("display","block")
+        if(type == 'warning') {
+            tmpStr+= `<li class="infoMsgParent warning">
+                <img src="${require("../images/warning.png")}" class="warningImg">
+                ${data[i].name}
+                <a target = "_blakn" title="点击名称可看详细说明" class="infoMsg" href = "information.html?type=7&position=2&name=${data[i].name}"></a>
+            </li>`
+        } else {
+            tmpStr+= `<li class="infoMsgParent">
+                ${data[i].name}
+                <a target = "_blakn" title="点击名称可看详细说明" class="infoMsg" href = "information.html?type=7&position=2&name=${data[i].name}"></a>
+            </li>`
+        }
+    }
+    $(".conditionHintRecomDiagLis").append(tmpStr)
+    
+}
 function yszdFun(data){
- console.log('data', data)
   var tmpStr = ''
   for(var i = 0;i < data.length;i++){
     $(".conditionHintMay").css("display","block")
@@ -207,15 +227,20 @@ function tjfjFun(data){
   slideToggle($(".conditionHintAssistLis"))
 }
 function slideToggle(domName){//展开收起
-  if(domName.height() > 25){
-    domName.addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
+  if(domName.height() > 20){  //展开按钮
+    domName.append('<span class="slideDown"><i></i></span>')
   }
   domName.on('click',".slideDown",function(){
-    domName.removeClass("medicinePartLimitHeight").append('<span class="slideup">收起 <i></i></span>')
+    domName.parent().css({"height": "56px", "overflow": "auto"});
+    domName.parent().parent().css({"zIndex": "2"});
+    domName.append('<span class="slideUp"><i></i></span>')
     $(this).remove()
   })
-  domName.on('click',".slideup",function(){
-    domName.addClass("medicinePartLimitHeight").append('<span class="slideDown">更多 <i></i></span>')
+  
+  domName.on('click',".slideUp",function(){
+    domName.parent().css({"height": "20px", "overflow": "hidden"});
+    domName.parent().parent().css({"zIndex": "1"});
+    domName.append('<span class="slideDown"><i></i></span>')
     $(this).remove()
   })
 }
@@ -229,5 +254,7 @@ module.exports = {
   tjtgFun,
   tjhyFun,
   tjfjFun,
-  yszdFun
+  yszdFun,
+  tjzdFun,
+  slideToggle
 }

+ 5 - 1
src/landscape.js

@@ -5,7 +5,7 @@ require('./js/popup');
 const $ = require("jquery");
 const { post,config,getUrlArgObject } = require('./js/promise.js');
 
-const {bqtsFun,ybzlFun,cyywFun,knzdFun,jtFun,tjwzFun,tjtgFun,tjhyFun,tjfjFun,yszdFun} = require('./js/landscapeDom.js');
+const {bqtsFun,ybzlFun,cyywFun,knzdFun,jtFun,tjwzFun,tjtgFun,tjhyFun,tjfjFun,yszdFun, tjzdFun, slideToggle} = require('./js/landscapeDom.js');
 //   symptom: "恶心呕吐腰痛", //胸痛,背痛,恶心,呕吐     //恶心呕吐腰痛   //牙周袋形成
 
 var msg = {
@@ -36,9 +36,13 @@ post(config.pushInner,Object.assign({featureType: '1,4,5,6,7,22'},msg)).then((re
       var proB = result.dis['可能诊断'] || []//可能
       var proY = result.dis['确诊'] || []//确诊
       var proWaring = result.dis['警惕'] || []
+      tjzdFun(proWaring, 'warning')
+      tjzdFun(proY)
+      tjzdFun(proB)
       yszdFun(proY)//疑似
       knzdFun(proB)//可能
       jtFun(proWaring)//警惕
+      slideToggle($(".conditionHintRecomDiagLis")) 
       if(proY.length == 0){
         $(".conditionHintMay").css("display","none")
       }else{