Merge branch 'test' of http://192.168.2.236:10080/zhouna/AIPlatform into test

src/css/index.less

@@ -99,7 +99,7 @@
       content: " ";
       display: inline-block;
       position: absolute;
-      left: 270px;
+      left: @menuWt+(-30px);
       top:18px;
       width: 10px;
       height: 6px;

src/css/qcScore.less

@@ -50,7 +50,7 @@
       content: " ";
       display: inline-block;
       position: absolute;
-      left: 270px;
+      left: @menuWt+(-30px);
       top:18px;
       width: 10px;
       height: 6px;
@@ -84,7 +84,7 @@
   }
 }
 .tab-container{
-  margin-left: 310px;
+  margin-left: @menuWt+10px;
   height: 100%;
   .content-box{
     width:70%;

src/css/reset.less

@@ -93,7 +93,7 @@ textarea {
 
 @headerHt:50px;   /*logo栏高度*/
 @menuLiHt:40px;   /*菜单项高度*/
-@menuWt:300px;   /*菜单宽度*/
+@menuWt:205px;   /*菜单宽度*/
 @activeColor:#5A8EEE;   /*菜单项选中颜色*/
 @activeBg:#EEF4FF;   /*菜单项选中背景*/
 @borderColor:#E2E5EF; /**边框颜色**/

src/html/qcScore.html

@@ -2204,8 +2204,8 @@
                         </div>
                         <div class="contP">
                             <span class="label">3、辅助检查:</span>
-                            <span>${实验室检查}</span>
-                            <span>${影像学检查}</span>
+                            <span>{{html 实验室检查}}</span>
+                            <span>{{html 影像学检查}}</span>
                         </div>
                     </div>
                     <div class="cont">
@@ -2213,7 +2213,7 @@
                             <span class="label">拟诊讨论:</span>
                             <div class="contP">
                                 <span class="label">1&nbsp;&nbsp;&nbsp;&nbsp;初步诊断:</span>
-                                <span>${初步诊断}</span>
+                                <span>{{html 初步诊断}}</span>
                             </div>
                             <div class="contP">
                                 <span class="label">2&nbsp;&nbsp;&nbsp;&nbsp;诊断依据:</span>
@@ -2225,7 +2225,7 @@
                         </div>
                        <div class="contP">
                             <span class="label">3&nbsp;&nbsp;&nbsp;&nbsp;鉴别诊断:</span>
-                            <span class="textPreLine">${鉴别诊断}</span>
+                            <p class="textPreLine">{{html 鉴别诊断}}</p>
                        </div>
                     </div>
                     <div class="contP">
@@ -2234,11 +2234,11 @@
                         </div>
                         <div class="contP">
                             <span class="label">1&nbsp;&nbsp;&nbsp;&nbsp;检查计划:</span>
-                            <span>${检查计划}</span>
+                            <span>{{html 检查计划}}</span>
                         </div>
                         <div class="contP">
                             <span class="label">2&nbsp;&nbsp;&nbsp;&nbsp;治疗计划:</span>
-                            <span>${治疗计划和措施}</span>
+                            <span>{{html 治疗计划和措施}}</span>
                         </div>
                     </div>
                     <div class="contP">