浏览代码

bug5507,5508

zhangxc 5 年之前
父节点
当前提交
47d38f017c
共有 5 个文件被更改,包括 89 次插入66 次删除
  1. 7 5
      src/css/console.less
  2. 64 61
      src/css/deptConsole.less
  3. 16 0
      src/css/moduleManager.less
  4. 1 0
      src/html/moduleManager.html
  5. 1 0
      src/js/moduleManager.js

+ 7 - 5
src/css/console.less

@@ -24,11 +24,7 @@ div.console {
     text-align: center;
     box-sizing: border-box;
   }
-  .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
-    height: 28px;
-    line-height: 28px;
-    box-sizing: border-box;
-  }
+  
   .innerOuter {
     display: none;
   }
@@ -681,4 +677,10 @@ div.console {
   }
   .ui-state-highlight, .ui-widget-content .ui-state-highlight {
     background-color: #5B70A4 !important;
+  }
+  .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
+    height: 28px;
+    line-height: 28px;
+    box-sizing: border-box;
+    color:@themeFontClr;
   }

+ 64 - 61
src/css/deptConsole.less

@@ -4,61 +4,7 @@ div.console {
   overflow: auto;
   background-color: @themeColor;
   height: 100%;
-  .ui-widget.ui-widget-content,
-  .ui-widget-header,.ui-datepicker thead,.ui-state-default, 
-  .ui-datepicker-month,.ui-datepicker-year,
-  .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
-    background-color: @themeColor;
-    font-family: 'Microsoft YaHei', arial, tahoma, sans-serif;
-    color: @fstColor;
-  }
-  .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next{
-    &:hover {
-      background-color: #142753;
-      border: 0 none;
-    }
-  }
-  .ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span {
-    display: block;
-    position: absolute;
-    left: 50%;
-    margin-left: -8px;
-    top: 50%;
-    margin-top: -8px;
-}
-  .ui-state-active, .ui-widget-content .ui-state-active {
-    background-color: #00A0FE;
-  }
-  .ui-state-default:hover, .ui-widget-content .ui-state-default:hover, .ui-widget-header .ui-state-default:hover {
-    background-color: #142753;
-  }
-  .ui-state-hover .ui-icon {
-    background-image:"url(../images/add.png)";
-  }
-  .dataSelectDark .iconCalen {
-    top:10px;
-  }
-  .dataSelectDark input {
-    height: 28px;
-  }
-  .ui-widget-header .ui-icon {
-    background:url(../images/calendarkL.png) no-repeat;
-    background-size: 14px 14px;
-  }
-  .ui-datepicker-next .ui-icon.ui-icon-circle-triangle-e {
-    background:url(../images/calendarkR.png) no-repeat;
-    background-size: 14px 14px;
-  }
-  .ui-datepicker th span {
-    color: @fstColor;
-  }
-  .ui-datepicker-month,.ui-datepicker-year,
-  .ui-widget.ui-widget-content{
-    border-color: @themeBorderClr;
-  }
-  .ui-state-highlight, .ui-widget-content .ui-state-highlight {
-    background-color: #5B70A4 !important;
-  }
+  
 
   .sureDate {
     cursor: pointer;
@@ -76,11 +22,7 @@ div.console {
     text-align: center;
     box-sizing: border-box;
   }
-  .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
-    height: 28px;
-    line-height: 28px;
-    box-sizing: border-box;
-  }
+ 
 
 
 
@@ -661,4 +603,65 @@ div.console {
   width: 100%;
   height: 300px;
   margin-top: 0;
-}
+}
+.ui-widget.ui-widget-content,
+  .ui-widget-header,.ui-datepicker thead,.ui-state-default, 
+  .ui-datepicker-month,.ui-datepicker-year,
+  .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+    background-color: @themeColor;
+    font-family: 'Microsoft YaHei', arial, tahoma, sans-serif;
+    color: @fstColor;
+  }
+  .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next{
+    &:hover {
+      background-color: #142753;
+      border: 0 none;
+    }
+  }
+  .ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span {
+    display: block;
+    position: absolute;
+    left: 50%;
+    margin-left: -8px;
+    top: 50%;
+    margin-top: -8px;
+}
+  .ui-state-active, .ui-widget-content .ui-state-active {
+    background-color: #00A0FE;
+  }
+  .ui-state-default:hover, .ui-widget-content .ui-state-default:hover, .ui-widget-header .ui-state-default:hover {
+    background-color: #142753;
+  }
+  .ui-state-hover .ui-icon {
+    background-image:"url(../images/add.png)";
+  }
+  .dataSelectDark .iconCalen {
+    top:10px;
+  }
+  .dataSelectDark input {
+    height: 28px;
+  }
+  .ui-widget-header .ui-icon {
+    background:url(../images/calendarkL.png) no-repeat;
+    background-size: 14px 14px;
+  }
+  .ui-datepicker-next .ui-icon.ui-icon-circle-triangle-e {
+    background:url(../images/calendarkR.png) no-repeat;
+    background-size: 14px 14px;
+  }
+  .ui-datepicker th span {
+    color: @fstColor;
+  }
+  .ui-datepicker-month,.ui-datepicker-year,
+  .ui-widget.ui-widget-content{
+    border-color: @themeBorderClr;
+  }
+  .ui-state-highlight, .ui-widget-content .ui-state-highlight {
+    background-color: #5B70A4 !important;
+  }
+  .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
+    height: 28px;
+    line-height: 28px;
+    box-sizing: border-box;
+    color:@themeFontClr;
+  }

+ 16 - 0
src/css/moduleManager.less

@@ -46,8 +46,12 @@ table{
     }
     
 }
+.tableTitle{
+    position: relative;
+}
 .tableTitle table{
     background: #EFF0F9;
+  
 }
 .moduleScore, .totalSum{
     text-align: center;
@@ -102,3 +106,15 @@ input::-webkit-inner-spin-button {
 input[type="number"] {
     -moz-appearance: textfield;
 }
+.moduleSpan{
+    background: #EFF0F9;
+    display: inline-block;
+    width: 17px;
+    height: 31px;
+    position: absolute;
+    right: 1px;
+    border: 1px solid #E2E5EF;
+    box-sizing: border-box;
+    border-left: none;
+    display: none;
+}

+ 1 - 0
src/html/moduleManager.html

@@ -22,6 +22,7 @@
                             <td class="moduleName">模块名称</td>
                             <td class="moduleScore">分值</td>
                             <td class="moduleOpera">操作</td>
+                            <span class="moduleSpan"></span>
                         </tr>
                     </table>
                 </div>

+ 1 - 0
src/js/moduleManager.js

@@ -63,6 +63,7 @@ function renderTab(){
     const mac = isMac()
     if(!mac&&tableInfoHei > tableInfoBox){
         $(".tableTitle").css("paddingRight", 15+'px')
+        $(".moduleSpan").css("display","block")
     }
     // bindInput()
     bindModuleOpera()