静态信息type后端传值

src/js/cdss.js

@@ -282,16 +282,16 @@ function renderPushData(){
         let nurseNum = $(".moduleItem.nurse").attr("data-num") || 5
      
 
-      renderLis(lisPush,lisNum,3,true)
-      renderScale(scalePush,scaleNum,8,true)
-      renderPacs(pacsPush,pacsNum,5,true)
-      renderCheckup(checkupPush,checkupNum,null,true)
-      renderSymptomPush(symptomPush,symptomNum,null,true)
+      renderLis(lisPush,lisNum)
+      renderScale(scalePush,scaleNum)
+      renderPacs(pacsPush,pacsNum)
+      renderCheckup(checkupPush,checkupNum)
+      renderSymptomPush(symptomPush,symptomNum)
       renderDiag(diagPush)
-      renderMedicinesPush(medicinesPush,medicinesNum,2,true)
-      renderOperationPush(operationsPush,operationsNum,6,true)
+      renderMedicinesPush(medicinesPush,medicinesNum)
+      renderOperationPush(operationsPush,operationsNum)
       rendergeneraTreatPush(generaTreatPush)
-        renderNurse(nursePush, nurseNum, 9, true)
+      renderNurse(nursePush, nurseNum)
       if(hasCompleteTnterface === allInterface){
         $('.loading').css("display","none")
         if(moduleNum === 0){
@@ -481,7 +481,7 @@ function renderDiagItem(list,name,number){
   }
   moduleNum++
   let titleStr = titleStr2(name)
-  let {shortStr, longStr} = renderItemWrapper(list,number,1,true)
+  let {shortStr, longStr} = renderItemWrapper(list,number)
   let boxStr = `<div class="moduleBox">
         ${titleStr}
         ${shortStr}
@@ -503,63 +503,60 @@ function renderWarningDiag(list,name,number){
   }
 }
 
-function renderLis(list,showNum,type,hasInfo){
+function renderLis(list,showNum){
   if(list.length > 0 &&  $(".moduleItem.lis").length > 0){
     moduleNum++
     $('.moduleItem.lis').append(titleStr("lisPush"))
-    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    let {shortStr, longStr} = renderItemWrapper(list,showNum)
     $('.moduleItem.lis').append(shortStr).append(longStr)
     $('.moduleItem.lis').css("display","block")
   }
  
 }
-function renderScale(list,showNum,type,hasInfo){
+function renderScale(list,showNum){
   if(list.length > 0 &&  $(".moduleItem.evaluation").length > 0){
     moduleNum++
     $('.moduleItem.evaluation').append(titleStr("scalePush"))
-    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    let {shortStr, longStr} = renderItemWrapper(list,showNum)
     $('.moduleItem.evaluation').append(shortStr).append(longStr)
     $('.moduleItem.evaluation').css("display", "block")
-    // $('.moduleItem.evaluation').children(".shortBox").children(".pushItemBox").children(".pushItemName").addClass("evaluationtitle")
-    // $('.moduleItem.evaluation').children(".longBox").children(".pushItemBox").children(".pushItemName").addClass("evaluationtitle")
-
   }
 }
 
-function renderNurse(list, showNum, type, hasInfo) {
+function renderNurse(list, showNum) {
     if (list.length > 0 && $(".moduleItem.nurse").length > 0) {
         moduleNum++
         $('.moduleItem.nurse').append(titleStr("nursePush"))
-        let {shortStr, longStr} = renderItemWrapper(list, showNum, type, hasInfo)
+        let {shortStr, longStr} = renderItemWrapper(list, showNum)
         $('.moduleItem.nurse').append(shortStr).append(longStr);
         $('.moduleItem.nurse').css("display", "block")
     }
 }
-function renderPacs(list,showNum,type,hasInfo){
+function renderPacs(list,showNum){
   if(list.length > 0 &&  $(".moduleItem.pacs").length > 0){
     moduleNum++
     $(".moduleItem.pacs").append(titleStr("pacsPush"))
-    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    let {shortStr, longStr} = renderItemWrapper(list,showNum)
     $(".moduleItem.pacs").append(shortStr).append(longStr)
     $('.moduleItem.pacs').css("display","block")
   }
  
 }
-function renderCheckup(list,showNum,type,hasInfo){
+function renderCheckup(list,showNum){
   if(list.length > 0 &&  $(".moduleItem.vital").length > 0){
     moduleNum++
     $(".moduleItem.vital").append(titleStr("checkupPush"))
-    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    let {shortStr, longStr} = renderItemWrapper(list,showNum)
     $(".moduleItem.vital").append(shortStr).append(longStr)
     $('.moduleItem.vital').css("display","block")
   }
 }
-function renderSymptomPush(list,showNum,type,hasInfo){
+function renderSymptomPush(list,showNum){
   $(".moduleItem.symptom").append(titleStr('symptomPush'))
 
   if(list.length > 0 &&  $(".moduleItem.symptom").length > 0){
     moduleNum++
-    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    let {shortStr, longStr} = renderItemWrapper(list,showNum)
     $(".moduleItem.symptom").append(shortStr).append(longStr)
     $(".moduleItem.symptom").css("display","block")
   }
@@ -580,23 +577,23 @@ function rendergeneraTreatPush(list){
     }
   }
 }
-function renderMedicinesPush(list,showNum,type,hasInfo){
+function renderMedicinesPush(list,showNum){
   $(".moduleItem.medicine").append(titleStr('drugPush'))
 
   if(list.length > 0 &&  $(".moduleItem.medicine").length > 0){
     moduleNum++
-    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    let {shortStr, longStr} = renderItemWrapper(list,showNum)
     $(".moduleItem.medicine").append(shortStr).append(longStr)
     $(".moduleItem.medicine").css("display","block")
   }
  
 }
-function renderOperationPush(list,showNum,type,hasInfo){
+function renderOperationPush(list,showNum){
   $(".moduleItem.operation").append(titleStr('operationPush'))
 
   if(list.length > 0 &&  $(".moduleItem.operation").length > 0){
     moduleNum++
-    let {shortStr, longStr} = renderItemWrapper(list,showNum,type,hasInfo)
+    let {shortStr, longStr} = renderItemWrapper(list,showNum)
     $(".moduleItem.operation").append(shortStr).append(longStr)
     $(".moduleItem.operation").css("display","block")
   }
@@ -604,16 +601,15 @@ function renderOperationPush(list,showNum,type,hasInfo){
 }
 
 
-function renderItemWrapper(list, showNum, type, hasInfo) {
-    //console.log(33, type)
+function renderItemWrapper(list, showNum) {
   let showNum1 = showNum || 5
   let shortStr = '', longStr = ''
 
   for(let i = 0; i < list.length; i++){
     if(i <= showNum1-1){
-      shortStr += renderPushItem(list[i],type)
+      shortStr += renderPushItem(list[i])
     }
-    longStr += renderPushItem(list[i],type)
+    longStr += renderPushItem(list[i])
   }
 
   if(showNum1 >= list.length){
@@ -631,10 +627,10 @@ function renderItemWrapper(list, showNum, type, hasInfo) {
   }
 }
 
-function renderPushItem(item, type) {
+function renderPushItem(item) {
   const infoIcon = `${ item.hasInfo == "1" ? `<img class="infoImg" src="${infoImg}">` : "" }`;
-  str = `<span class="pushItemBox" data-name="${item.name}" data-type="${type}">`
-  str += `<span class="pushItemName ${item.hasScale == "1" ? 'evaluationtitle':''}"><i>${type == 8 ? ('【' + item.name + '】') : item.name}</i> ${infoIcon}</span>`
+  str = `<span class="pushItemBox" data-name="${item.name}" data-type="${item.type}">`
+  str += `<span class="pushItemName ${item.hasScale == "1" ? 'evaluationtitle':''}"><i>${item.type == 8 ? ('【' + item.name + '】') : item.name}</i> ${infoIcon}</span>`
   str+=`</span>`;
   return str
 }

src/js/cdssHorizontal.js

@@ -290,11 +290,11 @@ function renderPushData() {
       let operationsNum = $(".moduleItem.operation").attr("data-num") || 5
       let nurseNum = $(".moduleItem.nurse").attr("data-num") || 5
 
-      renderLis(lisPush, lisNum, 3, true)
-      renderScale(scalePush, scaleNum, 8, true)
-      renderPacs(pacsPush, pacsNum, 5, true)
-      renderCheckup(checkupPush, checkupNum, null, true)
-      renderSymptomPush(symptomPush, symptomNum, null, true)
+      renderLis(lisPush, lisNum)
+      renderScale(scalePush, scaleNum)
+      renderPacs(pacsPush, pacsNum)
+      renderCheckup(checkupPush, checkupNum)
+      renderSymptomPush(symptomPush, symptomNum)
       renderDiag(diagPush)
       if (medicinesPush.length > 0 || operationsPush.length > 0 || generaTreatPush || nursePush.length > 0) {
         let str = `<img class="treatIcon" src = ${titleConfigH["treat"].icon} /><span>${titleConfigH["treat"].name}</span>`
@@ -317,15 +317,9 @@ function renderPushData() {
       }
 
       rendergeneraTreatPush(generaTreatPush)
-      renderMedicinesPush(medicinesPush, medicinesNum, 2, true)
-      renderOperationPush(operationsPush, operationsNum, 6, true)
-      renderNurse(nursePush, nurseNum, 9, true)
-      // if(hasCompleteTnterface === allInterface){
-      //   $('.loading').css("display","none")
-      //   if(moduleNum === 0){ 
-      //     empty()
-      //   }
-      // }icon
+      renderMedicinesPush(medicinesPush, medicinesNum)
+      renderOperationPush(operationsPush, operationsNum)
+      renderNurse(nursePush, nurseNum)
       bindOpenInfo()
       bindSlide()
       moreInfo()
@@ -333,21 +327,21 @@ function renderPushData() {
   })
 }
 
-function renderLis(list, showNum, type, hasInfo) {
+function renderLis(list, showNum) {
   if (list.length > 0 && $(".moduleItem.lis").length > 0) {
     moduleNum++
     $('.moduleItem.lis .moduleItemTitBox').append(titleStr("lisPush"))
-    let { shortStr, longStr } = renderItemWrapper(list, showNum, type, hasInfo)
+    let { shortStr, longStr } = renderItemWrapper(list, showNum)
     $('.moduleItem.lis').append(shortStr)
     $('.moduleItem.lis').append(renderLongStr(titleConfigH["lisPush"].name, longStr, titleConfigH["lisPush"].location))
     $('.moduleItem.lis').css("display", "block")
   }
 }
-function renderScale(list, showNum, type, hasInfo) {
+function renderScale(list, showNum) {
   if (list.length > 0 && $(".moduleItem.evaluation").length > 0) {
     moduleNum++
     $('.moduleItem.evaluation .moduleItemTitBox').append(titleStr("scalePush"))
-    let { shortStr, longStr } = renderItemWrapper(list, showNum, type, hasInfo)
+    let { shortStr, longStr } = renderItemWrapper(list, showNum)
     $('.moduleItem.evaluation').append(shortStr)
     $('.moduleItem.evaluation').append(renderLongStr(titleConfigH["scalePush"].name, longStr, titleConfigH["scalePush"].location))
     $('.moduleItem.evaluation').css("display", "block")
@@ -356,55 +350,55 @@ function renderScale(list, showNum, type, hasInfo) {
   }
 }
 
-function renderNurse(list, showNum, type, hasInfo) {
+function renderNurse(list, showNum) {
   if (list.length > 0 && $(".moduleItem.nurse").length > 0) {
     moduleNum++
     $('.moduleItem.nurse .moduleItemTitBox').append(titleStr("nursePush"))
-    let { shortStr, longStr } = renderItemWrapper(list, showNum, type, hasInfo)
+    let { shortStr, longStr } = renderItemWrapper(list, showNum)
     $(".moduleItem.nurse").append(shortStr)
     $(".moduleItem.nurse").append(renderLongStr(titleConfigH["nursePush"].name, longStr, titleConfigH["nursePush"].location))
     $(".moduleItem.nurse").css("display", "block")
   }
 }
-function renderPacs(list, showNum, type, hasInfo) {
+function renderPacs(list, showNum) {
   if (list.length > 0 && $(".moduleItem.pacs").length > 0) {
     moduleNum++
     $('.moduleItem.pacs .moduleItemTitBox').append(titleStr("pacsPush"))
-    let { shortStr, longStr } = renderItemWrapper(list, showNum, type, hasInfo)
+    let { shortStr, longStr } = renderItemWrapper(list, showNum)
     $(".moduleItem.pacs").append(shortStr)
     $(".moduleItem.pacs").append(renderLongStr(titleConfigH["pacsPush"].name, longStr, titleConfigH["pacsPush"].location))
     $('.moduleItem.pacs').css("display", "block")
   }
 
 }
-function renderSymptomPush(list, showNum, type, hasInfo) {
+function renderSymptomPush(list, showNum) {
   if (list.length > 0 && $(".moduleItem.symptom").length > 0) {
     moduleNum++
     $('.moduleItem.symptom .moduleItemTitBox').append(titleStr("symptomPush"))
-    let { shortStr, longStr } = renderItemWrapper(list, showNum, type, hasInfo)
+    let { shortStr, longStr } = renderItemWrapper(list, showNum)
     $(".moduleItem.symptom").append(shortStr)
     $(".moduleItem.symptom").append(renderLongStr(titleConfigH["symptomPush"].name, longStr, titleConfigH["symptomPush"].location))
     $('.moduleItem.symptom').css("display", "block")
   }
 
 }
-function renderMedicinesPush(list, showNum, type, hasInfo) {
+function renderMedicinesPush(list, showNum) {
 
   if (list.length > 0 && $(".moduleItem.medicine").length > 0) {
     moduleNum++
     $('.moduleItem.medicine .moduleItemTitBox').append(titleStr("drugPush"))
-    let { shortStr, longStr } = renderItemWrapper(list, showNum, type, hasInfo)
+    let { shortStr, longStr } = renderItemWrapper(list, showNum)
     $(".moduleItem.medicine").append(shortStr)
     $(".moduleItem.medicine").append(renderLongStr(titleConfigH["drugPush"].name, longStr, titleConfigH["drugPush"].location))
     $(".moduleItem.medicine").css("display", "block")
   }
 
 }
-function renderOperationPush(list, showNum, type, hasInfo) {
+function renderOperationPush(list, showNum) {
   if (list.length > 0 && $(".moduleItem.operation").length > 0) {
     moduleNum++
     $('.moduleItem.operation .moduleItemTitBox').append(titleStr("operationPush"))
-    let { shortStr, longStr } = renderItemWrapper(list, showNum, type, hasInfo)
+    let { shortStr, longStr } = renderItemWrapper(list, showNum)
     $(".moduleItem.operation").append(shortStr)
     $(".moduleItem.operation").append(renderLongStr(titleConfigH["operationPush"].name, longStr, titleConfigH["operationPush"].location))
     $(".moduleItem.operation").css("display", "block")
@@ -434,11 +428,11 @@ function rendergeneraTreatPush(list) {
     $(".moduleItem.general").css("display", "block")
   }
 }
-function renderCheckup(list, showNum, type, hasInfo) {
+function renderCheckup(list, showNum) {
   if (list.length > 0 && $(".moduleItem.vital").length > 0) {
     moduleNum++
     $(".moduleItem.vital .moduleItemTitBox").append(titleStr("checkupPush"))
-    let { shortStr, longStr } = renderItemWrapper(list, showNum, type, hasInfo)
+    let { shortStr, longStr } = renderItemWrapper(list, showNum)
     $(".moduleItem.vital").append(shortStr)
     $(".moduleItem.vital").append(renderLongStr(titleConfigH["checkupPush"].name, longStr, titleConfigH["checkupPush"].location))
     $('.moduleItem.vital').css("display", "block")
@@ -569,14 +563,14 @@ function renderLongStr(name, longStr, location) {
 }
 
 
-function renderItemWrapper(list, showNum, type, hasInfo) {
+function renderItemWrapper(list, showNum) {
   let showNum1 = showNum || 5
   let shortStr = '', longStr = ''
   for (let i = 0; i < list.length; i++) {
     if (i <= showNum1 - 1) {
-      shortStr += renderPushItem(list[i], type)
+      shortStr += renderPushItem(list[i])
     }
-    longStr += renderPushItem(list[i], type)
+    longStr += renderPushItem(list[i])
   }
 
   if (showNum1 >= list.length) {
@@ -593,9 +587,9 @@ function renderItemWrapper(list, showNum, type, hasInfo) {
     }
   }
 }
-function renderPushItem(item, type) {
-  str = `<span class="pushItemBox" data-name="${item.name}" data-type="${type}">`
-  str += `${item.hasScale == "0" ? `<span class="pushItemName">${type == 8 ? ('【' + item.name + '】') : item.name}</span>` : item.hasScale == "1" ? `<span class="pushItemName evaluationtitle">${type == 8 ? ('【' + item.name + '】') : item.name}</span>` : `<span class="pushItemName">${type == 8 ? ('【' + item.name + '】') : item.name}</span>`}`
+function renderPushItem(item) {
+  str = `<span class="pushItemBox" data-name="${item.name}" data-type="${item.type}">`
+  str += `${item.hasScale == "0" ? `<span class="pushItemName">${item.type == 8 ? ('【' + item.name + '】') : item.name}</span>` : item.hasScale == "1" ? `<span class="pushItemName evaluationtitle">${item.type == 8 ? ('【' + item.name + '】') : item.name}</span>` : `<span class="pushItemName">${item.type == 8 ? ('【' + item.name + '】') : item.name}</span>`}`
   str += `${item.hasInfo == "1" ? `<img class="infoImg" src="${infoImg}">` : ""}`
   str += '</span >'
   return str