luolei 4 lat temu
rodzic
commit
d3c0de2004

+ 1 - 1
src/css/cdss.less

@@ -426,4 +426,4 @@ body{
     img{
         margin-left: 4px;
     }
-}
+}

+ 3 - 1
src/css/cdssHorizontal.less

@@ -66,6 +66,7 @@
     display: inline-block;
     cursor: pointer;
     width: 100%;
+    border-bottom: 1px solid #3B9ED0;
 }
 .tabName{
     display:inline-block;
@@ -353,6 +354,7 @@
 .operaNameBold {
     color: #333;
     font-weight: bold;
+    font-size: 12px;
 }
 .infoWrap {
     max-height: 207px;
@@ -373,7 +375,7 @@
 } 
 .readMorePlan {
     height: 30px;
-    line-height: 30px;
+    line-height: 20px;
     padding-left: 10px;
     a {
         display: inline-block;

+ 1 - 0
src/css/followUpV.less

@@ -8,6 +8,7 @@
 .operaNameBold{
     color: #1e1e1e;
     font-weight: 600;
+    font-size: 12px;
 }
 .btnBox{
     text-align: center;

+ 5 - 4
src/js/cdss.js

@@ -279,7 +279,7 @@ function renderPushData(){
       rendergeneraTreatPush(generaTreatPush)
       if(hasCompleteTnterface === allInterface){
         $('.loading').css("display","none")
-        if(moduleNum === 0){ console.log(1)
+        if(moduleNum === 0){
           empty()
         }
       }
@@ -351,7 +351,7 @@ function renderPushWarning(){
     }
     if(hasCompleteTnterface === allInterface){
       $('.loading').css("display","none")
-      if(moduleNum === 0){console.log(2)
+      if(moduleNum === 0){
         empty()
       }
     }
@@ -368,7 +368,7 @@ function renderWriteStandard(){
     }
     if(hasCompleteTnterface === allInterface){
       $('.loading').css("display","none")
-      if(moduleNum === 0){console.log(3)
+      if(moduleNum === 0){
         empty()
       }
     }
@@ -669,7 +669,8 @@ function bindTabClick(){
     if(moduleName == "medical"){
       $(".staticSearchT .ipt").find("input").focus()
       $(".contentWrapper").css("overflowY","hidden")
-    }else{
+    }else if(moduleName == 'followup'){
+      
       // $(".contentWrapper").css("overflowY","auto")
     }
   })

+ 6 - 4
src/js/cdssHorizontal.js

@@ -14,6 +14,7 @@ require('./../css/staticSearch.css')
 require('./../js/staticSearch.js')
 require('./../images/empty2.png').replace(/^undefined/g, '')
 require('./../images/loading.gif').replace(/^undefined/g, '')
+let emptyImg = require('./../images/empty3.png').replace(/^undefined/g, '')
 require('./../images/new2.png').replace(/^undefined/g, '')
 const { post,config,getUrlArgObject,openNewWin,titleConfigH,throttle, } = require('./promise.js');
 let infoImg = require('./../images/icon_info.png').replace(/^undefined/g, '')
@@ -126,7 +127,7 @@ function renderPage(pageSet){
   for(let i = 0; i < tabList.length; i++){
     if(tabList[i].status == '1'){
       TabNum++
-      tabStr += `<span class="tab" data-name="${tabList[i].code}" ><span class="tabName">${tabList[i].name}</span><span class="activeLine"></span></span>`
+      tabStr += `<span class="tab" style="border-bottom:${tabList.length==i+1?'0':'1px solid #3B9ED0'}" data-name="${tabList[i].code}" ><span class="tabName">${tabList[i].name}</span><span class="activeLine"></span></span>`
     }
     
   }
@@ -485,7 +486,7 @@ function renderPushWarning(){
     if(hasCompleteTnterface === allInterface){
       $('.loading').css("display","none")
       if(moduleNum === 0){//console.log(999)
-        empty()
+        // empty()
       }
     }
     
@@ -664,7 +665,8 @@ $(function(){
   });
 })
 
-function empty(){
+
+// function empty(){
   // $(".responsibility").css("display","none")
   // $('.recommendWrap .empty').css("display","block")
-}
+// }

+ 4 - 2
src/js/followUp.js

@@ -9,6 +9,7 @@ function getFollowUp(msg){
 let hospitalId = getUrlArgObject('hospitalId') || ''
 let mrId = getUrlArgObject('mrId') 
 function renderFollowUp(msg,type){
+    alert(5454)
     getFollowUp(msg).then(res =>{
         if(res.data.code === "0"){
             const result = res.data.data&&res.data.data.pushPlans || []
@@ -137,10 +138,11 @@ function adjustHeight() {
     $(".followUpWrap  .infoWrap").height(containerHt -ht1- ht2-30 + "px");
     $(".infoWrap").preventScroll();  
 }
-function getTime(date){
-    if(!date){
+function getTime(time){
+    if(!time){
         return ``
     }
+    date = time.replace('-','/')
     const year = new Date(date).getFullYear()
     const month = new Date(date).getMonth()+1
     const day = new Date(date).getDate()