Merge remote-tracking branch 'origin/version1.2.1' into test

# Conflicts:
#	src/js/qcList.js
#	src/js/qcListDept.js
#	src/js/qcListPerson.js

src/css/console.less

@@ -126,11 +126,9 @@ body.console {
   min-width: 100px;
   p {
     display: inline-block;
-    font-size: 16px;
     color: @fstColor;
     span {
       color: @fstColor;
-      font-size: 16px;
     }
   }
   .dateDetail {
@@ -142,7 +140,6 @@ body.console {
   .monthYear {
     float: right;
     margin-right: 20px;
-    border: 1px solid #00A1FF;
     height: 30px;
     line-height: 30px;
     cursor: pointer;

src/css/deptConsole.less

@@ -106,11 +106,9 @@ body.console {
   letter-spacing: 1px;
   p {
     display: inline-block;
-    font-size: 16px;
     color: @fstColor;
     span,i {
       color: @fstColor;
-      font-size: 16px;
     }
   }
   .dateDetail {

src/css/index.less

@@ -409,8 +409,8 @@
         width: 100px;
         box-sizing: border-box;
         border:  1px solid #E2E5EF;
-        height: 40px;
-        line-height: 40px;
+        height: 34px;
+        line-height: 34px;
         border-radius: 2px;
         padding: 0 10px;
         &:focus{
@@ -465,7 +465,7 @@
       left: 50%;
       top: 50%;
       width: 500px;
-      height:468px;
+      height:458px;
       margin: -234px 0 0 -250px;
       background: #fff;
       border-radius:4px;
@@ -486,7 +486,7 @@
       cursor: pointer;
     }
     .itemMsgContentBox{
-      margin: 20px 0 0 0;
+      margin: 30px 0 0 0;
     }
     .itemMsgInfoBox{
       line-height: 40px;
@@ -500,8 +500,8 @@
         width: 280px;
         box-sizing: border-box;
         border:  1px solid #E2E5EF;
-        height: 40px;
-        line-height: 40px;
+        height: 34px;
+        line-height: 34px;
         border-radius: 2px;
         padding: 0 10px;
         &:focus{
@@ -541,7 +541,7 @@
     .confirmEditBox{
       position: relative;
       text-align: center;
-      top: 30px;
+      top: 20px;
     }
     .confirmEdit{
       display: inline-block;

src/css/qcScore.less

@@ -14,7 +14,7 @@
 .patient-info{
   /*height: 50px;*/
   line-height: 50px;
-  border-bottom: 10px #F5F6FA solid;
+  border-bottom: 10px #EFF1F6 solid;
   text-align: center;
   /*margin-bottom: 20px;*/
   span{
@@ -170,7 +170,7 @@
     height: 100%;
     position: relative;
     overflow-y: auto;
-    border-right: 10px #F5F6FA solid;
+    border-right: 10px #EFF1F6 solid;
   }
   .content-item{
     display: none;
@@ -440,6 +440,17 @@
   .drop-box{
     position: relative;
     margin-bottom: 10px;
+    &:after{
+      content: "";
+      display: inline-block;
+      width: 13px;
+      height: 7px;
+      background: url("../images/arrow_down.png") no-repeat;
+      background-size: 13px 7px;
+      position: absolute;
+      left: 365px;
+      top: 16px;
+    }
   }
   ul{
     display: none;
@@ -461,7 +472,14 @@
         background: @tableBorderColor;
       }
     }
-
+  }
+  .show{
+    ul{
+      display: block;
+    }
+    &:after{
+      background-image: url("../images/arrow_up.png");
+    }
   }
 }
 .standard_table {
@@ -553,6 +571,11 @@
       text-indent: 20px;
     }
   }
+  .interval-color{
+    tr:nth-child(2n){
+      background: #EFF1F6;
+    }
+  }
   table{
     width: 97%;
     border:1px solid #E2E5EF;

src/css/reset.less

@@ -71,6 +71,9 @@ table {
   thead{
     background: #EFF0F9;
   }
+  tr:nth-child(2n){
+    background: #EFF1F6;
+  }
   th,td{
     height: @trHeight;
     box-sizing: border-box;
@@ -143,8 +146,8 @@ textarea {
   height: 44px;
   line-height: 44px;
   /*padding: 0 0 0 15px;*/
-  border-bottom: 10px solid #F5F6FA;
-  font-size: 16px;
+  border-bottom: 10px solid #EFF1F6;
+  font-size: 14px;
   text-indent: 20px;
   font-weight: normal;
   letter-spacing: 1px;
@@ -342,7 +345,7 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
 
 .grayLine {
   height: 10px;
-  background-color: #f5f5f5;
+  background-color: #EFF1F6;
 }
 .partTitleT {
   height: 44px;
@@ -364,16 +367,13 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
   min-width: 100px;
   p {
     display: inline-block;
-    font-size: 16px;
     color: @themeColor;
     a {
-      font-size: 16px;
       color: @themeColor;
       opacity: 70%;
     }
     span {
       color: @themeColor;
-      font-size: 16px;
     }
     i {
       color: @themeColor;

src/html/qcScore.html

@@ -246,7 +246,7 @@
                 {{/each}}
                 </tbody>
             </table>
-            {{else}}<table code="${title}">
+            {{else}}<table code="${title}" class="interval-color">
             <thead>
             <tr>
                 <th width="100" align="center">序号</th>

src/js/qcScore.js

@@ -390,11 +390,11 @@ function formatFlawKeys(data){
 //增加条目弹窗元素事件
   function addFlawEvent(){
     $(".add-box .flaw-drop-input").off("click").on("click",function(){
-      $(".add-box .drop-box ul").show();
+      $(".add-box .drop-box").addClass("show");
     });
     $(".add-box .flaw-drop-input").off("blur").on("blur",function(){
       setTimeout(function(){
-        $(".add-box .drop-box ul").hide();
+        $(".add-box .drop-box").removeClass("show");
       },300)
 
     });
@@ -411,7 +411,7 @@ function formatFlawKeys(data){
       $("#addQcMsg").val(msg);
       $("#addQcScore").val(score);
       $(".add-box .warning").hide();
-      $(".add-box .drop-box ul").hide();
+      $(".add-box .drop-box").removeClass("show");
     });
   }