Merge branch 'uiUptate0629' of http://192.168.2.236:10080/zhouna/icssDService into uiUptate0629

src/css/cdss.less

@@ -51,15 +51,11 @@ body{
             // background-size: 27px;
         }
     }
-    .version-txt,.disclaimerInfoTxt{
+    .version-txt i,.disclaimerInfoTxt{
         font-size: 12px;
         color: #777;
         border-bottom: 1px solid #777;
     }
-    .version-txt:hover{
-        border-bottom: 1px solid #000;
-        font-size: 12px;
-    }
     .logo {
         // float: left;
         font-size: 12px;
@@ -120,12 +116,12 @@ body{
     margin-left: -45px;
 }
 .emptyImgSearch{
-    width: 100px;
+    width: 145px;
 }
 .emptyTxt{
     text-align: center;
     color: #999;
-    font-size: 14px;
+    font-size: 12px;
     margin-top: 10px;
 }
 .loading{
@@ -214,31 +210,32 @@ body{
 .pushItemBox{
     position: relative;
     display: inline-block;
-    padding-right: 18px;
 }
 .pushItemName{
     position: relative;
     display: inline-block;
     line-height: 21px;
+    padding-right: 15px;
+    &:hover{
+      .infoImg{
+        display: block;
+      }
+    }
 }
 .infoImg{
     width: 12px;
     position: absolute;
-    top: 4px;
+    top: 5px;
+    right: 3px;
     cursor: pointer;
     display: none;
-    right: 3px;
-}
-.pushItemBox:hover{
-    .infoImg{
-        display: block;
-    }
 }
 .showMore,.showLess{
     display: inline-block;
     cursor: pointer;
-    float: right;
     color: #3B9ED0;
+    position: absolute;
+    right: 14px;
 }
 .moduleTitle{
     height: 35px;
@@ -281,22 +278,23 @@ body{
   border-left:4px solid @suggerColor;
 }
 .iconMark{
-    width: 4px;
+    width: 17px;
     position: absolute;
-    left: 15px;
-    top: 3px;
+    left: 10px;
+    top: 2px;
 }
 .billingPushItem{
     padding: 0 10px 0 24px;
     position: relative;
 }
 .moduleItem{
+    position: relative;
     border-radius: 8px;
     box-shadow: 0px 5px 5px 0px @shadowColor;
     margin-bottom: 10px;
     padding-bottom: 10px;
   .longBox,.shortBox{
-    padding: 4px 12px;
+    padding: 4px 14px;
   }
 }
 .tabList{
@@ -352,9 +350,10 @@ body{
     overflow: auto;
 }
 .warning{
-    background: #FF8042;
+    background: @dangerColor;
     color: #fff;
     padding: 10px 40px;
+    box-shadow: 0px 4px -2px 0px #F9BC9F;
 }
 .warningTitImg{
     width: 20px;
@@ -373,6 +372,7 @@ body{
     width: 27px;
     position: relative;
     top: 2px;
+    left: 15px;
     display: none;
 }
 .new-icon .newIcon{
@@ -412,7 +412,8 @@ body{
     right: 10px;
     bottom: -1px;
     background: #fff;
-    width: 44px;
+    width: 10px;
+    height: 10px;
     box-sizing: border-box;
     img.more {
         position: absolute;
@@ -426,8 +427,19 @@ body{
     float: right;
     color: #3B9ED0;
 }
-.shortStrBox,.longStrBox{
-
+.tips-cont{
+  border-radius: 8px;
+  box-shadow: 0px 5px 5px 0px @shadowColor;
+  .moduleBoxTitle{
+    border-color: #FF8042;
+  }
+  .moduleItem{
+    box-shadow: none;
+    border-bottom:1px #E6E6E6 dashed;
+    &:last-child{
+      border-bottom: none;
+    }
+  }
 }
 .longStrBox{
     display: none;
@@ -517,10 +529,10 @@ body{
     }
     .label {
       float: left;
-      border-left: 2px solid #267FD7;
+      border-left: 4px solid #267FD7;
       padding-left: 5px;
-      line-height: 12px;
-      margin-top: 4px;
+      line-height: 14px;
+      margin-top: 3px;
     }
     .val {
       margin-left: 65px;

src/css/staticInfo.less

@@ -219,6 +219,7 @@
     font-size: 16px;
     font-weight: 400;
     word-wrap: break-word;
+    color: #000;
   }
 
   .anchors .active a {

src/css/staticSearch.less

@@ -72,7 +72,7 @@ html{
 .staticSearchB .empty, .staticSearchB .searching,.staticSearchB .inputWarning{
     color: #979797;
     text-align: center;
-    line-height: 40px;
+    /*line-height: 40px;*/      /**bug8689*/
     margin-top: 10px;
     top: 70px;
     position: relative;

src/html/cdss.html

@@ -64,7 +64,7 @@
                       <p class="searching">正在搜索中...</p>
                       <p class="inputWarning">请输入搜索内容！</p>
                       <div class="empty">
-                          <img class="emptyImgSearch" src="./images/empty3.png" alt="">
+                          <img class="emptyImgSearch" src="./images/icon_no.png" alt="">
                         <p>暂无搜索结果～</p>
                       </div>
                       <ul>
@@ -135,7 +135,7 @@
                 <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>
+            <span class="version-tip"><span class="version-txt"><i>版本说明</i><img class="newIcon" src="./images/new.png"></span></span>
             <span class="logo">&copy; 朗通医疗</span>
             <span class="disclaimerInfo"><span class="disclaimerInfoTxt">免责声明</span></span>
           </div>

src/html/version.html

@@ -32,6 +32,7 @@
     }
     .content{
       padding: 0 45px 40px;
+      color: #333;
     }
   </style>
   <script>

src/js/cdss.js

@@ -15,6 +15,7 @@ require('./../js/staticSearch.js');//静态知识搜索
 require('./../images/empty.png').replace(/^undefined/g, '')
 require('./../images/empty2.png').replace(/^undefined/g, '')
 require('./../images/empty3.png').replace(/^undefined/g, '')
+require('./../images/icon_no.png').replace(/^undefined/g, '')
 require('./../images/loading.gif').replace(/^undefined/g, '')
 require('./../images/right.png').replace(/^undefined/g, '')
 require('./../images/new.png').replace(/^undefined/g, '')
@@ -255,7 +256,6 @@ function renderPushData(){
   return getPushInfo().then(res =>{
     hasCompleteTnterface++
     if(res.data.code == "0"){
-      console.log(1)
       const result = res.data.data
       let diagPush = result.dis ||{}
       let lisPush = result.lis || []
@@ -621,11 +621,10 @@ function renderItemWrapper(list, showNum, type, hasInfo) {
 }
 
 function renderPushItem(item, type) {
-
+  const infoIcon = `${ item.hasInfo == "1" ? `<img class="infoImg" src="${infoImg}">` : "" }`;
   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>`}`
-  str += `${ item.hasInfo == "1" ? `<img class="infoImg" src="${infoImg}">` : "" }`
-  str += '</span >'
+  str += `<span class="pushItemName ${item.hasScale == "1" ? 'evaluationtitle':''}"><i>${type == 8 ? ('【' + item.name + '】') : item.name}</i> ${infoIcon}</span>`
+  str+=`</span>`;
   return str
 }
 
@@ -769,6 +768,10 @@ function empty(){
 
 
 $(function(){
+  //隐藏logo
+  if(getUrlArgObject("hideLg")){
+    $(".disclaimer .logo").hide();
+  }
   getDisclaimer(); //获取免责声明
   getVersion();   //获取版本信息
   $(".disclaimerInfo").on("click", function(){

src/js/followUp.js

@@ -1,7 +1,7 @@
 var $ = require("jquery");
 var { post,config,getUrlArgObject,openNewWin,isIe8 ,openNewWin} = require('./promise.js');
 let showImg = require('./../images/show.png').replace(/^undefined/g, '')
-let collapseImg = require('./../images/collapse2.png').replace(/^undefined/g, '')
+let collapseImg = require('./../images/collapse.png').replace(/^undefined/g, '')
 let emptyImg = require('./../images/empty3.png').replace(/^undefined/g, '')
 let lisStrFrontIcon = require('./../images/lisStrFront-icon.png').replace(/^undefined/g, '')
 let pacsStrFrontIcon = require('./../images/pacsStrFront-icon.png').replace(/^undefined/g, '')
@@ -135,9 +135,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()
@@ -183,7 +183,7 @@ function checkDom() {
     }
 }
 function bindToggleHistory() {
-    $(document).on("click", ".btnName", function () {
+    $(".followUpWrap .btnName").off("click").on("click",function () {
         const btnText = $(".btnName").text()
         if (btnText === "显示历史计划") {
             $(".btnName").text("隐藏历史计划")

src/js/staticSearch.js

@@ -46,11 +46,11 @@ $(".searchScale").css({display:'none'})
 $(".searchKnowledge").css({display:'block'})
 $(".searchKnowledge .staticSearchT").on('click','button',function() {
     var val = $(this).parents(".staticSearchT").find("input").val()
-    if(val == ''){
+    if(val.trim() == ''){
         $(".searchKnowledge .staticSearchB .inputWarning").css("display","block")
-       
+    }else{
+        getKnowledgeData(val)
     }
-    val!=''&&getKnowledgeData(val)
 })
 
 

webpack.config.js

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