Browse Source

技能博物馆

jbb 2 years ago
parent
commit
13cf3b59df

+ 3 - 0
public/index.html

@@ -5,6 +5,9 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <!-- 技能博物馆 -->
+  <!-- <title>OA办公系统</title>
+  <link rel="icon" href="<%= BASE_URL %>logo-cd-left1.png"> -->
   <title>上海萃颠信息科技有限公司</title>
   <link rel="icon" href="<%= BASE_URL %>logo-cd.png">
 <!--  <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/7.2.5/polyfill.js"></script>-->

BIN
public/logo-cd-left1.png


BIN
src/assets/logo-cd-left1.png


+ 4 - 1
src/components/layouts/OldUserLayout.vue

@@ -4,7 +4,10 @@
       <div class="top">
         <div class="header">
           <a href="/">
-            <img src="~@/assets/logo-cd.png" class="logo" alt="logo">
+           <!-- 技能博物馆 -->
+            <!-- <img src="~@/assets/logo-cd-left1.png" class="logo" alt="logo">
+            <span class="title">OA办公系统</span> -->
+             <img src="~@/assets/logo-cd.png" class="logo" alt="logo">
             <span class="title">上海萃颠信息科技有限公司</span>
           </a>
         </div>

+ 7 - 0
src/components/layouts/UserLayout.vue

@@ -5,6 +5,8 @@
       <div class="container">
         <!-- 萃颠logo -->
         <div class="logo">
+          <!-- 技能博物馆 -->
+          <!-- <img src="../../assets/logo-cd-left1.png" alt="" /> -->
           <img src="../../assets/logo-blue.png" alt="" />
         </div>
 
@@ -95,6 +97,11 @@ export default {
       position: absolute;
       top: -80px;
       left: 42px;
+      
+      // 技能博物馆
+      // img {
+      //   height: 78px
+      // }
     }
     // 放表单的背景
     .formBox {

+ 5 - 0
src/components/page/GlobalHeader.vue

@@ -209,5 +209,10 @@ export default {
   line-height: @height;
 }
 
+// 技能博物馆
+// .layout .header[data-v-6d229060] {
+//     background-color: #6bc5f3;
+// }
+
 /* update_end author:scott date:20190220 for: 缩小首页布局顶部的高度*/
 </style>

+ 18 - 3
src/components/page/GlobalLayout.vue

@@ -1,4 +1,5 @@
 <template>
+
   <a-layout class="layout" :class="[device]">
     <!-- 侧栏菜单 -->
     <template v-if="layoutMode === 'sidemenu'">
@@ -13,7 +14,7 @@
       >
         <!-- 垂直菜单 横向展示二级三级 -->
         <side-menu
-          mode="vertical"
+          mode="inline"
           :menus="menus"
           @menuSelect="menuSelect()"
           :theme="navTheme"
@@ -24,7 +25,7 @@
 
       <side-menu
         v-else
-        mode="vertical"
+        mode="inline"
         :menus="menus"
         @menuSelect="myMenuSelect"
         :theme="navTheme"
@@ -45,7 +46,7 @@
         width="200px"
       >
         <side-menu
-          mode="vertical"
+          mode="inline"
           :menus="menus"
           @menuSelect="menuSelect"
           :theme="navTheme"
@@ -586,6 +587,8 @@ body {
   }
 
   &.light {
+    // 技能博物馆
+    // background-color: #221140 !important;
     background-color: #fff;
     box-shadow: 2px 116px 8px 0 rgba(29, 35, 41, 0.05);
 
@@ -600,6 +603,10 @@ body {
 
     .ant-menu-light {
       border-right-color: transparent;
+
+      // 技能博物馆
+      // background-color: #221140;
+      // color: white;
     }
   }
 }
@@ -675,4 +682,12 @@ body {
 .ant-menu-submenu-selected {
   background-color: rgba(142, 202, 230, 0.5);
 }
+
+// 技能博物馆
+// .ant-menu-root>.ant-menu-item:first-child span {
+//     color: white;
+// }
+// .ant-menu-root>.ant-menu-item:first-child i {
+//     color: white;
+// }
 </style>

+ 8 - 0
src/components/tools/Logo.vue

@@ -10,6 +10,9 @@
       <!-- <h1 v-if="showTitle">{{ title }}</h1> -->
 
       <!-- <img v-if="showTitle" src="~@/assets/logo-cd.png" alt="logo"> -->
+      <!-- 技能博物馆 -->
+      <!-- <img src="~@/assets/logo-cd-left1.png" alt="logo">
+      <h1 >OA办公系统</h1>  -->
       <img src="~@/assets/logo-cd-left.png" alt="logo">
       <h1 >{{ dashboard }}</h1> 
     </router-link>
@@ -47,6 +50,11 @@
       line-height: @height !important;
       box-shadow: none !important;
       transition: background 300ms;
+      background-color: #6bc5f3 !important;
+
+     img {
+       height: 40px !important;
+       }
 
       a {
         color: white;