zhouna 4 лет назад
Родитель
Сommit
f516e8a6c9
2 измененных файлов с 41 добавлено и 30 удалено
  1. 37 27
      src/css/staticInfoOut.less
  2. 4 3
      src/js/staticInfoOut.js

+ 37 - 27
src/css/staticInfoOut.less

@@ -33,6 +33,8 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   .titleH2 {
     font-size: 18px;
     position: relative;
+    height: 18px;
+    line-height: 17px;
     background: #fff;
     padding-right: 6px;
     padding-left: 15px;
@@ -45,6 +47,11 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
     height: 550px;
   }
   .infoBox {
+    .contentWrapper{
+      pre{
+        margin: 0 0 6px;
+      }
+    }
   }
   .infoWrapper {
     padding: 0 0 0 40px;
@@ -72,7 +79,7 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
     height: 100%;
     overflow-y: auto;
     /*padding: 0 60px 0 0;*/
-    width: calc(100% - 250px);
+    width: calc(100% - 195px);
   }
 
   .infos>div {
@@ -126,21 +133,21 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
     }
   }
 .anchors {
-  width: 210px;
+  width: 155px;
   position: absolute;
   right:15px;
   top: 0;
   margin-right: 14px;
   overflow-y: auto;
   background-color: #EDFAFF;
-  padding: 25px 0;
+  padding: 20px 0;
   height: calc(100% - 50px);
   overflow-x: hidden;
 }
 
 .anchors ul {
-  margin-left: 30px;
-  padding: 15px 0px 15px 20px;
+  margin-left: 21px;
+  padding: 15px 0px 15px 10px;
   border-radius: 4px;
   border: 1px solid #EDFAFF;
   /*background-color: #EDFAFF;*/
@@ -152,54 +159,55 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   border-left: 1px solid #8DD1EE;
 }
 .anchors li:first-child {
-  padding-top:30px
+  padding-top:20px
 }
 
 .anchors .anchor-line {
-  height: 30px;
+  height: 20px;
   width: 0;
   border-left: 1px solid #8DD1EE;
 }
 
 .anchors .a-circle{
   border:2px #8DD1EE solid;
-  width: 16px;
-  height: 16px;
+  width: 10px;
+  height: 10px;
   background: #fff;
   border-radius: 16px;
   position: absolute;
-  left: 41px;
+  top: 28px;
+  left: 25px;
   z-index: 1;
 }
 .anchors .a-circle:last-child{
   position: unset;
-  margin-left: 41px;
+  margin-left: 25px;
   margin-top: -16px;
 }
 .anchors i {
   position: absolute;
   display: inline-block;
-  width: 16px;
-  height: 16px;
-  border-radius: 8px;
+  width: 10px;
+  height: 10px;
+  border-radius: 5px;
   border: 1px solid @staticMainColor;
   background-color: @staticMainColor;
-  left: -10px;
-  top: 5px;
+  left: -7px;
+  top: 8px;
   z-index: 1;
 }
 .anchors li:first-child i{
-  top:35px;
+  top:29px;
 }
 .anchors a {
   display: inline-block;
   position: relative;
   top: 4px;
   left: 0;
-  width: 126px;
+  width: 90px;
   padding: 0 0px 0 20px;
   text-decoration: none;
-  font-size: 16px;
+  font-size: 14px;
   font-weight: 400;
   word-wrap: break-word;
 }
@@ -210,14 +218,15 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
 }
 
 .anchors .active i {
-  width: 26px;
-  height: 16px;
+  width: 18px;
+  height: 9px;
   top: 6px;
-  left: -14px;
+  left: -10px;
   border-radius: 0;
   border: none;
   background-color: #F5F6F7;
   background: url('../images/icon_current.svg') center center no-repeat;
+  background-size: cover;
 }
   .disCopy {
     -webkit-touch-callout: none;
@@ -235,16 +244,17 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   .showWhich {
     width: 187px;
     text-align: center;
-    padding: 30px 0 20px;
+    padding: 20px 0 10px;
     position: relative;
     .showWhichSelect {
       display: inline-block;
       color: @staticMainColor;
       background: url("../images/d1.png") 200px 9px #EAFCFF no-repeat;
       font-size: 16px;
-      padding:1px 24px 2px 9px;
+      padding:1px 24px 2px 10px;
       width: 100%;
       cursor: pointer;
+      text-align: left;
     }
     ul {
       display: none;
@@ -273,13 +283,13 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   }
   .titleCont{
     background: #fff;
-    padding-left: 39px;
-    padding-bottom: 20px;
+    padding-left: 35px;
+    /*padding-bottom: 20px;*/
   }
 .titleCont .title{
   font-size: 20px;
   font-weight: bold;
-  margin-right: 23px;
+  margin-right: 33px;
 }
 .tabList{
   display: inline-block;

+ 4 - 3
src/js/staticInfoOut.js

@@ -26,7 +26,7 @@ let showName,noticeName,clinicalPathwayName,showLis=[],selectedDrop=0,selectedTa
 if(window.opener){
     selectedDrop=getUrlArgObject("d")||0;
     selectedTab=getUrlArgObject("t")||0;
-    $("#openWin").hide();
+    $("#openWin,.footer").hide();
 }
 let icond = require('./../images/d.png').replace(/^undefined/g, '')
 function getInfomation() {
@@ -450,13 +450,14 @@ function bindTabClick(){
     const type= getUrlArgObject('type');
     const hospitalId= getUrlArgObject('hospitalId');
     const hisName= getUrlArgObject('hisName');
-    const hisDetailName= getUrlArgObject('hisDetailName');console.log(selectedDrop)
+    const hisDetailName= getUrlArgObject('hisDetailName');
     openNewWin("staticInfoOut.html?hospitalId="+encodeURIComponent(hospitalId)+"&hisName="+encodeURIComponent(hisName)+"&hisDetailName="+encodeURIComponent(hisDetailName||'')+"&type="+encodeURIComponent(type)+"&d="+selectedDrop+"&t="+selectedTab);
   })
 }
 function adjustHeight() {
+  const extHt = window.opener?60:0;
   var ht = window.innerHeight || document.documentElement.clientHeight;
-    $(".content,.content .infos").height(ht - 198 + "px");
+    $(".content,.content .infos").height(ht - 158 + extHt + "px");
   /*$(".anchors").height(ht - 258 + "px");*/
 }
 function adjustWidth() {