Merge remote-tracking branch 'origin/qc_zn' into test

src/css/index.less

@@ -90,9 +90,6 @@
     background: @activeBg;
     border-right: 3px @activeColor solid;
   }
-  .slide-up{
-    color: @activeColor;
-  }
   .list-1,.list-1-show{
     position: relative;
     &:after{
@@ -116,9 +113,6 @@
       display: none;
       li.page{
         text-indent: 30px;
-        &:hover {
-          color: @activeColor;
-        }
       }
     }
   }
@@ -127,9 +121,6 @@
       background: url("../images/icon_up.png") no-repeat;
     }
   }
-  .page:hover {
-    color: @activeColor;
-  }
   li{
     line-height: @menuLiHt;
     text-indent: 15px;

src/css/qcScore.less

@@ -1,6 +1,7 @@
 @import './reset.less';
 .main-part{
   height: 100%;
+  margin-top: 20px;
 }
 .waring {
   color: #FF4D4F;
@@ -8,11 +9,12 @@
   height: 18px;
 }
 .patient-info{
-  height: 50px;
-  line-height: 50px;
-  margin-top: 10px;
+  height: 44px;
+  line-height: 44px;
   text-align: center;
+  background:linear-gradient(123deg,#5A8EEE 0%,#7EABFF 100%);
   span{
+    color: #fff;
     margin-right: 40px;
   }
 }
@@ -28,11 +30,11 @@
     background: @activeBg;
     border-right: 3px @activeColor solid;
   }
-  .slide-up{
-    color: @activeColor;
-  }
   .list-1{
     position: relative;
+    p:hover{
+         color: @activeColor;
+       }
     &:after{
       content: " ";
       display: inline-block;
@@ -418,6 +420,8 @@
   .slide-up{
     cursor: pointer;
     &:before{
+      display: inline-block;
+      width: 14px;
       content: "+";
       font-size: 18px;
       color: #5A8EEE;
@@ -435,9 +439,9 @@
       background: #EFF0F9;
 
     }
-    tr[code]{
+    /*tr[code]{
       display: none;
-    }
+    }*/
     th,td{
       height: 40px;
       box-sizing: border-box;
@@ -451,7 +455,10 @@
     }
     td{
       font-size: 14px;
-      font-weight: 400
+      font-weight: 400;
+      &.red{
+        text-align: center;
+      }
     }
   }
 }

src/html/qcScore.html

@@ -7,7 +7,8 @@
     <title>质控评分</title>
     <script type="text/html" id="subMenuTmpl">
         {{if sonMode.length}}
-        <li class="list-1">${name}
+        <li class="list-1">
+            <p>${name}</p>
             {{else}}
         <li class="page" code="${name}">${name}
             {{/if}}
@@ -771,13 +772,13 @@
                     </div>
                 </div>
                 <div class="info-item">
+                    <div class="info-title">主诉</div>
                     <div class="cont">
-                        <span class="label">主诉:</span>
                         <span>${主诉}</span>
                     </div>
+                    <div class="info-title">现病史</div>
                     <div class="cont">
-                        <span class="label">现病史:</span>
-                        <span>${现病史}</span>
+                        <span>{{html 现病史}}</span>
                     </div>
                     <div class="cont">
                         <span class="label">目前仍需治疗的其他疾病:</span>
@@ -992,20 +993,20 @@
                     </div>
                 </div>
                 <div class="info-item">
+                    <div class="info-title">专科检查:</div>
                     <div class="cont">
-                        <span class="label">专科检查:</span>
-                        <span>${专科检查}</span>
+                        <span>{{html 专科检查}}</span>
                     </div>
                 </div>
                 <div class="info-item">
                     <div class="info-title">辅助检查:</div>
+                    <div class="info-title">实验室检查:</div>
                     <div class="cont">
-                        <span class="label">实验室检查:</span>
-                        <span>${实验室检查}</span>
+                        <span>{{html 实验室检查}}</span>
                     </div>
+                    <div class="info-title">影像学检查:</div>
                     <div class="cont">
-                        <span class="label">影像学检查:</span>
-                        <span>${影像学检查}</span>
+                        <span>{{html 影像学检查}}</span>
                     </div>
                 </div>
                 <div class="info-item">
@@ -1509,11 +1510,11 @@
                         <p>1) 手术目的与预期的效果 </p>
                         <p>2) 告知可能发生的意外、并发症或风险： </p>
                         <p class="intent">① 手术中可能发生的意外和危险性：  </p>
-                        <p class="intent-1">${内容}</p>
+                        <p class="intent-1">{{html 内容}}</p>
                         <p class="intent"> ② 手术后可能发生的意外和危险性： </p>
-                        <p class="intent-1">${术后并发症}</p>
+                        <p class="intent-1">{{html 术后并发症}}</p>
                         <p class="intent">③ 特殊风险或主要高危因素： </p>
-                        <p class="intent-1">风险：${手术风险}</p>
+                        <p class="intent-1">风险：{{html 手术风险}}</p>
                         <p class="intent-1">并发症：</p>
                         <p>3) 针对上述情况医师将采取的防范措施： </p>
                         <p class="intent">基于上述可能发生的风险，我们将根据医疗规范，采取下列防范措施来最大限度地保护患者的安全，使治疗过程顺利完成。具体措施如下。</p>
@@ -2564,9 +2565,9 @@
                 <tr><td colspan="3" class="slide-up">${i}</td></tr>
                 {{each val}}
                 <tr code="${i}">
-                    <td>${modelName}</td>
+                    <td style="text-indent: 14px;">${modelName}</td>
                     <td>${standardMsg}</td>
-                    <td>${score}</td>
+                    <td class="red">${score}</td>
                 </tr>
                 {{/each}}
                 {{/each}}

src/js/qcScore.js

@@ -136,7 +136,7 @@ function formatInfoData(k,data){
   let obj = {},name="";
   for(let i in data){
     name=i.replace(/[^\u4e00-\u9fa5|a-zA-Z0-9]+/g,"").replace(/^[0-9]+/,"a");    //过滤key中存在的特殊符号，模板会渲染不出来且不报错
-    obj[name]=data[i]||"";
+    obj[name]=data[i].replace(/\n/g,"<br/>")||"";
   }
   return Object.assign({title:k},obj);
 }