Sfoglia il codice sorgente

Merge branch 'nursePush220401' into testNew

1178232204@qq.com 3 anni fa
parent
commit
7770726a17
2 ha cambiato i file con 14 aggiunte e 8 eliminazioni
  1. 9 3
      src/css/cdss.less
  2. 5 5
      src/js/cdssHorizontal.js

+ 9 - 3
src/css/cdss.less

@@ -831,7 +831,7 @@ body {
   }
 }
 .nurseIitle {
-  border-bottom: 1px solid #d9d9d9;
+  border-bottom: 1px dashed #d9d9d9;
   padding-bottom: 10px;
   .title {
     padding-left: 5px;
@@ -845,9 +845,15 @@ body {
     top: 6.5px;
   }
 }
-.nurseIitle:last-child {
-  border-bottom: none;
+.nurse{
+  .shortBox:last-child {
+    .nurseIitle{
+      border-bottom: none;
+    }
+    
+  }
 }
+
 .shortBox {
   overflow: hidden;
 }

+ 5 - 5
src/js/cdssHorizontal.js

@@ -454,7 +454,7 @@ function renderpushByMayDisease(name, i, inx,e) {
         renderMayDisPush(disPush, inx)
         renderMayPush(treatPush, medicinesPush, operationsPush, nursePush, inx)
         bindOpenInfo()
-        moreInfo()
+        // moreInfo()
         // bindSlide();
         if ($(".maydiagnose .item").children('div').length == 0) {
           $.toast('toast3', '', 3000, '.maydiagnose', i);
@@ -506,7 +506,7 @@ function renderpushByHasDisease(name, i, inx,e) {
         renderHasDisPush(disPush, inx)
         renderHasPush(treatPush, medicinesPush, operationsPush, nursePush, inx)
         bindOpenInfo()
-        moreInfo()
+        // moreInfo()
         // bindSlide();
         if ($(".hasdiagnose .item").children('div').length == 0) {
           $.toast('toast3', '', 3000, '.hasdiagnose', i);
@@ -576,6 +576,7 @@ function renderDiagList(list) {
     } else {
       $(".maydiagnose .item").css("display", "none")
     }
+    // $(".leftWrapper").scrollTop($(this).offset().top);
   });
 }
 function renderAffListList(list) {
@@ -612,7 +613,7 @@ function renderAffListList(list) {
     const index = $(this).parent().parent().next().attr('data-i')
     const showList = $(".hasdiagnose .item").css("display")
     if (showList == "none" || index != i) {
-      $(".loading").show();
+      // $(".loading").show();
       $(".hasdiagnose .item").html('')
       $(".hasdiagnose .item").css("display", "none")
       $(this).parent().parent().next().css("display", "block")
@@ -621,6 +622,7 @@ function renderAffListList(list) {
     } else {
       $(".hasdiagnose .item").css("display", "none")
     }
+    // $('.leftWrapper').scrollTop($(this).offset().top);
   });
 }
 function renderMayVitalPush(list, inx) {
@@ -1368,9 +1370,7 @@ function bindOpenInfo() {
 
 
 function titleStr(type) {
-  console.log(type);
   let titleStr = ''
-  console.log(titleConfigH[type].icon);
   titleStr += `<div class="moduleTitle"><img class="titleIcon" src=${titleConfigH[type].icon}>${titleConfigH[type].name}:</div>`
   return titleStr
 }