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

src/css/cdss.less

@@ -221,9 +221,18 @@ body{
 }
 .pushItemName{
     position: relative;
-    display: inline-block;
+    /*display: inline;*/
     line-height: 21px;
     padding-right: 3px;
+    &.noInfo{
+      margin-right: 12px;
+      &.evaluationtitle{
+        margin-right: 3px;
+      }
+      .hidden-i{
+        display: none;
+      }
+    }
     &:hover{
       .infoImg+.hidden-i{
         display: none;
@@ -310,6 +319,7 @@ body{
     box-shadow: 0px 5px 5px 0px @shadowColor;
     margin-bottom: 10px;
     padding-bottom: 10px;
+    border: 1px #D8D8D8 solid;
   .longBox,.shortBox{
     padding: 4px 14px;
     position: relative;   /****bug8454***/
@@ -448,12 +458,14 @@ body{
 .tips-cont{
   border-radius: 8px;
   box-shadow: 0px 5px 5px 0px @shadowColor;
-  border-bottom: 1px #D8D8D8 solid \9;
+  border: 1px #D8D8D8 solid;
+  margin-bottom: 10px;
   .moduleBoxTitle{
     border-color: #FF8042;
   }
   .moduleItem{
     box-shadow: none;
+    border:none;
     border-bottom:1px #E6E6E6 dashed;
     &:last-child{
       border-bottom: none;

src/css/cdssHorizontal.less

@@ -32,7 +32,6 @@
   margin: 29px 0 0 3px;
 }
 .versionNew{
-  display: inline-block;
   width: 24px;
   height: 12px;
   background: url("../images/new1.png");
@@ -234,7 +233,7 @@
 .tips-cont {
   position: relative;
   background: #fff7f2;
-  max-height: 81px;
+  max-height: 63px;
   overflow: hidden;
   .moduleTitle {
     position: absolute;
@@ -297,8 +296,7 @@
   line-height: 21px;
   color: @bgcBlue;
   right: 5px;
-  bottom: -3px;
-  background: #fff;
+  bottom: -1px;
   font-size: 12px;
 }
 .longStrBox {
@@ -373,7 +371,7 @@
   // filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#333CACE4,endColorstr=#333CACE4);
   background: #fff7f2;
   margin-top: 7px;
-  max-height: 81px;
+  max-height: 63px;
   overflow-y: hidden;
   position: relative;
 }
@@ -392,7 +390,7 @@
 }
 .isOverFlow {
   overflow: hidden;
-  max-height: 88px;
+  max-height: 41px;
 }
 .showMoreGeneralTreat {
   position: absolute;

src/css/informationOut.less

@@ -467,7 +467,8 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
     padding:25px 56px;
     display: inline-block;
     .result_left{
-      display: flex;
+      display: flex; 
+      justify-content: center;
       & span{
         display: block;
         width: 42px;

src/css/staticInfo.less

@@ -407,6 +407,8 @@
     display: inline-block;
     .result_left{
       display: flex;
+      
+    justify-content: center;
       & span{
         display: block;
         width: 42px;

src/html/cdssHorizontal.html

@@ -111,7 +111,6 @@
       </div>
     <div class="versionWrapper">
       <span class="versionTop"></span>
-      <span class="versionNew"></span>
       <span class="versionBottom"></span>
     </div>
   </div>

src/js/cdss.js

@@ -644,7 +644,7 @@ function renderItemWrapper(list, showNum) {
 function renderPushItem(item) {
   const infoIcon = `${ item.hasInfo == "1" ? `<img class="infoImg" src="${infoImg}">` : "" }`;
   str = `<span class="pushItemBox" data-name="${item.name}" data-type="${item.type}">`
-  str += `<span class="pushItemName ${item.hasScale == "1" ? 'evaluationtitle':''}"><i class="item-name">${item.type == 8 ? ('【' + item.name + '】') : item.name}</i> ${infoIcon}<i class="hidden-i"></i></span>`
+  str += `<span class="pushItemName ${item.hasScale == "1" ? 'evaluationtitle':''} ${item.hasInfo == "1" ? '':'noInfo'}"><i class="item-name">${item.type == 8 ? ('【' + item.name + '】') : item.name}</i> ${infoIcon}<i class="hidden-i"></i></span>`
   str+=`</span>`;
   return str
 }

src/js/cdssHorizontal.js

@@ -270,7 +270,7 @@ function renderCaseWrite() {
       renderwriteStandardPage(caseWritePush)
       if ($(".moduleItem.casewriting")) {
         let casewritingHei = $(".moduleItem.casewriting")[0].scrollHeight
-        if (casewritingHei > 81) {
+        if (casewritingHei > 63) {
           $(".casewriting").append(`<span class="showMoreCaseWrite">更多</span>`)
           caseWriteStandradList = caseWritePush
           showMoreCaseWrite()
@@ -464,7 +464,7 @@ function rendergeneraTreatPush(list) {
 
     setTimeout(function () {
       let generaTreatHei = $(".moduleItem .generalTreatInfo")[0].scrollHeight
-      if (generaTreatHei > 81) {
+      if (generaTreatHei > 60) {
         $(".moduleItem .generalTreatInfo").append(`<span class="showMoreGeneralTreat">更多</span>`)
         bindGeneralSlide()
       }
@@ -727,11 +727,11 @@ function getVersion() {
     const data = res.data.data;
     const ver = localStorage.getItem('versionTime');
     const time = data.refreshTime;
-    if (!ver || ver === time + "=new" || time !== ver.replace("=new", "")) {       //判断版本是否更新
-      $(".versionBottom").addClass('new-icon');
+    if (!ver || (ver !== time + "=new")) {       //判断版本是否更新
+      $(".versionWrapper").append('<span class="versionNew"></span>');
       localStorage.setItem('versionTime', time + "=new");     //保存版本更新时间
     } else {
-      $(".versionBottom").removeClass("new-icon");
+      $(".versionNew").remove();
     }
   })
 }

src/js/informationOut.js

@@ -281,7 +281,7 @@ function renderContentscale(list, contentWrapClassName, name) {
   str = '<div class="scalebot">'
   str += '<button class="but">结果</button><p class="score"></p>'
   str += '</div>'
-  str += `<div class="result"><div class="result_box"><div class="result_left"><img src="./../images/icon-hel.png" class="hel"/><p id="result_title" class="result_title"></p></div><textarea id="inputs"></textarea></div></div>`
+  str += `<div class="result"><div class="result_box"><div class="result_left"><img src="./../images/icon-hel.png" class="hel"/><p id="result_title" class="result_title"></p></div><textarea id="inputs"></textarea><p id="result_title_tip" class="result_title_tip">该量表需要入院当天评估一次，出院当天评估一次，每七天要评估一次</p></div></div>`
   str += `<div class="foot"><div class="foot_box"><div class="printing"><img src="./../images/printing.png" class="slideImg"/>打印</div><div class="copy">确认并复制结果</div></div></div>`
   $(`.${contentWrapClassName} .infos .infos-box`).append(str);
   function addScrollEvent() {
@@ -310,11 +310,14 @@ function getprinting() {
   $('.printing').click(function () {
     $('.foot').hide()
     $('.scalebot').hide()
+    $('.result_title_tip').hide()
+    
     $('#Print').css({
       'height': 'auto', //高度自动
     }).print();
     $('.foot').show()
     $('.scalebot').show()
+    $('.result_title_tip').show()
     $('#Print').css({
       'height': '100%', //高度自动
     });
@@ -478,12 +481,12 @@ function getResult(pushInfo, textType, constant) {
         }
       });
       num = num + constant
-      num = parseFloat(num).toFixed(2)
+      num = parseFloat(num)
       tmp = arr.join("；");
       if (pushInfo.length > 0) {
         for (var i = 0; i < pushInfo.length; i++) {
           if (pushInfo[i].content.max >= num && num >= pushInfo[i].content.min && !tmp) {
-            result = pushInfo[i].result + '(' + num + '分' + ')'
+            result = pushInfo[i].result + '(' + num.toFixed(2) + '分' + ')'
             if (proposals.join("；")) {
               proposal = pushInfo[i].pushInfo + '；' + proposals.join("；");
             } else {
@@ -491,7 +494,7 @@ function getResult(pushInfo, textType, constant) {
             }
             break
           } else if (pushInfo[i].content.max >= num && num >= pushInfo[i].content.min && tmp) {
-            result = pushInfo[i].result + '(' + num + '分' + ')' + '；' + tmp
+            result = pushInfo[i].result + '(' + num.toFixed(2) + '分' + ')' + '；' + tmp
             if (proposals.join("；")) {
               proposal = pushInfo[i].pushInfo + '；' + proposals.join("；");
             } else {
@@ -513,7 +516,7 @@ function getResult(pushInfo, textType, constant) {
         });
         $(".result_title").html('结果：' + result);
         if (num >= 0 && numType) {
-          $(".score").html('总分：' + num + '分');
+          $(".score").html('总分：' + num.toFixed(2) + '分');
         }
         $(".result").css('display', 'block')
         $(".score").css('display', 'block')
@@ -521,7 +524,7 @@ function getResult(pushInfo, textType, constant) {
         $(".foot").css('display', 'block')
       } else {
         if (num >= 0 && numType) {
-          $(".score").html('总分：' + num + '分');
+          $(".score").html('总分：' + num.toFixed(2) + '分');
         }
         $(".score").css('display', 'block')
         $(".copy").css('display', 'none')

src/js/staticInfo.js

@@ -212,7 +212,7 @@ function renderContentscale(list, contentWrapClassName, name) {
   str = '<div class="scalebot">'
   str += '<button class="but">结果</button><p class="score"></p>'
   str += '</div>'
-  str += `<div class="result"><div class="result_box"><div class="result_left"><img src="./../images/icon-hel.png" class="hel"/><p id="result_title" class="result_title"></p></div><textarea id="inputs"></textarea></div></div>`
+  str += `<div class="result"><div class="result_box"><div class="result_left"><img src="./../images/icon-hel.png" class="hel"/><p id="result_title" class="result_title"></p></div><textarea id="inputs"></textarea><p id="result_title_tip" class="result_title_tip">该量表需要入院当天评估一次，出院当天评估一次，每七天要评估一次</p></div></div>`
   str += `<div class="foot"><div class="foot_box"><div class="printing"><img src="./../images/printing.png" class="slideImg"/>打印</div><div class="copy">确认并复制结果</div></div></div>`
   $(`.${contentWrapClassName} .infos .infos-box`).append(str);
   function addScrollEvent() {
@@ -238,16 +238,21 @@ function renderContentscale(list, contentWrapClassName, name) {
 }
 function getprinting() {
   $('.printing').click(function () {
-    $('.foot').hide()
-    $('.scalebot').hide()
-    $('#Print').css({
-      'height': 'auto', //高度自动
-    }).print()
-    $('.foot').show()
-    $('.scalebot').show()
-    $('#Print').css({
-      'height': '100%', //高度自动
-    });
+    $('.printing').click(function () {
+      $('.foot').hide()
+      $('.scalebot').hide()
+      $('.result_title_tip').hide()
+
+      $('#Print').css({
+        'height': 'auto', //高度自动
+      }).print();
+      $('.foot').show()
+      $('.scalebot').show()
+      $('.result_title_tip').show()
+      $('#Print').css({
+        'height': '100%', //高度自动
+      });
+    })
   })
 }
 
@@ -407,12 +412,12 @@ function getResult(pushInfo, textType, constant) {
         }
       });
       num = num + constant
-      num = parseFloat(num).toFixed(2)
+      num = parseFloat(num)
       tmp = arr.join("；");
       if (pushInfo.length > 0) {
         for (var i = 0; i < pushInfo.length; i++) {
           if (pushInfo[i].content.max >= num && num >= pushInfo[i].content.min && !tmp) {
-            result = pushInfo[i].result + '(' + num + '分' + ')'
+            result = pushInfo[i].result + '(' + num.toFixed(2) + '分' + ')'
             if (proposals.join("；")) {
               proposal = pushInfo[i].pushInfo + '；' + proposals.join("；");
             } else {
@@ -420,7 +425,7 @@ function getResult(pushInfo, textType, constant) {
             }
             break
           } else if (pushInfo[i].content.max >= num && num >= pushInfo[i].content.min && tmp) {
-            result = pushInfo[i].result + '(' + num + '分' + ')' + '；' + tmp
+            result = pushInfo[i].result + '(' + num.toFixed(2) + '分' + ')' + '；' + tmp
             if (proposals.join("；")) {
               proposal = pushInfo[i].pushInfo + '；' + proposals.join("；");
             } else {
@@ -442,7 +447,7 @@ function getResult(pushInfo, textType, constant) {
         });
         $(".result_title").html('结果：' + result);
         if (num >= 0 && numType) {
-          $(".score").html('总分：' + num + '分');
+          $(".score").html('总分：' + num.toFixed(2) + '分');
         }
         $(".result").css('display', 'block')
         $(".score").css('display', 'block')
@@ -450,7 +455,7 @@ function getResult(pushInfo, textType, constant) {
         $(".foot").css('display', 'block')
       } else {
         if (num >= 0 && numType) {
-          $(".score").html('总分：' + num + '分');
+          $(".score").html('总分：' + num.toFixed(2) + '分');
         }
         $(".score").css('display', 'block')
         $(".copy").css('display', 'none')