Browse Source

Merge remote-tracking branch 'origin/scale0414' into testNew

zhouna 4 năm trước cách đây
mục cha
commit
c0090b9255

+ 1 - 1
src/css/searchStaticList.less

@@ -5,7 +5,7 @@
   width: 100%;
   height: 100%;
   min-width: 900px;
-  padding: 60px 20px;
+  padding: 60px 20px 20px;
   box-sizing: border-box;
   background-color: #DDE2E4;
   overflow: auto;

+ 8 - 8
src/css/staticInfo.less

@@ -110,15 +110,15 @@
   }
 
   .container {
-    width:100%;
+    /*width:100%;*/
     overflow: hidden;
     background: #fff;
-    margin: 0 auto;
-    padding: 8px 0 0px 0px;
+    margin: 0 20px;
+    /*padding: 8px 0 0px 0px;
+    left: 0;
+    right: 0;*/
     display: none;
     position: relative;
-    left: 0;
-    right: 0;
   }
 
   pre {
@@ -241,7 +241,7 @@
     background: #fff;
     height: 58px;
     padding: 0 38px;
-    margin-top:60px;
+    margin: 60px 20px 0;
   }
 .tabBox .title{
   font-size: 20px;
@@ -294,10 +294,10 @@
 }
 .btmFix {
   height: 20px;
-  width: 100%;
+  width: calc(100% - 40px);
   position: fixed;
   bottom: 0;
-  left: 0;
+  left: 20px;
   z-index: 20;
   background-color: #fff;
 }

+ 6 - 2
src/css/staticInfoOut.less

