Merge remote-tracking branch 'origin/test'

src/css/abnormal.less

@@ -113,16 +113,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .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 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/assertType.less

@@ -115,16 +115,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .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 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/common.less

@@ -33,6 +33,6 @@ input:disabled {
 .main-body-com{
     background: #fff;
     margin: 0;
-    padding: 20px 25px 0;
+    padding: 20px 25px;
     border:10px @disColor solid;
 }

src/css/dayDetail.less

@@ -113,16 +113,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .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 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/deptScoreDetail.less

@@ -112,16 +112,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .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 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/deptScoreDetailControl.less

@@ -115,16 +115,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .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 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/itemManager.less

@@ -25,15 +25,15 @@
         }
         
     }
-    .filterBox{
+    /*.filterBox{
         margin-bottom:20px;
-    }
+    }*/
     .filterItem{
         position: relative;
         display: inline-block;
         height: 32px;
         line-height: 32px;
-        margin: 0 20px 10px 0;
+        margin: 0 20px 20px 0;
     }
     .filterDropList{
         position: absolute;

src/css/jiaji.less

@@ -116,16 +116,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .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 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/partDetail.less

@@ -115,16 +115,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .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 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/partDetailControl.less

@@ -115,16 +115,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .filterBox{
-        margin-bottom: 15px;
-    }
+    /*.filterBox{
+        margin-bottom: 10px;
+    }*/
     .filterItem{
         position: relative;
         display: inline-block;
         float: left;
         height: 40px;
         line-height: 40px;
-        margin: 0 20px 15px 0;
+        margin: 0 20px 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/payDetail.less

@@ -116,16 +116,16 @@
         border: 1px solid @activeColor;
         color: @activeColor;
     }
-    .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 20px 0;
         span{
             display: inline-block;
             line-height: 40px;

src/css/qcList.less

@@ -3,19 +3,23 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-    background: @disColor;
+    background: #fff;
 }
 ul,li{
     list-style: none;
 }
 h2{
     .h2;
+    border-bottom: 10px @disColor solid;
     position: absolute;
 }
 .main-body{
     .main-body-com;
+    border: none;
+    border-left:10px @disColor solid;
     margin: 44px 0 0;
     min-width: 1090px;
+    min-height: calc(100% - 84px);
     // overflow: auto;
 }
 table{
@@ -98,7 +102,8 @@ table{
     position: relative;
 }
 .overAuto{
-    overflow: auto;
+    display: table;
+    padding-right: 20px;
 }
 .toggle-item{
     display: none;
@@ -107,7 +112,7 @@ table{
     position: absolute;
     left: 960px;
     top: 8px;
-    color: #aaa;
+    color: #777;
     font-size: 14px;
     background: url("../images/arrow_up.png") 60px center no-repeat;
     padding-right: 15px;

src/css/qcListDept.less

@@ -3,19 +3,23 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-    background: @disColor;
+    background: #fff;
 }
 ul,li{
     list-style: none;
 }
 h2{
     .h2;
+    border-bottom: 10px @disColor solid;
     position: absolute;
 }
 .main-body{
     .main-body-com;
+    border: none;
+    border-left:10px @disColor solid;
     margin: 44px 0 0;
     min-width: 1090px;
+    min-height: calc(100% - 84px);
     /*width: 100%;*/
 }
 table{
@@ -96,7 +100,8 @@ table{
     position: relative;
 }
 .overAuto{
-    overflow: auto;
+    display: table;
+    padding-right: 20px;
 }
 .toggle-item{
     display: none;
@@ -105,7 +110,7 @@ table{
     position: absolute;
     left: 960px;
     top: 8px;
-    color: #aaa;
+    color: #777;
     font-size: 14px;
     background: url("../images/arrow_up.png") 60px center no-repeat;
     padding-right: 15px;

src/css/qcListPerson.less

@@ -3,19 +3,23 @@
     width: 100%;
     height: 100%;
     overflow: auto;
-    background: @disColor;
+    background: #fff;
 }
 ul,li{
     list-style: none;
 }
 h2{
     .h2;
+    border-bottom: 10px @disColor solid;
     position: absolute;
 }
 .main-body{
     .main-body-com;
+    border: none;
+    border-left:10px @disColor solid;
     margin: 44px 0 0;
     min-width: 1090px;
+    min-height: calc(100% - 84px);
     /*width: 100%;*/
 }
 table{
@@ -101,7 +105,8 @@ table{
     position: relative;
 }
 .overAuto{
-    overflow: auto;
+    display: table;
+    padding-right: 20px;
 }
 .toggle-item{
     display: none;
@@ -110,7 +115,7 @@ table{
     position: absolute;
     left: 960px;
     top: 8px;
-    color: #aaa;
+    color: #777;
     font-size: 14px;
     background: url("../images/arrow_up.png") 60px center no-repeat;
     padding-right: 15px;

src/html/qcList.html

@@ -117,7 +117,7 @@
 
             <div class="pagination"></div>
         </div>
-        
+
     </div>
 </body>