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

src/css/qcList.less

@@ -26,9 +26,8 @@ table{
        
     }
     th,td{
-        height: 40px;
         box-sizing: border-box;
-        padding: 10px;
+        padding:6px 10px;
         border:1px solid #E2E5EF;
         border-collapse: collapse;
     }
@@ -101,24 +100,24 @@ table{
     border: 1px solid #5A8EEE;
     color: #5A8EEE;
 }
-.filterBox{
+/*.filterBox{
     margin-bottom: 15px;
-}
+}*/
 .filterItem{
     position: relative;
     display: inline-block;
     float: left;
     height: 40px;
     line-height: 40px;
-    margin: 0 20px 15px 0;
+    margin: 0 20px 5px 0;
     span{
         display: inline-block;
-        line-height: 40px;
+        line-height: 32px;
         position: relative;
     }
     input{
         width:120px;
-        height:40px;
+        height:32px;
         border-radius:4px;
         border: 1px solid #E2E5EF;
         outline: none;
@@ -166,7 +165,7 @@ table{
     position: relative;
     width:120px;
     padding: 0 10px;
-    height:40px;
+    height:32px;
     border-radius:4px;
     border: 1px solid #E2E5EF;
     box-sizing: border-box;
@@ -179,12 +178,12 @@ table{
 .filter,.reset{
     display: inline-block;
     width:60px;
-    height:36px;
+    height:32px;
     background:#5A8EEE;
     border-radius:4px;
     color: #fff;
     text-align: center;
-    line-height: 36px;
+    line-height: 32px;
     position: relative;
     top: 2px;
     cursor: pointer;
@@ -194,7 +193,7 @@ table{
 .arrow{
     position: absolute;
     width: 10px;
-    top: 16px;
+    top: 12px;
     right: 10px;
 }
 .iconCheck{
@@ -221,7 +220,7 @@ table{
     position: relative;
     display: inline-block;
     width: 120px;
-    height: 40px;
+    height: 32px;
     input{
         position: absolute;
     }
@@ -229,7 +228,7 @@ table{
 .iconCalen{
     position: absolute;
     width: 15px;
-    top: 12px;
+    top: 8px;
     right: 10px;
 }
 .textCenter{

src/css/qcScore.less

@@ -240,7 +240,7 @@
       .cont{
         display: inline-block;
         min-width: 33%;
-        margin-bottom: 15px;
+        margin-bottom: 5px;
         box-sizing: border-box;
         padding-left: 5px;
         &.active{
@@ -336,7 +336,7 @@
         text-indent: 5px;
       }
       .title{
-        margin-bottom: 10px;
+        margin-bottom: 5px;
         box-sizing: border-box;
         padding-left: 5px;
         &.active{
@@ -477,7 +477,7 @@
       display: none;
     }*/
     th,td{
-      height: 40px;
+      height: 32px;
       box-sizing: border-box;
       padding: 0 20px;
       border:1px solid #E2E5EF;

src/html/qcScore.html

@@ -568,13 +568,13 @@
                 <a {{if pageKeyList[0]}} anchors="${pageKeyList}" href="#anchor${pageKeyList[0]}" {{/if}}>${msg}</a>
                 {{/if}}
             </div>
-            <div class="opers">
+            <div class="opers clearfix">
                 {{if score===0}}
-                <p>评分：<span class="red">warn</span></p>
+                <p class="fl">评分：<span class="red">warn</span></p>
                 {{else}}
-                <p>评分：<span class="red">-${score}</span></p>
+                <p class="fl">评分：<span class="red">-${score}</span></p>
                 {{/if}}
-                <div class="oper">
+                <div class="oper fr">
                     <a class="edit-flaw blue" code="${id}" href="javascript:void(0);" style="margin-right: 20px;">修改</a>
                     <a class="del-flaw red" code="${id}" href="javascript:void(0);">删除</a>
                 </div>

src/js/qcList.js

@@ -83,7 +83,7 @@ function getTabData(activePage){
     })
 }
 
-getTabData(1)
+//getTabData(1)
 
 $(".filter").on("click", function(e){
     behosDateStart = $("#datepicker").val().trim()

src/js/qcListDept.js

@@ -81,7 +81,7 @@ function getTabData(activePage){
     })
 }
 
-getTabData(1)
+//getTabData(1)
 
 $(".filter").on("click", function(e){
     behosDateStart = $("#datepicker").val().trim()

src/js/qcListPerson.js

@@ -83,7 +83,7 @@ function getTabData(activePage){
     })
 }
 
-getTabData(1)
+//getTabData(1)
 
 $(".filter").on("click", function(e){
     behosDateStart = $("#datepicker").val().trim()