jbb 2 years ago
parent
commit
191b0e718e

+ 2 - 2
public/color.less

@@ -2352,9 +2352,9 @@ i.trigger:hover {
   background-color: white;
 }
 .sider.light .logo {
-  // background-color: @primary-color !important;
+  background-color: @primary-color !important;
   //博物馆
-  background-color: #6bc5f3 !important;
+  // background-color: #6bc5f3 !important;
   
   box-shadow: 1px 1px 0 0 #e8e8e8;
 }

+ 5 - 5
public/index.html

@@ -6,11 +6,11 @@
   <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>-->
+  <!-- <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> -->
   <style>
     html,
     body,

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

@@ -5,10 +5,10 @@
         <div class="header">
           <a href="/">
            <!-- 技能博物馆 -->
-            <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> -->
+            <!-- <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>
         <div class="desc">

+ 2 - 2
src/components/layouts/TabLayout.vue

@@ -181,8 +181,8 @@ export default {
         // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题
         changeTitle (title) {
             // 技能博物馆
-            let projectTitle = 'OA办公系统'
-            // let projectTitle = '上海萃颠信息科技有限公司'
+            // let projectTitle = 'OA办公系统'
+            let projectTitle = '上海萃颠信息科技有限公司'
             // 首页特殊处理
             if (this.$route.path === indexKey) {
                 document.title = projectTitle

+ 3 - 3
src/components/layouts/UserLayout.vue

@@ -102,9 +102,9 @@ export default {
       left: 42px;
       
       // 技能博物馆
-      img {
-        height: 78px
-      }
+      // img {
+      //   height: 78px
+      // }
     }
     // 放表单的背景
     .formBox {

+ 3 - 3
src/components/page/GlobalHeader.vue

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

+ 13 - 13
src/components/page/GlobalLayout.vue

@@ -588,8 +588,8 @@ body {
 
   &.light {
     // 技能博物馆
-    background-color: #221140 !important;
-    // background-color: #fff;
+    // background-color: #221140 !important;
+    background-color: #fff;
     box-shadow: 2px 116px 8px 0 rgba(29, 35, 41, 0.05);
 
     .logo {
@@ -605,8 +605,8 @@ body {
       border-right-color: transparent;
 
       // 技能博物馆
-      background-color: #221140 !important;
-      color: white;
+      // background-color: #221140 !important;
+      // color: white;
     }
   }
 }
@@ -684,13 +684,13 @@ body {
 }
 
 // 技能博物馆
-.ant-menu-root>.ant-menu-item span  {
-    color: white;
-}
-.ant-menu-root>.ant-menu-item :hover{
-    color: #1988f4 !important;
-}
-.ant-menu-root>.ant-menu-item i {
-    color: white;
-}
+// .ant-menu-root>.ant-menu-item span  {
+//     color: white;
+// }
+// .ant-menu-root>.ant-menu-item :hover{
+//     color: #1988f4 !important;
+// }
+// .ant-menu-root>.ant-menu-item i {
+//     color: white;
+// }
 </style>

+ 2 - 2
src/defaultSettings.js

@@ -14,8 +14,8 @@
  */
 
 export default {
-  // primaryColor: '#1890FF', // primary color of ant design
-  primaryColor: '#6bc5f3', // 技能博物馆
+  primaryColor: '#1890FF', // primary color of ant design
+  // primaryColor: '#6bc5f3', // 技能博物馆
   navTheme: 'light', // theme for nav menu
   layout: 'sidemenu', // nav menu position: sidemenu or topmenu
   contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu

+ 2 - 2
src/main.js

@@ -68,9 +68,9 @@ Vue.prototype.postFormAction = postFormAction
 Vue.prototype.postDataAction = postAction
 Vue.prototype.getAction = getAction
 //登陆界面logo
-Vue.prototype.imgUrl = require("@assets/logo-cd-left1.png")
+Vue.prototype.imgUrl = require("@assets/logo-blue.png")
 //首页左上角logo
-Vue.prototype.logoUrl = require("@assets/logo-cd-left1.png")
+Vue.prototype.logoUrl = require("@assets/logo-cd-left.png")
 Vue.use(dataV)
 new Vue({
     router,