Revert "Revert "竖版显示数目配置""

This reverts commit f21f9f5e43c54ee7d66386b7b12b7c8c50d3c8eb.

src/js/index.js

@@ -86,7 +86,7 @@ function getPageInfo() {
     const pushInfo = res2&&res2.data || {}
     const treatInfo = res3&&res3.data || {}
     const tipsInfo = res4&&res4.data || []
-    const confArr = transConf(configArr)
+    const {confArr, showLabsNum, showPacsNum, labsAndPacMode} = transConf(configArr)
     pushResult = pushInfo.data || {};
     treatResult = treatInfo.data || {}
     tipsResult = tipsInfo.data || {}
@@ -105,12 +105,14 @@ function getPageInfo() {
       {
           title: '化验',
           className: 'labRecommend',
-          data:  labRecommend
+          data:  labRecommend,
+          showNum: showLabsNum
       },
       {
           title: '辅检',
           className: 'pacsRecommend',
-          data:  pacsRecommend
+          data:  pacsRecommend,
+          showNum: showPacsNum
       }
     ]
     window.pushMessage = medicalIndications;//计算的需要的相关数据
@@ -119,16 +121,16 @@ function getPageInfo() {
 
       switch(confArr[i].code) {
         case "inquiry_show":  //问诊症状
-          renderRecommendInfo('symptomRecommend', '问诊症状', symptomRecommend, false)
+          renderRecommendInfo(confArr[i].showNum,'symptomRecommend', '问诊症状', symptomRecommend, false)
           break; 
         case "health_show": //体格检查
-          renderRecommendInfo('physiExamRecommend', '体格检查', physiExamRecommend, false)
+          renderRecommendInfo(confArr[i].showNum,'physiExamRecommend', '体格检查', physiExamRecommend, false)
           break;
         case "illness_show": //病情提示
           renderRecommendConditTips('conditTips','病情提示', medicalIndications || [])
           break;
         case "vigilant_show": //警惕诊断
-          renderRecommendInfo('warning', '警惕诊断', diagWaring, true,7,2)
+          renderRecommendInfo(confArr[i].showNum,'warning', '警惕诊断', diagWaring, true,7,2)
           break;
         case "lispacs_show": //检验检查
           renderMultRecommendInfo('labAndPacsRecommend', '检验检查', labAndPacsRecommend, false)
@@ -137,7 +139,7 @@ function getPageInfo() {
           renderTreat('treatRecommend','治疗方案',treatResult)
           break;
         case "diagnose_show": //推荐诊断
-          renderRecommendInfo('diagRecommend', '推荐诊断', diagRecommend, true,7,2)
+          renderRecommendInfo(confArr[i].showNum,'diagRecommend', '推荐诊断', diagRecommend, true,7,2)
           break;
         case "tip_show": //提示信息
           renderTipsInfo('tipsInfo','提示信息',tipsResult)

src/js/indexVertDom.js

@@ -2,40 +2,59 @@ const $ = require("jquery");
 const { openNewWin,imageUrlPrefix } = require('./promise.js');
 const { bindTipsEvent } = require('./popupEdit.js');
 
-function renderRecommendInfo(className,title,data, hasInfo, type, position) {
-    const str = `<div class="recommendInfoWrapper ${className}">
-                    <h4><i></i>${title}</h4>
-                    <div class="recommendInfoBox">
-                        <div class="clearfix recommendInfoItemBox ${className + 'box'}">
-                        </div>
-                    </div>
-                </div>`
-    $('.recommendWrap').append(str)
-    let childrenNodeStr = ''
-    if(hasInfo) {
-        for (let i = 0; i < data.length; i++) {
-            childrenNodeStr += `<span class="recommendInfoItem recommendInfoItemHasInfo">
-                                    ${data[i].name}
-                                    <span  title="点击i图标可查看详细说明" class="infoMsg" data-name=${data[i].name}></span>
-                                </span>`
-        }
-    } else {
-        for (let i = 0; i < data.length; i++) {
-            childrenNodeStr += `<span class="recommendInfoItem" data-name="${data[i].name}">
-                                    ${data[i].name}
-                                </span>`
-        }
-    }
-    if(!childrenNodeStr) {
-        childrenNodeStr='<span class="recommendNull">暂无推荐</span>'
-    }
+function renderRecommendInfo(showNum,className,title,data, hasInfo, type, position) {
+    // const dataLen = data.length
+    // const str = `<div class="recommendInfoWrapper ${className}">
+    //                 <h4><i></i>${title}</h4>
+    //                 <div class="recommendInfoBox">
+    //                     <div class="clearfix recommendInfoItemBox ${className + 'box'}">
+    //                     </div>
+    //                 </div>
+    //             </div>`
+    // $('.recommendWrap').append(str)
+    // let dataShort
+    // if(showNum&& dataLen > showNum) {
+    //     dataShort = data.slice(0, showNum)
+    // } else {
+    //     dataShort = data
+    // }
+    // let childrenNodeStrShort = ''
+    // let childrenNodeStrLong = ''
+    // if(hasInfo) {
+    //     for (let i = 0; i < dataShort.length; i++) {
+    //         dataShort += `<span class="recommendInfoItem recommendInfoItemHasInfo">
+    //                                 ${dataShort[i].name}
+    //                                 <span  title="点击i图标可查看详细说明" class="infoMsg" data-name=${dataShort[i].name}></span>
+    //                             </span>`
+    //     }
+    //     for (let i = 0; i < data.length; i++) {
+    //         childrenNodeStrLong += `<span class="recommendInfoItem recommendInfoItemHasInfo">
+    //                                 ${data[i].name}
+    //                                 <span  title="点击i图标可查看详细说明" class="infoMsg" data-name=${data[i].name}></span>
+    //                             </span>`
+    //     }
+    // } else {
+    //     for (let i = 0; i < dataShort.length; i++) {
+    //         childrenNodeStrShort += `<span class="recommendInfoItem" data-name="${dataShort[i].name}">
+    //                                 ${dataShort[i].name}
+    //                             </span>`
+    //     }
+    //     for (let i = 0; i < data.length; i++) {
+    //         childrenNodeStrLong += `<span class="recommendInfoItem" data-name="${data[i].name}">
+    //                                 ${data[i].name}
+    //                             </span>`
+    //     }
+    // }
+    // if(!childrenNodeStrShort) {
+    //     childrenNodeStrShort='<span class="recommendNull">暂无推荐</span>'
+    // }
     
-    $('.'+className + 'box').append(childrenNodeStr)
-    $('.'+className + 'box' +' .infoMsg').on('click', function(){
-        const infoMsgName = $(this).attr('data-name')
-        openNewWin(`information.html?type=${type}&position=${position}&name=${infoMsgName}`)
-    })
-    slideToggle($("."+className+"box"))
+    // $('.'+className + 'box').append(childrenNodeStrShort)
+    // $('.'+className + 'box' +' .infoMsg').on('click', function(){
+    //     const infoMsgName = $(this).attr('data-name')
+    //     openNewWin(`information.html?type=${type}&position=${position}&name=${infoMsgName}`)
+    // })
+    // slideToggle($("."+className+"box"))
 }
 
 function renderMultRecommendInfo(className,title,data, hasInfo, type, position) {