基础样式

src/css/common.less

@@ -1,38 +1,39 @@
-@import './reset.css';
-@grayColor:#D1D1D1; //边框
-@bgcBlue:#ECF4FC; //背景蓝色
-@colorBlue:#267FD7;  //hover
-@bgcWaring:#FDF4EE; //病情提示
-@colorWaring:#FF545B; //警惕
-@bgcPlan:#E3FEFE; //治疗
-@bgcMay:#FAEBEC; //疑似，警惕，可能
-@bgcModal:#DFEAFE; //弹窗头
+@import "./reset.css";
+@grayColor: #d1d1d1; //边框
+@bgcBlue: #ecf4fc; //背景蓝色
+@colorBlue: #267fd7; //hover
+@bgcWaring: #fdf4ee; //病情提示
+@colorWaring: #FF7836; //警惕
+@bgcPlan: #e3fefe; //治疗
+@bgcMay: #faebec; //疑似，警惕，可能
+@bgcModal: #dfeafe; //弹窗头
 @tabColor: #777; // 右侧大Tab文字颜色
-@staticMainColor: #2A9BD5; // 静态知识主要颜色
+@staticMainColor: #4f9ff3; // 静态知识主要颜色
+@fontColor: #666;
 .disCopy {
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
-.ellipsis{
-    white-space: nowrap;/*强制在一行显示*/
-	text-overflow:ellipsis;/*设置超出内容显示...*/
-	overflow: hidden;/*一定不能少 超出的内容进行隐藏*/
+.ellipsis {
+  white-space: nowrap; /*强制在一行显示*/
+  text-overflow: ellipsis; /*设置超出内容显示...*/
+  overflow: hidden; /*一定不能少 超出的内容进行隐藏*/
+}
+.clearfix:after {
+  content: "";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
+
+.clearfix {
+  zoom: 1;
 }
-.clearfix:after{
-    content: ""; 
-    display: block; 
-    height: 0; 
-    clear: both; 
-    visibility: hidden;  
-  }
-  
-  .clearfix {
-    zoom: 1; 
-  }
 
 // 文本编辑器返回dom样式
 .ql-align-right {
@@ -59,7 +60,7 @@
     width: 100%;
     height: 100%;
     background: #000;
-    opacity: .3;
+    opacity: 0.3;
     z-index: 999;
   }
   .inner-box {
@@ -73,7 +74,7 @@
     border-radius: 4px;
   }
   .title {
-    border-bottom: 1px #EBEBEB solid;
+    border-bottom: 1px #ebebeb solid;
     height: 40px;
     line-height: 40px;
     span {

src/html/cdssHorizontal.html

@@ -26,10 +26,11 @@
         </span>
        
       </div>
-      <div class="tabList">
-
-      </div>
+      
       <div class="contentBox">
+        <div class="tabList">
+
+        </div>
         <div class="recommendWrap moduleWrapper clearfix">
           <div class="leftWrapper">
             <div class="leftBox"></div>

src/js/cdssHorizontal.js

@@ -140,13 +140,15 @@ function renderTab(tabList) {
   for (let i = 0; i < tabList.length; i++) {
     if (tabList[i].status == '1') {
       TabNum++
-      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>`
+      tabStr += `<span class="tab" data-name="${tabList[i].code}" ><span class="tabName">${tabList[i].name}</span><span class="activeLine"></span></span>`
     }
 
   }
   $(".tabList").append(tabStr)
   $(".tabList .tab").eq(0).addClass("activeTab")
-  $(".tabList .tab").css("height", 1 / TabNum * 100 + '%')
+  $(".tabList .tab").eq(0).addClass("activeTab")
+  $(".tabList .tab .activeLine").eq(0).css({ display: "block" })
+  // $(".tabList .tab").css("height", 1 / TabNum * 100 + '%')
   let showModuleName = $(".tabList .tab").eq(0).attr("data-name")
   getModuleShow(moduleConfig[showModuleName])
   bindTabClick()
@@ -218,7 +220,9 @@ function isNeedwriteStandardPush(list) {
 function bindTabClick() {
   $(".tabList .tab").on("click", function () {
     $(".activeTab").removeClass("activeTab")
+    $(".tabList .tab .activeLine").css({ display: "none" })
     $(this).addClass("activeTab")
+    $(this).find('.activeLine').css({ display: "block" })
     const moduleName = $(this).attr("data-name")
     getModuleShow(moduleConfig[moduleName])
   })
@@ -233,7 +237,7 @@ function setTabNameTop() {
   tabNameList = $(".tabList .tab .tabName")
   for (let i = 0; i < tabNameList.length; i++) {
     let tabNameHei = $(".tabList .tab .tabName").eq(i).height()
-    $(".tabList .tab .tabName").eq(i).css("marginTop", -tabNameHei / 2 + "px")
+    // $(".tabList .tab .tabName").eq(i).css("marginTop", -tabNameHei / 2 + "px")
   }
 }
 function renderCaseWrite() {
@@ -662,9 +666,9 @@ function moreInfo() {
     console.log(name)
     openNewWin(`staticInfo.html?type=${encodeURIComponent(type)}&position=0&name=${encodeURIComponent(name)}&page=1`)
   })
-  
+
 }
-function pushItemName(){
+function pushItemName() {
   $('.pushItemName').off("click").click(function () {
     console.log(11)
     const name = $(this).parent().attr('data-name')

src/js/followUp.js

@@ -1,149 +1,162 @@
 var $ = require("jquery");
-var { post,config,getUrlArgObject,openNewWin,isIe8 ,openNewWin} = require('./promise.js');
+var { post, config, getUrlArgObject, openNewWin, isIe8, openNewWin } = require('./promise.js');
 let showImg = require('./../images/show2.png').replace(/^undefined/g, '')
 let collapseImg = require('./../images/collapse2.png').replace(/^undefined/g, '')
 let emptyImg = require('./../images/empty3.png').replace(/^undefined/g, '')
-function getFollowUp(msg){
+let lisStrFrontIcon = require('./../images/lisStrFront-icon.png').replace(/^undefined/g, '')
+let pacsStrFrontIcon = require('./../images/pacsStrFront-icon.png').replace(/^undefined/g, '')
+let rightIcon = require('./../images/right-icon.png').replace(/^undefined/g, '')
+function getFollowUp(msg) {
     return post(config.followUp, msg)
 }
 let hospitalId = getUrlArgObject('hospitalId') || ''
-let mrId = getUrlArgObject('mrId') 
-function renderFollowUp(msg,type){
-    getFollowUp(msg).then(res =>{
-        if(res.data.code === "0"){
-            const result = res.data.data&&res.data.data.pushPlans || []
-            if(result.length === 0||(result[0]&&result[0].item&&JSON.stringify(result[0].item)==="{}")){
+let mrId = getUrlArgObject('mrId')
+function renderFollowUp(msg, type) {
+    getFollowUp(msg).then(res => {
+        if (res.data.code === "0") {
+            const result = res.data.data && res.data.data.pushPlans || []
+            if (result.length === 0 || (result[0] && result[0].item && JSON.stringify(result[0].item) === "{}")) {
                 followEmpty()
                 return
             }
-            renderPage(result,type)
-        }else{
+            renderPage(result, type)
+        } else {
             followEmpty()
         }
     })
 }
-function renderPage(data,type){
+function renderPage(data, type) {
     const operaItem = data[0] || {}
     const operaItemName = operaItem.item || {}
     let operaItemDetail = operaItem.pushPlanDetails || []
-    renderName(operaItemName) 
-    if(type){
-        operaItemDetail=operaItemDetail.splice(0,1)
+    renderName(operaItemName)
+    if (type) {
+        operaItemDetail = operaItemDetail.splice(0, 1)
         renderDetailHorizontal(operaItemDetail)
-    }else{
+    } else {
         renderBtn(operaItemDetail)
         renderDetail(operaItemDetail)
         checkDom()
-    }   
+    }
 }
-function renderName(data){
-      const operationTime = data.dateValue&&getTime(data.dateValue)
-      const  operationName = data.name || ""
-      const str = `<div class="operaNameWrap" id="operaNameWrap"><div class="operaNameBox">患者于<span class="operaNameBold">${operationTime}</span>进行<span class="operaNameBold">${operationName}</span>。根据临床路径要求，特制订检验检查计划如下。</div></div>`
-      $(".followUpWrap").append(str)
+function renderName(data) {
+    const operationTime = data.dateValue && getTime(data.dateValue)
+    const operationName = data.name || ""
+    const str = `<div class="operaNameWrap" id="operaNameWrap"><div class="operaNameBox">患者于<span class="operaNameBold">${operationTime}</span>进行<span class="operaNameBold">${operationName}</span>。根据临床路径要求，特制订检验检查计划如下。</div></div>`
+    $(".followUpWrap").append(str)
 }
-function renderDetailHorizontal(data){
-   let str = ``
-   for(let i = 0; i < data.length; i++){
-       const item = data[i]
-       const lisArr = item.lis || []
-       const pacsArr = item.pacs || []
-       let lisStr=``
-       let pacsStr=``
-       let title = `<p>${getTime(item.examineDate)}（${item.description&&(item.description)}）</p>`
-       for(let i = 0; i < lisArr.length; i++){
-        lisStr += `<div style="position:relative"><span class="circle"></span>${lisArr[i]}</div>`
-       }
-       for(let i = 0; i < pacsArr.length; i++){
-        pacsStr += `<div style="position:relative"><span class="circle"></span>${pacsArr[i]}</div>`
-       }
-       str += `<div class="infoBox">
+function renderDetailHorizontal(data) {
+    let str = ``
+    for (let i = 0; i < data.length; i++) {
+        const item = data[i]
+        const lisArr = item.lis || []
+        const pacsArr = item.pacs || []
+        let lisStr = ``
+        let pacsStr = ``
+        let title = `<p>${getTime(item.examineDate)}（${item.description && (item.description)}）</p>`
+        for (let i = 0; i < lisArr.length; i++) {
+            lisStr += `<div style="position:relative"><span class="circle"></span>${lisArr[i]}</div>`
+        }
+        for (let i = 0; i < pacsArr.length; i++) {
+            pacsStr += `<div style="position:relative"><span class="circle"></span>${pacsArr[i]}</div>`
+        }
+        str += `<div class="infoBox">
             ${title}
             <div class="checkFront lisBox">
-            <span class="lisStrFront">检验</span>
+            <div class="lisStrFront">
+                <img src="${lisStrFrontIcon}" alt="" />
+                <span>检验</span>
+            </div>
+            
             <div>${lisStr}</div>
            </div>
            <div class="checkFront pacsBox">
-            <span class="pacsStrFront">检查</span>
+           <div class="pacsStrFront">
+           <img src="${pacsStrFrontIcon}" alt="" />
+            <span>检查</span>
+           </div>
+            
             <div>${pacsStr}</div>
            </div>
        </div>`
-   }
-   $(".followUpWrap").append(`<div class="infoWrap">${str}<div class="readMorePlan"><a>查看更多计划</a></div></div>`)
+    }
+    $(".followUpWrap").append(`<div class="infoWrap">${str}<div class="readMorePlan"><a>查看更多计划</a>
+        <img src="${rightIcon}" alt="" />
+    </div></div>`)
     showMoreCheck()
 }
-function showMoreCheck(){
-  $(".readMorePlan a").on("click", function(){
-    openNewWin(`cdssPlan.html?mrId=${mrId}&hospitalId=${hospitalId}`)
-  })
+function showMoreCheck() {
+    $(".readMorePlan a").on("click", function () {
+        openNewWin(`cdssPlan.html?mrId=${mrId}&hospitalId=${hospitalId}`)
+    })
 }
-function renderDetail(data){
-   let historyStr = ``
-   let laterStr = ``
-   for(let i = 0; i < data.length; i++){
-       const item = data[i]
-       const lisArr = item.lis || []
-       const pacsArr = item.pacs || []
-       let lisStr=``
-       let pacsStr=``
-       let title = `<p class="infoBoxTitle">${getTime(item.examineDate)}${item.description?'('+item.description+')':''} <img class="toggleInfo" src="${showImg}"/></p>`
-       for(let i = 0; i < lisArr.length; i++){
-        lisStr += `<div class="lisItem"><span class="circle"></span>${lisArr[i]}</div>`
-       }
-       for(let i = 0; i < pacsArr.length; i++){
-        pacsStr += `<div  class="lisItem"><span class="circle"></span>${pacsArr[i]}</div>`
-       }
-       if(item.history === 1){
-        historyStr+=`<div class="infoBox historyBox" >
+function renderDetail(data) {
+    let historyStr = ``
+    let laterStr = ``
+    for (let i = 0; i < data.length; i++) {
+        const item = data[i]
+        const lisArr = item.lis || []
+        const pacsArr = item.pacs || []
+        let lisStr = ``
+        let pacsStr = ``
+        let title = `<p class="infoBoxTitle">${getTime(item.examineDate)}${item.description ? '(' + item.description + ')' : ''} <img class="toggleInfo" src="${showImg}"/></p>`
+        for (let i = 0; i < lisArr.length; i++) {
+            lisStr += `<div class="lisItem"><span class="circle"></span>${lisArr[i]}</div>`
+        }
+        for (let i = 0; i < pacsArr.length; i++) {
+            pacsStr += `<div  class="lisItem"><span class="circle"></span>${pacsArr[i]}</div>`
+        }
+        if (item.history === 1) {
+            historyStr += `<div class="infoBox historyBox" >
             ${title}
             <div class="childrenBox">
-                ${lisArr.length>0?`<div class="lisBox"><span class="itemBoxTitle">检验</span>${lisStr}</div>`:""}
-                ${pacsArr.length>0?`<div class="pacsBox"><span class="itemBoxTitle">检查</span>${pacsStr}</div>`:""}
+                ${lisArr.length > 0 ? `<div class="lisBox"><span class="itemBoxTitle">检验</span>${lisStr}</div>` : ""}
+                ${pacsArr.length > 0 ? `<div class="pacsBox"><span class="itemBoxTitle">检查</span>${pacsStr}</div>` : ""}
             </div>
         </div>`
-       }else{
-        laterStr += `<div class="infoBox">
+        } else {
+            laterStr += `<div class="infoBox">
             ${title}
             <div class="childrenBox">
-                ${lisArr.length>0?`<div class="lisBox"><span class="itemBoxTitle">检验</span>${lisStr}</div>`:""}
-                ${pacsArr.length>0?`<div class="pacsBox"><span class="itemBoxTitle">检查</span>${pacsStr}</div>`:""}
+                ${lisArr.length > 0 ? `<div class="lisBox"><span class="itemBoxTitle">检验</span>${lisStr}</div>` : ""}
+                ${pacsArr.length > 0 ? `<div class="pacsBox"><span class="itemBoxTitle">检查</span>${pacsStr}</div>` : ""}
             </div>
         </div>`
-       }
-      
-   }
-   $(".followUpWrap").append(`<div class="infoWrap" id="infoWrap">
+        }
+
+    }
+    $(".followUpWrap").append(`<div class="infoWrap" id="infoWrap">
         <div class="historyWrap">${historyStr}</div>
         <div class="laterWrap">${laterStr}</div>
     </div>`)
     // adjustHeight()
     bindToggleInfo()
-  
+
 }
-function renderBtn(data){
-    const hasBtn = data[0]&&data[0].history&&data[0].history === 1
-    if(!hasBtn){
+function renderBtn(data) {
+    const hasBtn = data[0] && data[0].history && data[0].history === 1
+    if (!hasBtn) {
         return
     }
     const str = `<div class="btnBox" id="btnBox"><span class="btnName">显示历史计划</span></div>`
     $(".followUpWrap").append(str)
     bindToggleHistory()
-  
+
 }
 function adjustHeight() {
     var containerHt = $(".contentWrapper").height()
     var ht1 = $(".operaNameWrap").height()
     var ht2 = $(".btnBox").height()
-    $(".followUpWrap  .infoWrap").height(containerHt -ht1- ht2-30 + "px");
-    $(".infoWrap").preventScroll();  
+    $(".followUpWrap  .infoWrap").height(containerHt - ht1 - ht2 - 30 + "px");
+    $(".infoWrap").preventScroll();
 }
-function getTime(time){
-    if(!time){
+function getTime(time) {
+    if (!time) {
         return ``
     }
-    date = time.replace('-','/')
+    date = time.replace('-', '/')
     const year = new Date(date).getFullYear()
-    const month = new Date(date).getMonth()+1
+    const month = new Date(date).getMonth() + 1
     const day = new Date(date).getDate()
     return `${year}年${month}月${day}日`
 }
@@ -156,12 +169,12 @@ function checkDom() {
     let dom2 = document.getElementById('btnBox')
     let dom3 = document.getElementById('infoWrap')
     let dom2Hei = $("#btnBox").height()
-    if(dom1Hei!==0&&(dom2&&dom2Hei!=0 || !dom2)&&dom3) {
-         //  执行dom加载完成后的操作
-    
-         adjustHeight()
+    if (dom1Hei !== 0 && (dom2 && dom2Hei != 0 || !dom2) && dom3) {
+        //  执行dom加载完成后的操作
+
+        adjustHeight()
         //  清除定时器
-        if(!cheakDomTimer) {
+        if (!cheakDomTimer) {
             clearTimeout(cheakDomTimer)
         }
     } else {
@@ -169,29 +182,29 @@ function checkDom() {
         cheakDomTimer = setTimeout(checkDom, 200)
     }
 }
-function bindToggleHistory(){
-    $(document).on("click",".btnName",function(){
+function bindToggleHistory() {
+    $(document).on("click", ".btnName", function () {
         const btnText = $(".btnName").text()
-        if(btnText==="显示历史计划"){
+        if (btnText === "显示历史计划") {
             $(".btnName").text("隐藏历史计划")
-        }else{
+        } else {
             $(".btnName").text("显示历史计划")
         }
         $(".historyWrap").slideToggle()
     })
 }
-function bindToggleInfo(){
-    $(document).on("click",".infoBoxTitle",function(){
-        const img =  $(this).parents(".infoBox").find(".toggleInfo").attr("src")
-        if(img === showImg){
-            $(this).parents(".infoBox").find(".toggleInfo").attr("src",collapseImg)
-        }else{
-            $(this).parents(".infoBox").find(".toggleInfo").attr("src",showImg)
+function bindToggleInfo() {
+    $(document).on("click", ".infoBoxTitle", function () {
+        const img = $(this).parents(".infoBox").find(".toggleInfo").attr("src")
+        if (img === showImg) {
+            $(this).parents(".infoBox").find(".toggleInfo").attr("src", collapseImg)
+        } else {
+            $(this).parents(".infoBox").find(".toggleInfo").attr("src", showImg)
         }
         $(this).parents(".infoBox").find(".childrenBox").slideToggle()
     })
 }
-function followEmpty(){
+function followEmpty() {
     let str = `<div class="emptyBox">
         <img class="emptyImg" src=${emptyImg}>
         <p class="emptyTxt">暂无随访计划</p>
@@ -199,14 +212,14 @@ function followEmpty(){
     $(".followUpWrap").append(str)
 }
 
-$(window).on('resize', function(){
-    if(window.location.href.indexOf('cdssHorizontal')>-1){
+$(window).on('resize', function () {
+    if (window.location.href.indexOf('cdssHorizontal') > -1) {
         return
     }
     adjustHeight()
 })
 
-module.exports ={
+module.exports = {
     renderFollowUp,
     followEmpty
 }

webpack.config.js

@@ -4,7 +4,8 @@ const CleanWebpackPlugin = require('clean-webpack-plugin') // 清空打包目录
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
-const proxyHost = "http://192.168.2.236:6060";
+// const proxyHost = "http://192.168.2.236:6060";
+const proxyHost = "http://192.168.2.241:5654";
 module.exports = {
   entry: {
     index: path.resolve(__dirname, 'src/js', 'index.js'),
@@ -25,13 +26,13 @@ module.exports = {
     cdssHorizontal: path.resolve(__dirname, 'src/js', 'cdssHorizontal.js'),
     smartAlert: path.resolve(__dirname, 'src/js', 'smartAlert.js'),
     caseWriteStandard: path.resolve(__dirname, 'src/js', 'caseWriteStandard.js'),
-    generalTreat:path.resolve(__dirname, 'src/js', 'generalTreat.js'),
-    cdssPlan:path.resolve(__dirname, 'src/js', 'cdssPlan.js'),
-    check:path.resolve(__dirname, 'src/js', 'check.js'),
-    homeStatic:path.resolve(__dirname, 'src/js', 'homeStatic.js'),
-    searchStaticList:path.resolve(__dirname, 'src/js', 'searchStaticList.js'),
-    staticInfo:path.resolve(__dirname, 'src/js', 'staticInfo.js'),
-    staticInfoOut:path.resolve(__dirname, 'src/js', 'staticInfoOut.js'),
+    generalTreat: path.resolve(__dirname, 'src/js', 'generalTreat.js'),
+    cdssPlan: path.resolve(__dirname, 'src/js', 'cdssPlan.js'),
+    check: path.resolve(__dirname, 'src/js', 'check.js'),
+    homeStatic: path.resolve(__dirname, 'src/js', 'homeStatic.js'),
+    searchStaticList: path.resolve(__dirname, 'src/js', 'searchStaticList.js'),
+    staticInfo: path.resolve(__dirname, 'src/js', 'staticInfo.js'),
+    staticInfoOut: path.resolve(__dirname, 'src/js', 'staticInfoOut.js'),
     vendor: 'lodash'// 多个页面所需的公共库文件，防止重复打包带入
   },
   output: {
@@ -369,7 +370,7 @@ module.exports = {
         collapseWhitespace: true //删除空白符与换行符
       }
     }),
-    
+
     new HtmlWebpackPlugin({
       title: 'view',
       template: path.resolve(__dirname, 'src/html', 'view.html'),
@@ -404,7 +405,7 @@ module.exports = {
             except: ['e']
           },
           output: {
-              beautify: true
+            beautify: true
           },
           sourceMap: false
         }
@@ -423,13 +424,13 @@ module.exports = {
       }
     }
   },
-      
+
   module: {
     rules: [
       {
-          test: /.js$/,
-          enforce: 'post', 
-          loader: 'es3ify-loader'
+        test: /.js$/,
+        enforce: 'post',
+        loader: 'es3ify-loader'
       },
       {
         test: /\.m?js$/,
@@ -437,26 +438,27 @@ module.exports = {
         use: {
           loader: 'babel-loader',
           options: {
-            presets:['@babel/preset-env']
+            presets: ['@babel/preset-env']
           }
         }
       },
       {
         test: /\.css$/,
         use: [{
-            loader: MiniCssExtractPlugin.loader
-          },
+          loader: MiniCssExtractPlugin.loader
+        },
           'css-loader'
         ]
       },
       {
         test: /\.less$/,
-        use : [
+        use: [
           MiniCssExtractPlugin.loader,
           { loader: "css-loader" },
           { loader: "less-loader" }
-      ]},
-      { 
+        ]
+      },
+      {
         test: /\.(png|jpg|jpeg|gif|svg)$/,
         use: {
           loader: 'file-loader',
@@ -478,7 +480,7 @@ module.exports = {
     },
     hot: true,
     // openPage:'index.html?age=28&tipsName=血常规&tipsType=12&diseaseId=280&lisJson=&diagJson=急性胰腺炎&diseaseName=糖尿病&pastJson=无心脏病&otherJson=无高血压&pacsJson=腹部B超:无异常,%20报告日期:2019-05-07&sex=男&symptomJson=恶心呕吐腰痛&vitalJson=血压左上肢13/12mmHg&hospitalCode=A001',
-    openPage:'homeStatic.html?mrId=200821362618001909&hospitalId=1&planCode=plan_default'
+    openPage: 'homeStatic.html?mrId=200821362618001909&hospitalId=1&planCode=plan_default'
   },
   stats: { children: false }
 }