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

src/css/console.less

@@ -76,6 +76,7 @@ body.console {
     font-size: 16px;
     font-weight: bold;
     color: @themeFontClr;
+    opacity: .9;
     border-bottom: 1px solid @themeBorderClr;
     height: 40px;
     line-height: 40px;
@@ -125,14 +126,17 @@ body.console {
     display: inline-block;
     font-size: 16px;
     color: @themeFontClr;
+    opacity: .9;
     span {
       font-size: 16px;
       color: #fff;
+      opacity: .9;
     }
   }
   .dateDetail {
     font-size: 12px;
     color: @themeFontClr;
+    opacity: .6;
     margin-right: 30px;
     font-weight: normal;
   }
@@ -157,9 +161,11 @@ body.console {
     .year {
       background-color: #00A1FF;
       color: #fff;
+      opacity: .9;
     }
     .mon {
       color: @themeFontClr;
+      opacity: .6;
     }
   }
 }
@@ -248,6 +254,7 @@ body.console {
         text-overflow: ellipsis;
         white-space: nowrap;
         color: @themeFontClr;
+        opacity: .6;
       }
       .smp {
         width: 100px;
@@ -255,6 +262,7 @@ body.console {
     }
     .deptNum {
       color: @themeFontClr;
+      opacity: .6;
       font-size: 16px;
       font-weight: bold;
       padding-right: 10px;
@@ -263,6 +271,7 @@ body.console {
     }
     .percent {
       color: @themeFontClr;
+      opacity: .6;
       width: 40px;
     }
   }
@@ -282,6 +291,7 @@ body.console {
       float: left;
       width: 33.33%;
       color: #fff;
+      opacity: .9;
       border-left: 3px solid #F2637B;
       height: 72px;
       box-sizing: border-box;
@@ -299,6 +309,9 @@ body.console {
     /*background-color: @themeColor;*/
     height: 410px;
     overflow: hidden;
+    .partTitlePub{
+      opacity: .9;
+    }
     .list {
       padding: 6px 5px;
       width: 100%;
@@ -323,6 +336,7 @@ body.console {
     td {
       padding: 7px 10px;
       color: @themeFontClr;
+      opacity: .9;
       i {
         width: 17px;
         height: 17px;
@@ -330,6 +344,7 @@ body.console {
         border-radius: 8px;
         background-color: #526186;
         color: #fff;
+        opacity: .9;
         display: inline-block;
         text-align: center;
         font-size: 12px;
@@ -347,6 +362,7 @@ body.console {
     .td02name {
       min-width: 113px;
       color: @themeFontClr;
+      opacity: .9;
     }
     .td02 {
     }
@@ -387,6 +403,7 @@ body.console {
     p {
       text-align: center;
       color: @themeFontClr;
+      opacity: .9;
       font-weight: bold;
       font-size: 16px;
       padding-bottom: 5px;
@@ -405,6 +422,7 @@ body.console {
       text-align: center;
       font-size: 12px;
       color: @themeFontClr;
+      opacity: .6;
       font-weight: normal;
       width: 78px;
       position: absolute;
@@ -452,6 +470,7 @@ body.console {
   cursor: pointer;
   span{
     color: @themeFontClr;
+    opacity: .9;
   }
   .name {
     float: left;
@@ -460,6 +479,7 @@ body.console {
   .personNum {
     float: right;
     color: @themeFontClr;
+    opacity: .9;
   }
 }
 
@@ -470,10 +490,12 @@ body.console {
   line-height: 40px;
   font-weight: bold;
   color: @themeFontClr;
+  opacity: .9;
 }
 .explainNum {
   margin-top: 8px;
   color: @themeFontClr;
+  opacity: .6;
 }
 
 .toggleSlide {
@@ -493,6 +515,7 @@ body.console {
     border-radius: 4px;
     span{
       color: @themeFontClr;
+      opacity: .9;
     }
     img {
       width: 10px;

src/css/itemManager.less

@@ -46,9 +46,9 @@
         }
         
     }
-    // .filterBox{
-    //     margin: 0 0 20px 0;
-    // }
+    .filterBox{
+        margin-bottom:10px;
+    }
     .filterItem{
         position: relative;
         display: inline-block;

src/css/login.less

@@ -3,7 +3,6 @@ body {
   background:linear-gradient(133deg,rgba(45,79,139,1) 0%,rgba(20,39,83,1) 100%);
 }
 .login {
-  cursor: pointer;
   height: 100%;
   .bg{
     width: 62%;
@@ -24,6 +23,7 @@ body {
     text-align: center;
     background-color: #00A1FF;
     color: #fff;
+    cursor: pointer;
     border-radius:4px;
     margin: 20px auto 0;
   }

src/html/itemManager.html

@@ -13,7 +13,7 @@
     <div class="managerContainer">
         <h2>条目数据维护</h2>
         <div class="main-body">
-            <div class="filterBox">
+            <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
                     <span>模块名称：</span>
                     <span class="selectModuleType ellipsis">全部 </span>
@@ -43,8 +43,10 @@
                         <li class="usedItem" data-name="否" data-id=0>否</li>
                     </ul>
                 </span>
-                <span class="filter">查询</span>
-                <span class="filterclear abnormalClear">重置</span>
+                <div style="display: inline-block;float: left;">
+                    <span class="filter">查询</span>
+                    <span class="filterclear abnormalClear">重置</span>
+                </div>
             </div>
             <table>
                 <thead>

src/js/console.js

@@ -102,9 +102,11 @@ function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
             backgroundColor:'#00A1FF',
-            color:'#fff'
+            color:'#fff',
+            opacity:'0.9',
         }).siblings().css({
             color:'#fff',
+            opacity:'0.6',
             backgroundColor:'#203463'
         })
         dateType = 1
@@ -113,9 +115,11 @@ function dateChange(){
     $(".monthYear .year").click(function(){
         $(this).css({
             backgroundColor:'#00A1FF',
-            color:'#fff'
+            color:'#fff',
+            opacity:'0.9',
         }).siblings().css({
             color:'#fff',
+            opacity:'0.6',
             backgroundColor:'#203463'
         })
         dateType = 2