Browse Source

Merge branch 'dev_zxc' into test

zhangxc 5 years atrás
parent
commit
c4a6235e78
4 changed files with 18 additions and 3 deletions
  1. 6 1
      src/css/index.less
  2. 4 2
      src/html/qcScore.html
  3. BIN
      src/images/icon_up.png
  4. 8 0
      src/js/index.js

+ 6 - 1
src/css/index.less

@@ -93,7 +93,7 @@
   .slide-up{
     color: @activeColor;
   }
-  .list-1{
+  .list-1,.list-1-show{
     position: relative;
     &:after{
       content: " ";
@@ -122,6 +122,11 @@
       }
     }
   }
+  .list-1-show{
+    &:after{
+      background: url("../images/icon_up.png") no-repeat;
+    }
+  }
   .page:hover {
     color: @activeColor;
   }

+ 4 - 2
src/html/qcScore.html

@@ -178,7 +178,7 @@
                             </p>
                             <p class="lineBlock">
                                 <span class="lineTitle">讨论方式:</span>
-                                <span>${val['术前诊断']}</span>
+                                <span>${val['讨论方式']}</span>
                             </p>
                             <p class="lineBlock">
                                 <span class="lineTitle">参加人员(姓名+职称):</span>
@@ -196,6 +196,8 @@
                                 </p>
                                 <p class="lineBlock">
                                     <span class="lineTitle">体格检查:</span>
+                                    <span>体温 ${val['体温(耳)']}℃,脉搏 ${val['脉搏']}次/分,呼吸 ${val['呼吸']}次/分,血压${val['血压']}mmHg,</span>
+                                    
                                     <span>${val['专科检查']}</span>
                                 </p>
                                 <p class="lineBlock">
@@ -207,7 +209,7 @@
                             <div class="contentDetail">
                                 <p class="lineBlock">
                                     <span class="lineTitle">1.术前诊断:</span>
-                                    <span>${val['主诉']}</span>
+                                    <span>${val['术前诊断']}</span>
                                 </p>
                                 <p class="lineBlock">
                                     <span class="lineTitle">2.手术指征与禁忌征:</span>

BIN
src/images/icon_up.png


+ 8 - 0
src/js/index.js

@@ -35,7 +35,15 @@ function initMenu(data,userInfo){
   $(".list-1").on("click",function(){
     // $(".list-1 .slide-up").removeClass('slide-up');
     // $(this).toggleClass('slide-up');
+    const ulShow =  $(this).find("ul").css("display")
+    if(ulShow == "none"){
+      $(this).removeClass("list-1-show")
+      $(this).addClass("list-1-show")
+    }else{
+      $(this).removeClass("list-1-show")
+    }
     $(this).find("ul").slideToggle();
+    
   });
   $(".list-1 li").on("click",function(e){
     e.stopPropagation();