bug6004

src/js/cdssHorizontal.js

@@ -15,7 +15,7 @@ require('./../js/staticSearch.js')
 require('./../images/empty2.png').replace(/^undefined/g, '')
 require('./../images/loading.gif').replace(/^undefined/g, '')
 require('./../images/new2.png').replace(/^undefined/g, '')
-const { post,config,getUrlArgObject,openNewWin,titleConfigH } = require('./promise.js');
+const { post,config,getUrlArgObject,openNewWin,titleConfigH,throttle, } = require('./promise.js');
 let infoImg = require('./../images/icon_info.png').replace(/^undefined/g, '')
 let infoImgOn = require('./../images/icon_info_on.png').replace(/^undefined/g, '')
 let iconArrowUp = require('./../images/icon_arrow_up.png').replace(/^undefined/g, '')
@@ -205,7 +205,6 @@ function isNeedPush(list){
   })
 }
  function getModuleShow(moduleClassName){
-   console.log("moduleClassName",moduleClassName)
   if( $(`.${moduleClassName}`).css("display") =="none"){
     $(".moduleWrapper").css("display","none")
     $(`.${moduleClassName}`).css("display","block")
@@ -215,7 +214,6 @@ function isNeedPush(list){
    tabNameList = $(".tabList .tab .tabName")
    for(let i = 0; i < tabNameList.length; i++){
     let tabNameHei = $(".tabList .tab .tabName").eq(i).height()
-    console.log("tabNameHei",tabNameList)
     $(".tabList .tab .tabName").eq(i).css("marginTop",-tabNameHei/2+"px")
    }
  }
@@ -229,7 +227,6 @@ function renderCaseWrite(){
       renderwriteStandardPage(caseWritePush)
       if($(".moduleItem.casewriting")){
         let casewritingHei = $(".moduleItem.casewriting")[0].scrollHeight
-        console.log('casewritingHei',casewritingHei)
         if(casewritingHei > 81){
           $(".casewriting").append(`<span class="showMoreCaseWrite">更多</span>`)
           caseWriteStandradList = caseWritePush
@@ -313,7 +310,7 @@ function renderLis(list,showNum,type,hasInfo){
     $('.moduleItem.lis .moduleItemTitBox').append(titleStr("lisPush"))
     let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
     $('.moduleItem.lis').append(shortStr)
-    $('.moduleItem.lis').append(renderLongStr(titleConfigH["lisPush"].name,longStr))
+    $('.moduleItem.lis').append(renderLongStr(titleConfigH["lisPush"].name,longStr,titleConfigH["lisPush"].location))
     $('.moduleItem.lis').css("display","block")
   }
  
@@ -324,7 +321,7 @@ function renderPacs(list,showNum,type,hasInfo){
     $('.moduleItem.pacs .moduleItemTitBox').append(titleStr("pacsPush"))
     let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
     $(".moduleItem.pacs").append(shortStr)
-    $(".moduleItem.pacs").append(renderLongStr(titleConfigH["pacsPush"].name,longStr))
+    $(".moduleItem.pacs").append(renderLongStr(titleConfigH["pacsPush"].name,longStr,titleConfigH["pacsPush"].location))
     $('.moduleItem.pacs').css("display","block")
   }
  
@@ -335,7 +332,7 @@ function renderSymptomPush(list,showNum,type,hasInfo){
     $('.moduleItem.symptom .moduleItemTitBox').append(titleStr("symptomPush"))
     let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
     $(".moduleItem.symptom").append(shortStr)
-    $(".moduleItem.symptom").append(renderLongStr(titleConfigH["symptomPush"].name,longStr))
+    $(".moduleItem.symptom").append(renderLongStr(titleConfigH["symptomPush"].name,longStr,titleConfigH["symptomPush"].location))
     $('.moduleItem.symptom').css("display","block")
   }
  
@@ -347,7 +344,7 @@ function renderMedicinesPush(list,showNum,type,hasInfo){
     $('.moduleItem.medicine .moduleItemTitBox').append(titleStr("drugPush"))
     let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
     $(".moduleItem.medicine").append(shortStr)
-    $(".moduleItem.medicine").append(renderLongStr(titleConfigH["drugPush"].name,longStr))
+    $(".moduleItem.medicine").append(renderLongStr(titleConfigH["drugPush"].name,longStr,titleConfigH["drugPush"].location))
     $(".moduleItem.medicine").css("display","block")
   }
  
@@ -358,7 +355,7 @@ function renderOperationPush(list,showNum,type,hasInfo){
     $('.moduleItem.operation .moduleItemTitBox').append(titleStr("operationPush"))
     let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
     $(".moduleItem.operation").append(shortStr)
-    $(".moduleItem.operation").append(renderLongStr(titleConfigH["operationPush"].name,longStr))
+    $(".moduleItem.operation").append(renderLongStr(titleConfigH["operationPush"].name,longStr,titleConfigH["operationPush"].location))
     $(".moduleItem.operation").css("display","block")
   }
  
@@ -376,7 +373,6 @@ function rendergeneraTreatPush(list){
     
     setTimeout(function(){
       let generaTreatHei = $(".moduleItem .generalTreatInfo")[0].scrollHeight
-      console.log("generaTreatHei",generaTreatHei)
       if(generaTreatHei >81){
         $(".moduleItem .generalTreatInfo").append(`<span class="showMoreGeneralTreat">更多</span>`)
         bindGeneralSlide()
@@ -393,7 +389,7 @@ function renderCheckup(list,showNum,type,hasInfo){
     $(".moduleItem.vital .moduleItemTitBox").append(titleStr("checkupPush"))
     let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
     $(".moduleItem.vital").append(shortStr)
-    $(".moduleItem.vital").append(renderLongStr(titleConfigH["checkupPush"].name,longStr))
+    $(".moduleItem.vital").append(renderLongStr(titleConfigH["checkupPush"].name,longStr,titleConfigH["checkupPush"].location))
     $('.moduleItem.vital').css("display","block")
   }
 }
@@ -426,17 +422,15 @@ function renderDiagItem(list,name,number){
         ${shortStr}
       </div>`
   $(".diag").append(boxStr)
-  $(".diag").append(renderLongStr(name,longStr))
+  $(".diag").append(renderLongStr(name,longStr,"left"))
   $('.moduleItem.diag').css("display","block")
 }
 function renderWarningDiag(list,name,showNum){
   if(list.length > 0 &&  $(".moduleItem.warning").length > 0){
     moduleNum++
     $('.moduleItem.warning .moduleItemTitBox').append(titleStr("vigilancePush"))
-    console.log("")
     let {shortStr, longStr} = renderItemWrapper(list,showNum,1,true)
     $('.moduleItem.warning').append(shortStr)
-    $('.moduleItem.warning').append(renderLongStr(titleConfigH["lisPush"].name,longStr))
     $('.moduleItem.warning').css("display","block")
   }
 }
@@ -508,12 +502,12 @@ function renderBillingPush(list,name){
   $(".tips").append(boxStr)
   $('.moduleItem.tips').css("display","block")
 }
-function renderLongStr(name,longStr){
+function renderLongStr(name,longStr,location){
   if(!longStr){
     return
   }
   let str = `
-    <div class="longStrBox">
+    <div class="longStrBox" data-location="${location}">
       <span class="longStrBoxTitle">${name}：</span>
       ${longStr}
     </div>  
@@ -570,10 +564,14 @@ function bindSlide(){
   $(".showMore").on("click", function(){
     $(".longStrBox").css("display","none")
     $(this).parents(".moduleItem ").find(".longStrBox").css("display","block")
+    let location = $(this).parents(".moduleItem ").find(".longStrBox").attr("data-location")
+    let scrollTop = getLongTop(location)
+    $(this).parents(".moduleItem ").find(".longStrBox").css("top", 5 +Number(scrollTop)+ "px")
   })
   $(".showLess").on("click", function(){
     $(this).parent().parent().css("display","none")
   })
+  addScrollEvent()
 }
 function showMoreNewPage(){
   $(".showMoreNewPage").on("click", function(){
@@ -625,6 +623,27 @@ function getVersion() {
     }
   })
 }
+function getLongTop(type){
+  let scrollTop = 0
+  if(type === "left"){
+    scrollTop = $(".leftWrapper").scrollTop() || 0
+  }else if(type === "right"){
+    scrollTop = $(".rightWrapper").scrollTop() || 0
+  }
+  return scrollTop
+}
+function addScrollEvent(){
+  $(`.leftWrapper`).off("scroll").scroll(throttle(function(){
+    if($(".leftWrapper .longStrBox").css("display") === "block"){
+      $(".leftWrapper .longStrBox").css("top",Number(getLongTop("left"))+5+"px")
+    }
+  }, 100));
+  $(`.rightWrapper`).off("scroll").scroll(throttle(function(){
+    if($(".rightWrapper .longStrBox").css("display") === "block"){
+      $(".rightWrapper .longStrBox").css("top",Number(getLongTop("right"))+5+"px")
+    }
+  }, 100));
+}
 $(function(){
   getVersion()
   $(window).on("resize",function(){

src/js/promise.js

@@ -224,22 +224,26 @@ const titleConfigH = {
   warning:{
     background: "#FFE8DD",
     icon: iconWarning,
-    name:"智能警示"
+    name:"智能警示",
+    location:"left"
   },
   symptomPush:{
     background: "#EEF5FD",
     icon: iconSymptomPush,
-    name:"推荐症状"
+    name:"推荐症状",
+    location:"left"
   },
   diagPush:{
     background: "#FAECED",
     icon: iconDiagPush,
-    name:"智能诊断"
+    name:"智能诊断",
+    location:"left"
   },
   checkupPush:{
     background: "#EEF5FD",
     icon: iconCheckupPush,
-    name:"体格检查"
+    name:"体格检查",
+    location:"left"
   },
   scalePush:{
     background: "#ECF4FC",
@@ -249,32 +253,38 @@ const titleConfigH = {
   lisPush:{
     background: "#ECF4FC",
     icon: iconLisPush,
-    name:"推荐检验"
+    name:"推荐检验",
+    location:"left"
   },
   pacsPush:{
     background: "#ECF4FC",
     icon: iconPacsPush,
-    name:"推荐检查"
+    name:"推荐检查",
+    location:"left"
   },
   generaTreatPush:{
     background: "#E3FEFE",
     icon: iconTreatMedicine,
-    name:"一般治疗"
+    name:"一般治疗",
+    location:"right"
   },
   drugPush:{
     background: "#E3FEFE",
     icon: iconTreatMedicine,
-    name:"推荐用药"
+    name:"推荐用药",
+    location:"right"
   },
   operationPush:{
     background: "#E3FEFE",
     icon: iconTreatMedicine,
-    name:"手术/操作"
+    name:"手术/操作",
+    location:"right"
   },
   vigilancePush:{
     background: "#FFE8DD",
     icon: iconWarning,
-    name:"警惕"
+    name:"警惕",
+    location:"left"
   },
   treat:{
     background: "#FFE8DD",
@@ -284,7 +294,8 @@ const titleConfigH = {
   casewritingPush:{
     background: "#E3FEFE",
     icon: iconTreat,
-    name:"病历书写规范提示"
+    name:"病历书写规范提示",
+    location:"left"
   }
 }
 module.exports = {