@@ -13,6 +13,7 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   }
 
   body {
+    min-width: 650px;
     font-size: 14px;
     overflow-y: hidden;
     font-family: '微软雅黑', '宋体';
@@ -302,7 +303,7 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
 }
 .empty{
   text-align: center;
-  margin-top: 32vh;
+  padding-top: 32vh;
   img{
     width: 140px;
     height: 75px;
@@ -328,10 +329,13 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   width: 100%;
   height: 100px;
   background: #172238;
-  padding-top: 35px;
+  padding-top: 25px;
+  position: absolute;
+  bottom: 0;
   p{
     color:#fff;
     text-align: center;
     font-size: 12px;
+    white-space: nowrap;
   }
 }

+ 1 - 1
src/html/searchStaticList.html

@@ -17,7 +17,7 @@
   <div class="staticListWrap">
     <div class="staticMainWrap">
       <div class="staticTopCenter">
-        <img class="staticTopLogo" src="../images/staticLogo.png" alt="">
+          <a href="homeStatic.html"><img class="staticTopLogo" src="../images/staticLogo.png" alt=""></a>
       </div>
       <div class="staticTopTab">
         <ul>

+ 1 - 1
src/html/staticInfo.html

@@ -16,7 +16,7 @@
 
 <body>
     <div class="banner">
-        <img class="staticTopLogo" src="../images/staticLogo.png" alt="">
+        <a href="homeStatic.html"><img class="staticTopLogo" src="../images/staticLogo.png" alt=""></a>
     </div>
   <div class="tabBox">
       <span class="title"></span>

+ 3 - 4
src/js/searchStaticList.js

@@ -53,7 +53,8 @@ function getSearchList(){
     $(".searchBtn").click(function(){
         $(".resultItemWrap,.pagination").html("");
         $(".staticResult .loading").show();
-        getTabData(curPage)
+        curPage=1;
+        getTabData()
     })
 }
 function getTabData(){
@@ -96,10 +97,8 @@ function renderList(tabList){
             <div class="resultItem" data-type="${item.type}" data-name="${item.name}">
                 <div>
                     <span class="type">${item.typeName}</span>
-                    ${item.code?`<span class="code">${item.code}</span>`:''}
                     <span class="drug">${item.name}</span>
-                    ${item.hasClinicalPathway?`<span class="notice">临床路径</span>`:''}
-                    ${item.hasNotice?`<span class="notice">注意事项</span>`:''}
+                    ${item.code ?`<span class="code">${item.code}</span>`:''}
                 </div>
                 ${item.retrievalName?`<div class="same">同义词:<span>${item.retrievalName}</span></div>`:''}
                 <div class="content">

+ 8 - 7
src/js/staticInfo.js

@@ -25,8 +25,8 @@ function getInfomation() {
     "position": getUrlArgObject('position'),
     "contentTypes":[1,2,3]
   };
-  const uname = getUrlArgObject('uname')
   showName = param.name
+  $(".tabBox .title").html(showName);
 
   post(config.information, param).then((res) => {
     const data = res.data.data
@@ -116,26 +116,27 @@ function addLinkClickEvent(contentWrapClassName) {
 
 function renderTab(detailList){
   if(detailList['静态知识']){
-    $(".tabList").append(`<span class="tab" data-module="staticKnowledge">静态知识</span>`)
-    $(".tabBox .title").html(showName);
+    $(".tabList").append(`<span class="tab" data-module="staticKnowledge" data-title="`+showName+`">静态知识</span>`)
   }
   if(detailList['临床路径']){
-    $(".tabList").append(`<span class="tab" data-module="clinicalPathway">临床路径</span>`)
-    $(".tabBox .title").html(clinicalPathwayName);
+    $(".tabList").append(`<span class="tab" data-module="clinicalPathway" data-title="`+clinicalPathwayName+`">临床路径</span>`)
+    //$(".tabBox .title").html(clinicalPathwayName);
   }
   if(detailList['注意事项']){
-    $(".tabList").append(`<span class="tab" data-module="notice">注意事项</span>`)
-    $(".tabBox .title").html(noticeName);
+    $(".tabList").append(`<span class="tab" data-module="notice" data-title="`+noticeName+`">注意事项</span>`)
+    //$(".tabBox .title").html(noticeName);
   }
   $(".tabList .tab").eq(0).addClass("activeTab")
   let defaultModuleName = $(".tabList .tab").eq(0).attr("data-module")
   $(`.${defaultModuleName}`).css("display","block")
   bindTabClick()
 }
+
 function bindTabClick(){
   $(".tabList .tab").on("click", function(){
     const moduleName = $(this).attr("data-module")
     const display = $(`.${moduleName}`).css("display")
+    $(".tabBox .title").html($(this).attr('data-title'));
     if(display == "none"){
       $(".activeTab").removeClass("activeTab")
       $(this).addClass("activeTab")

+ 12 - 10
src/js/staticInfoOut.js

@@ -33,8 +33,7 @@ function getInfomation() {
     "hisDetailName": getUrlArgObject('hisDetailName'),
     "contentTypes":[1,2,3]
   };
-  const uname = getUrlArgObject('uname')
-  // showName = param.name
+  showName = param.hisName;
   // if (param.type == 5 || param.type == 51) {
   //   param.type = 12;
   //   param.name = uname;
@@ -49,6 +48,7 @@ function getInfomation() {
         showEmpty();
         return;
       }
+      $(".titleCont .title").html(showName);
       showLis=data
       for(let i = 0;i < showLis.length;i++){
         let tmp = showLis[i]
@@ -72,6 +72,7 @@ getInfomation();
 function showEmpty(){
   const str=`<div class="empty"><img src="../images/empty3.png" alt=""><p>暂无静态知识</p></div>`;
   $(".tabBox").html(str).css("border-bottom","none");
+  $("body").css('background','#fff');
 }
 function showInfo(data){
   var detailList = data.details
@@ -168,16 +169,16 @@ function addLinkClickEvent(contentWrapClassName) {
 function renderTab(detailList){
   $(".tabList").html('')
   if(detailList['静态知识']){
-    $(".tabList").append(`<span class="tab" data-module="staticKnowledge">静态知识</span>`)
-    $(".titleCont .title").html(showName);
+    $(".tabList").append(`<span class="tab" data-module="staticKnowledge" data-title="`+showName+`">静态知识</span>`)
+    //$(".titleCont .title").html(showName);
   }
   if(detailList['临床路径']){
-    $(".tabList").append(`<span class="tab" data-module="clinicalPathway">临床路径</span>`)
-    $(".titleCont .title").html(clinicalPathwayName);
+    $(".tabList").append(`<span class="tab" data-module="clinicalPathway" data-title="`+clinicalPathwayName+`">临床路径</span>`)
+    //$(".titleCont .title").html(clinicalPathwayName);
   }
   if(detailList['注意事项']){
-    $(".tabList").append(`<span class="tab" data-module="notice">注意事项</span>`)
-    $(".titleCont .title").html(noticeName);
+    $(".tabList").append(`<span class="tab" data-module="notice" data-title="`+noticeName+`">注意事项</span>`)
+    //$(".titleCont .title").html(noticeName);
   }
   $(".tabList .tab").eq(0).addClass("activeTab")
   let defaultModuleName = $(".tabList .tab").eq(0).attr("data-module")
@@ -188,6 +189,7 @@ function bindTabClick(){
   $(".tabList .tab").on("click", function(){
     const moduleName = $(this).attr("data-module")
     const display = $(`.${moduleName}`).css("display")
+      $(".titleCont .title").html($(this).attr('data-title'));
     if(display == "none"){
       $(".activeTab").removeClass("activeTab")
       $(this).addClass("activeTab")
@@ -202,12 +204,12 @@ function bindTabClick(){
     const hospitalId= getUrlArgObject('hospitalId');
     const hisName= getUrlArgObject('hisName');
     const hisDetailName= getUrlArgObject('hisDetailName');
-    openNewWin("staticInfoOut.html?hospitalId="+encodeURIComponent(hospitalId)+"&hisName="+encodeURIComponent(hisName)+"&hisDetailName="+encodeURIComponent(hisDetailName)+"&type="+encodeURIComponent(type));
+    openNewWin("staticInfoOut.html?hospitalId="+encodeURIComponent(hospitalId)+"&hisName="+encodeURIComponent(hisName)+"&hisDetailName="+encodeURIComponent(hisDetailName||'')+"&type="+encodeURIComponent(type));
   })
 }
 function adjustHeight() {
   var ht = window.innerHeight || document.documentElement.clientHeight;
-  $(".content").height(ht - 220 + "px");
+  $(".content").height(ht - 250 + "px");
 }
 function adjustWidth() {
   var wt = window.innerWidth || document.documentElement.clientWidth;