竖版样式1

src/css/cdss.less

@@ -21,12 +21,12 @@ body{
 .responsibility {
     text-align: center;
     font-size: 12px;
-    color: #979797;
+    color: #aaa;
     padding-bottom: 5px;
     position: fixed;
-    left: 0;
+    left: 40px;
     width: 100%;
-    bottom: 23px;
+    bottom: 40px;
     background-color: #fff;
     z-index: 1;
 }
@@ -34,10 +34,10 @@ body{
     height: 24px;
     width: 100%;
     line-height: 24px;
-    position: fixed;
+    position: absolute;
     bottom: 0;
     background-color: #EFF1F6;
-    left: 0;
+    left: 40px;
     z-index: 98;
     .version-tip{
         margin-left: 20px;
@@ -54,6 +54,7 @@ body{
     .version-txt,.disclaimerInfoTxt{
         font-size: 12px;
         color: #777;
+        border-bottom: 1px solid #777;
     }
     .version-txt:hover{
         border-bottom: 1px solid #000;
@@ -68,7 +69,7 @@ body{
     .disclaimerInfo {
         float: right;
         font-size: 12px;
-        margin-right: 20px;
+        margin-right: 60px;
     }
 }
 
@@ -113,19 +114,19 @@ body{
     top: 100px;
 }
 .emptyImg{
-    width: 120px;
+    width: 90px;
     position: relative;
     left: 50%;
-    margin-left: -60px;
+    margin-left: -45px;
 }
 .emptyImgSearch{
     width: 100px;
 }
 .emptyTxt{
     text-align: center;
-    color: #AAA;
-    font-size: 12px;
-    margin-top: 15px;
+    color: #999;
+    font-size: 14px;
+    margin-top: 10px;
 }
 .loading{
     position: fixed;
@@ -202,13 +203,6 @@ body{
 
 
 // CDSS6.0
-.longBox,.shortBox{
-  padding: 4px 10px;
-  border-bottom: 1px #E6E6E6 dashed;
-  &:last-child{
-    border-bottom: none;
-  }
-}
 .diag{
     .longBox,.shortBox{
         padding: 0 10px 8px;
@@ -228,12 +222,12 @@ body{
    
 }
 .infoImg{
-    width: 15px;
+    width: 9px;
     position: absolute;
-    top: 2px;
+    top: 6px;
     cursor: pointer;
     display: none;
-    right: 2px;
+    right: 5px;
 }
 .pushItemBox:hover{
     .infoImg{
@@ -271,6 +265,12 @@ body{
 }
 .moduleBox{
   padding:0 14px;
+  .longBox,.shortBox{
+    border-bottom: 1px #E6E6E6 dashed;
+  }
+  &:last-child .longBox,&:last-child  .shortBox{
+    border-bottom: none;
+  }
 }
 .moduleBoxTitle{
   color: @fontClr;
@@ -283,17 +283,24 @@ body{
 .iconMark{
     width: 4px;
     position: absolute;
-    left: 20px;
+    left: 15px;
     top: 3px;
 }
 .billingPushItem{
-    padding: 0 10px 0 30px;
+    padding: 0 10px 0 24px;
     position: relative;
 }
 .moduleItem{
     border-radius: 8px;
     box-shadow: 0px 5px 5px 0px @shadowColor;
     margin-bottom: 10px;
+    padding-bottom: 10px;
+  .longBox,.shortBox{
+    padding: 4px 0;
+  }
+  &>.longBox,&>.shortBox{
+    padding: 4px 14px;
+  }
 }
 .tabList{
   margin-bottom: 8px;
@@ -329,7 +336,7 @@ body{
     height: 480px;
     // width: 100%;
     /* right: 30px; */
-    left: 0; 
+    left: 40px;
     overflow: auto;
 }
 .warning{
@@ -348,7 +355,7 @@ body{
     margin-right: 15px;
 }
 .medicalKonwledgeWrap{
-    padding: 0 30px;
+
 }
 .newIcon{
     width: 27px;
@@ -432,19 +439,24 @@ body{
 }
 .tcm-item {
   display: none;
-  margin: 0 15px 10px;
+  margin: 0 0 10px;
   border: 1px #EEF5FD solid;
   border-radius: 8px;
+  box-shadow: 0px 5px 5px 0px #D3D8D9;
+  &.go-push .title{
+    border-radius: 8px;
+  }
   .title {
-    background: #EEF5FD;
-    height: 30px;
-    line-height: 30px;
+    background: @pushBgColor;
+    height: 35px;
+    line-height: 35px;
     padding: 0 12px;
     border-radius: 8px 8px 0px 0px;
     img {
       vertical-align: middle;
-      width: 24px;
-      height: 24px;
+      width: 20px;
+      height: 20px;
+      margin-right: 3px;
     }
     .h2 {
       font-weight: bold;
@@ -454,8 +466,8 @@ body{
     .go {
       float: right;
       margin-right: 10px;
-      font-size: 12px;
-      color: #333;
+      font-size: 14px;
+      color: @linkColor;
       text-decoration: none;
       cursor: pointer;
       img {
@@ -484,7 +496,7 @@ body{
   }
   .detail {
     margin: 0 10px;
-    border-top: 1px #E6E6E6 solid;
+    border-top: 1px #E6E6E6 dashed;
     padding-top: 5px;
     /*max-height: 134px;*/
     overflow-y: hidden;
@@ -528,8 +540,8 @@ body{
     .a-link {
       display: inline-block;
       width: 100%;
-      border: 1px #3B9ED0 solid;
-      color: #3B9ED0;
+      border: 1px @linkColor solid;
+      color: @linkColor;
       height: 30px;
       line-height: 30px;
       border-radius: 4px;

src/css/cdssPlan.less

@@ -128,9 +128,9 @@ body{
 }
 .emptyTxt{
     text-align: center;
-    color: #AAA;
-    font-size: 12px;
-    margin-top: 15px;
+    color: #999;
+    font-size: 14px;
+    margin-top: 10px;
 }
 // .titleIcon{
 //     width: 16px;

src/css/common.less

@@ -11,6 +11,8 @@
 @warnColor:#FF8042;   //错误提示颜色
 @suggerColor:#267FD7; //推送颜色
 @treatColor:#1ECEBD; //治疗颜色
+@pushBgColor:#E3F0FF; //推送title背景颜色
+@markFontColor:#1E1E1E; //着重色
 
 
 @grayColor:#D1D1D1; //边框

src/css/followUpV.less

@@ -1,9 +1,12 @@
+@import "./common.less";
+/*******随访计划*********/
 .operaNameBox{
     background: #EFF1F6;
     line-height: 22px;
     padding: 0px 14px;
     font-size: 12px;
-    color: #777777;
+    color: @txtColor;
+    border-radius: 2px;
 }
 .operaNameBold{
     color: #1e1e1e;
@@ -17,9 +20,9 @@
 .btnName{
     display: inline-block;
     padding: 4px 10px;
-    background:#E7F3F9;
+    background:@pushBgColor;
     font-size: 12px;    
-    color: #3B9ED0;
+    color: @linkColor;
     border-radius: 12px;
     cursor: pointer;
 }
@@ -29,7 +32,7 @@
 }
 .infoBoxTitle{
     line-height: 40px;
-    color: #1E1E1E;
+    color: @markFontColor;
     font-size: 14px;
     position: relative;
     cursor: pointer;
@@ -91,7 +94,7 @@
     display: none;
 }
 .followUpWrap .emptyBox{
-    margin-top: 80px;
+    margin-top: 100px;
     text-align: center;
 }
 .followUpWrap .emptyImg{
@@ -99,8 +102,4 @@
     position: relative; 
     left: 0; 
     margin-left: 0;
-}
-.followUpWrap .emptyTxt{
-    color: #AAAAAA;
-    font-size: 12px;
 }

src/css/staticSearch.css

@@ -1,3 +1,4 @@
+@import "common.less";
 html{
     background: #fff;
     font-family: '微软雅黑', '宋体';
@@ -23,8 +24,9 @@ html{
 }
 .container .ipt {
     width: 100%;
-    height: 34px;
-    padding: 5px 25px 5px 5px;
+    height: 36px;
+    padding: 6px 25px 6px 5px;
+    border-radius: 4px 0px 0px 4px;
     vertical-align: top;
     display: inline-block;
     box-sizing: border-box;
@@ -34,6 +36,7 @@ html{
     width: 100%;
     position: relative;
     top: 1px;
+    font-size: 14px;
     font-family: '微软雅黑', '宋体';
 }
 
@@ -42,13 +45,14 @@ html{
     right: 0;
     top: 10px;
     width: 80px;
-    height: 34px;
-    line-height: 34px;
+    height: 36px;
+    line-height: 36px;
     color: #fff;
-    background: #2A9BD5;
+    font-size: 14px;
+    background: @bgcBlue;
+    border-radius: 0px 4px 4px 0px;
     text-align: center;
     border: none;
-    font-family: '微软雅黑', '宋体';
 }
 .container .staticSearchT i {
     position: absolute;
@@ -74,35 +78,44 @@ html{
     position: relative;
 }
 .staticSearchB .inputWarning{
-    color: #1E1E1E;
+    color: @fontClr;
 }
 
 .staticSearchB ul {
     position: absolute;
     height: 480px;
     /* width: 100%; */
-    right: 30px;
-    left: 30px;
+    right: 18px;
+    left: 22px;
     overflow: auto;
     padding: 0 30px;
 }
 .staticSearchB ul li {
-    border-bottom: 1px #CECECE solid;
-    line-height: 30px;
+    border-bottom: 1px #EFEFEF solid;
+    line-height: 32px;
     padding-top: 5px;
     cursor: pointer;
 }
 .staticSearchB ul li:hover {
     border-bottom: 2px solid #3B9ED0;
 }
+.staticSearchB ul  p{
+    color: @fontClr;
+}
 .staticSearchB ul i {
-    font-size: 12px;
-    color: #2A9BD5;
+    font-size: 14px;
+    color: @linkColor;
 }
 .staticSearchB .tip {
-    font-size: 12px;
+    font-size: 16px;
     color: #979797;
-    margin-bottom: 10px;
+    margin-bottom: 5px;
+    img{
+        width: 16px;
+        height: 16px;
+        vertical-align: middle;
+        margin-right: 5px;
+    }
 }
 .staticSearchB ul span {
     color: #979797;
@@ -111,12 +124,13 @@ html{
     line-height: 20px;
 }
 .searchTypeBox {
-    margin: 10px 0 0 0;
+    margin: 10px 0 5px 0;
 }
 .medicalTypeItem{
     display: inline-block;
     margin: 0 20px 10px 0;
     cursor: pointer;
+    color: @fontClr;
 }
 .medicalTypeItem img {
     vertical-align: text-bottom;

src/html/cdss.html

@@ -32,7 +32,7 @@
             <div class="recommendBox">
               <div class="empty">
                 <img class="emptyImg" src="./images/empty2.png" alt="空">
-                <p class="emptyTxt">等待更多内容输入中</p>
+                <p class="emptyTxt">等待内容输入中…</p>
               </div>
               <div class="loading">
                 <div class="loadingMask"></div>
@@ -41,8 +41,8 @@
               </div>
               <p class="responsibility"></p>
             </div>
-            
-            
+
+
           </div>
           <div class="qcWrap moduleWrapper">
   
@@ -60,12 +60,12 @@
                   <div class="searchTypeBox"></div>
       
                   <div class="staticSearchB">
-                      <p class="tip">搜索结果</p>
+                      <p class="tip"><img src="../images/icon_search.png" alt=""/>搜索结果</p>
                       <p class="searching">正在搜索中...</p>
                       <p class="inputWarning">请输入搜索内容！</p>
                       <div class="empty">
                           <img class="emptyImgSearch" src="./images/empty3.png" alt="">
-                        <p>暂无搜索结果~</p>
+                        <p>暂无搜索结果～</p>
                       </div>
                       <ul>
                           
@@ -132,6 +132,7 @@
                         </ul>
                     </div>
                 </div>
+                <p class="responsibility"></p>
             </div>
           <div class="disclaimer clearfix">
             <span class="version-tip"><span class="version-txt">版本说明 <img class="newIcon" src="./images/new.png"></span></span>

src/js/cdss.js

@@ -10,7 +10,7 @@ require('./../css/reset.css');
 require('./../css/cdss.less');
 require('./../css/popup.css');
 require('./../css/followUpV.less');
-require('./../css/staticSearch.css')
+require('../css/staticSearch.less')
 require('./../js/staticSearch.js');//静态知识搜索
 require('./../images/empty.png').replace(/^undefined/g, '')
 require('./../images/empty2.png').replace(/^undefined/g, '')
@@ -609,8 +609,8 @@ function renderItemWrapper(list, showNum, type, hasInfo) {
     shortStr += `<span class="showMore"><img class="iconArrowImg" src="${iconArrowDown}"></span>`
     longStr += `<span class="showLess"><img class="iconArrowImg"  src="${iconArrowUp}"></span>`
     return {
-      shortStr:`<div class="shortBox clearfix">${shortStr}</div>`,
-      longStr:`<div class="longBox clearfix">${longStr}</div>`
+      shortStr:`<div class="shortBox">${shortStr}</div>`,
+      longStr:`<div class="longBox">${longStr}</div>`
     }
   }
 }
@@ -629,11 +629,11 @@ function bindOpenInfo(){
 }
 
 function bindSlide(){
-  $(".showMore").on("click", function(){
+  $(".showMore").off("click").on("click", function(){
     $(this).parent().parent().find(".longBox").css("display","block")
     $(this).parent().parent().find(".shortBox").css("display","none")
   })
-  $(".showLess").on("click", function(){
+  $(".showLess").off("click").on("click", function(){
     $(this).parent().parent().find(".longBox").css("display","none")
     $(this).parent().parent().find(".shortBox").css("display","block")
   })
@@ -703,7 +703,7 @@ function titleStr2(name){
 }
 
 function bindTabClick(){
-  $(".tabList .tab").on("click", function(){
+  $(".tabList .tab").off("click").on("click", function(){
     $(".activeTab").removeClass("activeTab")
     $(this).addClass("activeTab")
     const moduleName = $(this).attr("data-name")
@@ -725,22 +725,22 @@ function getModuleShow(moduleClassName){
   }
 }
 function bindGeneralSlide(){
-  $(".showMoreGeneralTreat").on("click",function(){
+  $(".showMoreGeneralTreat").off("click").on("click",function(){
     $(".generalTreatInfo").toggleClass("isOverFlow")
     $(".showMoreGeneralTreat").toggle()
   })
-  $(".showLessGeneralTreat").on("click",function(){
+  $(".showLessGeneralTreat").off("click").on("click",function(){
     $(".generalTreatInfo").toggleClass("isOverFlow")
     $(".showMoreGeneralTreat").toggle()
   })
   
 }
  function bindSlideCaseWriting(){
-  $(".showMoreCaseWriting").on("click",function(){
+  $(".showMoreCaseWriting").off("click").on("click",function(){
     $(this).parents(".casewritingWrapper ").find(".shortStrBox").css("display","none")
     $(this).parents(".casewritingWrapper ").find(".longStrBox").css("display","block")
   })
-  $(".showLessCaseWriting").on("click",function(){
+  $(".showLessCaseWriting").off("click").on("click",function(){
     $(this).parents(".casewritingWrapper ").find(".shortStrBox").css("display","block")
     $(this).parents(".casewritingWrapper ").find(".longStrBox").css("display","none")
   })

src/js/cdssHorizontal.js

@@ -10,7 +10,7 @@ const $ = require("jquery");
 require('./../css/reset.css');
 require('./../css/cdssHorizontal.less');
 require('./../css/popup.css');
-require('./../css/staticSearch.css')
+require('../css/staticSearch.less')
 require('./../js/staticSearch.js');//静态知识搜索
 require('./../images/empty2.png').replace(/^undefined/g, '')
 require('./../images/dn.png').replace(/^undefined/g, '')

src/js/cdssPlan.js

@@ -10,7 +10,7 @@ require('./../css/reset.css');
 require('./../css/cdssPlan.less');
 require('./../css/popup.css');
 require('./../css/followUpV.less');
-require('./../css/staticSearch.css')
+require('../css/staticSearch.less')
 require('./../js/staticSearch.js')      //静态知识搜索
 require('./../images/empty.png').replace(/^undefined/g, '')
 require('./../images/empty2.png').replace(/^undefined/g, '')

src/js/followUp.js

@@ -122,9 +122,9 @@ function renderDetail(data){
 }
 function renderBtn(data){
     const hasBtn = data[0]&&data[0].history&&data[0].history === 1
-    if(!hasBtn){
+    /*if(!hasBtn){
         return
-    }
+    }*/
     const str = `<div class="btnBox" id="btnBox"><span class="btnName">显示历史计划</span></div>`
     $(".followUpWrap").append(str)
     bindToggleHistory()
@@ -194,7 +194,7 @@ function bindToggleInfo(){
 function followEmpty(){
     let str = `<div class="emptyBox">
         <img class="emptyImg" src=${emptyImg}>
-        <p class="emptyTxt">暂无随访计划</p>
+        <p class="emptyTxt">暂无随访计划～</p>
     </div>`
     $(".followUpWrap").append(str)
 }

src/js/staticSearch.js

@@ -1,10 +1,11 @@
-require('./../css/staticSearch.css');
+require('../css/staticSearch.less');
 require('./../images/del_nor.png')
 var $ = require("jquery");
 var { post,config,getUrlArgObject,openNewWin,isIe8 } = require('./promise.js');
 let checkOffImg = require('./../images/check_off.png')
 let checkOnImg = require('./../images/check_on.png')
 require('./../images/empty3.png').replace( /undefined/g, '')
+require('./../images/icon_search.png').replace( /undefined/g, '')
 
 let searchType = getUrlArgObject("searchType") || ""
 
@@ -124,7 +125,7 @@ function getKnowledgeData(value) {
                 for(var i = 0;i<knowledgeLis.length;i++){
                     var tmpPart = knowledgeLis[i]
                     var tmpLi = `<li data-name='${tmpPart.name}' data-uname='${tmpPart.uniqueName}' data-type='${tmpPart.libTypeId}' data-sign='${tmpPart.type}'>
-                        <p>${tmpPart.name}<i>${tmpPart.typeName?('( '+tmpPart.typeName+' )'):''}</i> <span>${tmpPart.code||''}</span></p>
+                        <p>${tmpPart.name}<i>${tmpPart.typeName?(' ( '+tmpPart.typeName+' )'):''}</i> <span>${tmpPart.code||''}</span></p>
                         ${tmpPart.retrievalName?('<span>• '+tmpPart.retrievalName+'</span>'):''}
                     </li>`
                     lisStr += tmpLi

webpack.config.js

@@ -336,7 +336,8 @@ module.exports = {
   devServer: {
     contentBase: "./dist", //静态文件根目录
     proxy: {
-      '*': proxyHost
+      '/sys': proxyHost,
+      '/lantone': "http://114.55.109.16:81"
     },
     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',