Parcourir la source

博物馆样式

shenji il y a 2 ans
Parent
commit
d1c4cf61d8

+ 308 - 300
public/index.html

@@ -1,301 +1,309 @@
-<!DOCTYPE html>
-<html lang="zh-cmn-Hans">
-
-<head>
-  <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-SY.png">
- <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/7.2.5/polyfill.js"></script> -->
-  <style>
-    html,
-    body,
-    #app {
-      height: 100%;
-      margin: 0px;
-      padding: 0px;
-    }
-    .ant-modal-root>.ant-modal-wrap>.ant-modal {
-      min-width: 55% !important;
-    }
-      
-    .chromeframe {
-      margin: 0.2em 0;
-      background: #ccc;
-      color: #000;
-      padding: 0.2em 0;
-    }
-    #loader-wrapper {
-      position: fixed;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-      z-index: 999999;
-    }
-    #loader {
-      display: block;
-      position: relative;
-      left: 50%;
-      top: 50%;
-      width: 120px;
-      height: 120px;
-      margin: -75px 0 0 -75px;
-      border-radius: 50%;
-      border: 3px solid transparent;
-      /* COLOR 1 */
-      border-top-color: #FFF;
-      -webkit-animation: spin 2s linear infinite;
-      /* Chrome, Opera 15+, Safari 5+ */
-      -ms-animation: spin 2s linear infinite;
-      /* Chrome, Opera 15+, Safari 5+ */
-      -moz-animation: spin 2s linear infinite;
-      /* Chrome, Opera 15+, Safari 5+ */
-      -o-animation: spin 2s linear infinite;
-      /* Chrome, Opera 15+, Safari 5+ */
-      animation: spin 2s linear infinite;
-      /* Chrome, Firefox 16+, IE 10+, Opera */
-      z-index: 1001;
-    }
-    #loader:before {
-      content: "";
-      position: absolute;
-      top: 5px;
-      left: 5px;
-      right: 5px;
-      bottom: 5px;
-      border-radius: 50%;
-      border: 3px solid transparent;
-      /* COLOR 2 */
-      border-top-color: #FFF;
-      -webkit-animation: spin 3s linear infinite;
-      /* Chrome, Opera 15+, Safari 5+ */
-      -moz-animation: spin 3s linear infinite;
-      /* Chrome, Opera 15+, Safari 5+ */
-      -o-animation: spin 3s linear infinite;
-      /* Chrome, Opera 15+, Safari 5+ */
-      -ms-animation: spin 3s linear infinite;
-      /* Chrome, Opera 15+, Safari 5+ */
-      animation: spin 3s linear infinite;
-      /* Chrome, Firefox 16+, IE 10+, Opera */
-    }
-    #loader:after {
-      content: "";
-      position: absolute;
-      top: 15px;
-      left: 15px;
-      right: 15px;
-      bottom: 15px;
-      border-radius: 50%;
-      border: 3px solid transparent;
-      border-top-color: #FFF;
-      /* COLOR 3 */
-      -moz-animation: spin 1.5s linear infinite;
-      /* Chrome, Opera 15+, Safari 5+ */
-      -o-animation: spin 1.5s linear infinite;
-      /* Chrome, Opera 15+, Safari 5+ */
-      -ms-animation: spin 1.5s linear infinite;
-      /* Chrome, Opera 15+, Safari 5+ */
-      -webkit-animation: spin 1.5s linear infinite;
-      /* Chrome, Opera 15+, Safari 5+ */
-      animation: spin 1.5s linear infinite;
-      /* Chrome, Firefox 16+, IE 10+, Opera */
-    }
-    @-webkit-keyframes spin {
-      0% {
-        -webkit-transform: rotate(0deg);
-        /* Chrome, Opera 15+, Safari 3.1+ */
-        -ms-transform: rotate(0deg);
-        /* IE 9 */
-        transform: rotate(0deg);
-        /* Firefox 16+, IE 10+, Opera */
-      }
-      100% {
-        -webkit-transform: rotate(360deg);
-        /* Chrome, Opera 15+, Safari 3.1+ */
-        -ms-transform: rotate(360deg);
-        /* IE 9 */
-        transform: rotate(360deg);
-        /* Firefox 16+, IE 10+, Opera */
-      }
-    }
-    @keyframes spin {
-      0% {
-        -webkit-transform: rotate(0deg);
-        /* Chrome, Opera 15+, Safari 3.1+ */
-        -ms-transform: rotate(0deg);
-        /* IE 9 */
-        transform: rotate(0deg);
-        /* Firefox 16+, IE 10+, Opera */
-      }
-      100% {
-        -webkit-transform: rotate(360deg);
-        /* Chrome, Opera 15+, Safari 3.1+ */
-        -ms-transform: rotate(360deg);
-        /* IE 9 */
-        transform: rotate(360deg);
-        /* Firefox 16+, IE 10+, Opera */
-      }
-    }
-    #loader-wrapper .loader-section {
-      position: fixed;
-      top: 0;
-      width: 51%;
-      height: 100%;
-      background: #49a9ee;
-      /* Old browsers */
-      z-index: 1000;
-      -webkit-transform: translateX(0);
-      /* Chrome, Opera 15+, Safari 3.1+ */
-      -ms-transform: translateX(0);
-      /* IE 9 */
-      transform: translateX(0);
-      /* Firefox 16+, IE 10+, Opera */
-    }
-    #loader-wrapper .loader-section.section-left {
-      left: 0;
-    }
-    #loader-wrapper .loader-section.section-right {
-      right: 0;
-    }
-    /* Loaded */
-    .loaded #loader-wrapper .loader-section.section-left {
-      -webkit-transform: translateX(-100%);
-      /* Chrome, Opera 15+, Safari 3.1+ */
-      -ms-transform: translateX(-100%);
-      /* IE 9 */
-      transform: translateX(-100%);
-      /* Firefox 16+, IE 10+, Opera */
-      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-    }
-    .loaded #loader-wrapper .loader-section.section-right {
-      -webkit-transform: translateX(100%);
-      /* Chrome, Opera 15+, Safari 3.1+ */
-      -ms-transform: translateX(100%);
-      /* IE 9 */
-      transform: translateX(100%);
-      /* Firefox 16+, IE 10+, Opera */
-      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-    }
-    .loaded #loader {
-      opacity: 0;
-      -webkit-transition: all 0.3s ease-out;
-      transition: all 0.3s ease-out;
-    }
-    .loaded #loader-wrapper {
-      visibility: hidden;
-      -webkit-transform: translateY(-100%);
-      /* Chrome, Opera 15+, Safari 3.1+ */
-      -ms-transform: translateY(-100%);
-      /* IE 9 */
-      transform: translateY(-100%);
-      /* Firefox 16+, IE 10+, Opera */
-      -webkit-transition: all 0.3s 1s ease-out;
-      transition: all 0.3s 1s ease-out;
-    }
-    /* JavaScript Turned Off */
-    .no-js #loader-wrapper {
-      display: none;
-    }
-    .no-js h1 {
-      color: #222222;
-    }
-    #loader-wrapper .load_title {
-      font-family: 'Open Sans';
-      color: #FFF;
-      font-size: 14px;
-      width: 100%;
-      text-align: center;
-      z-index: 9999999999999;
-      position: absolute;
-      top: 60%;
-      opacity: 1;
-      line-height: 30px;
-    }
-    #loader-wrapper .load_title span {
-      font-weight: normal;
-      font-style: italic;
-      font-size: 14px;
-      color: #FFF;
-      opacity: 0.5;
-    }
-    /* 滚动条优化 start */
-    ::-webkit-scrollbar{
-      width:8px;
-      height:8px;
-    }
-    ::-webkit-scrollbar-track{
-      background: #f6f6f6;
-      border-radius:2px;
-    }
-    ::-webkit-scrollbar-thumb{
-      background: #cdcdcd;
-      border-radius:2px;
-    }
-    ::-webkit-scrollbar-thumb:hover{
-      background: #747474;
-    }
-    ::-webkit-scrollbar-corner {
-      background: #f6f6f6;
-    }
-     
-     .ant-modal-body {
-       margin-left: 2%;
-       max-height: calc(80vh - 70px);
-       overflow-y: auto;
-       &::-webkit-scrollbar {
-         width: 6px;
-         /*高宽分别对应横竖滚动条的尺寸*/
-         height: 1px;
-       }
-      
-       &::-webkit-scrollbar-thumb {
-         // -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-         background: #e3e3e6;
-         border-radius: 6px;
-       }
-      
-       &::-webkit-scrollbar-track {
-         background: transparent;
-         // -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-         border-radius: 5px;
-       }
-     }
-      
-      /* 技能博物馆 */
-      /* #home .ccfullCalendar .fc-scrollgrid-sync-inner a{
-        color: black !important;
-      }
-      #home .ccfullCalendar[data-v-3ca0fc72] .fc-day-today{
-      background-color: #f0eff4 !important;
-      } */
-    /* 滚动条优化 end */
-  </style>
-  <!-- 全局配置 -->
-  <script>
-    window._CONFIG = {};
    // window._CONFIG['domianURL'] = 'http://127.0.0.1:8090/jeecg-boot'; // 本地测试
    // window._CONFIG['domianURL'] = 'http://106.15.206.14:8087/jeecg-boot';// 测试服务器
    window._CONFIG['domianURL'] = 'http://www.myfitt.cn:18087/jeecg-boot';// 森语外网
    // window._CONFIG['domianURL'] = 'http://172.18.91.36:8081/jeecg-boot';// 博物馆oa
    window._CONFIG['casPrefixUrl'] = 'http://www.myfitt.cn:18005/cas';
    window._CONFIG['onlinePreviewDomainURL'] = 'http://fileview.jeecg.com/onlinePreview'
    window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/static';
    window._CONFIG['pdfDomainURL'] =  window._CONFIG['domianURL'] + '/sys/common/pdf/pdfPreviewIframe';
-  </script>
-</head>
-
-<body>
-<!-- built files will be auto injected -->
-<div id="app">
-  <div id="loader-wrapper">
-    <div id="loader"></div>
-    <div class="loader-section section-left"></div>
-    <div class="loader-section section-right"></div>
-    <div class="load_title">正在加载 请耐心等待
-
-    </div>
-  </div>
-</div>
-
-</body>
-
+<!DOCTYPE html>
+<html lang="zh-cmn-Hans">
+
+<head>
+  <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-SY.png"> -->
+ <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/7.2.5/polyfill.js"></script> -->
+  <style>
+    html,
+    body,
+    #app {
+      height: 100%;
+      margin: 0px;
+      padding: 0px;
+    }
+    .ant-modal-root>.ant-modal-wrap>.ant-modal {
+      min-width: 55% !important;
+    }
+      
+    .chromeframe {
+      margin: 0.2em 0;
+      background: #ccc;
+      color: #000;
+      padding: 0.2em 0;
+    }
+    #loader-wrapper {
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      z-index: 999999;
+    }
+    #loader {
+      display: block;
+      position: relative;
+      left: 50%;
+      top: 50%;
+      width: 120px;
+      height: 120px;
+      margin: -75px 0 0 -75px;
+      border-radius: 50%;
+      border: 3px solid transparent;
+      /* COLOR 1 */
+      border-top-color: #FFF;
+      -webkit-animation: spin 2s linear infinite;
+      /* Chrome, Opera 15+, Safari 5+ */
+      -ms-animation: spin 2s linear infinite;
+      /* Chrome, Opera 15+, Safari 5+ */
+      -moz-animation: spin 2s linear infinite;
+      /* Chrome, Opera 15+, Safari 5+ */
+      -o-animation: spin 2s linear infinite;
+      /* Chrome, Opera 15+, Safari 5+ */
+      animation: spin 2s linear infinite;
+      /* Chrome, Firefox 16+, IE 10+, Opera */
+      z-index: 1001;
+    }
+    #loader:before {
+      content: "";
+      position: absolute;
+      top: 5px;
+      left: 5px;
+      right: 5px;
+      bottom: 5px;
+      border-radius: 50%;
+      border: 3px solid transparent;
+      /* COLOR 2 */
+      border-top-color: #FFF;
+      -webkit-animation: spin 3s linear infinite;
+      /* Chrome, Opera 15+, Safari 5+ */
+      -moz-animation: spin 3s linear infinite;
+      /* Chrome, Opera 15+, Safari 5+ */
+      -o-animation: spin 3s linear infinite;
+      /* Chrome, Opera 15+, Safari 5+ */
+      -ms-animation: spin 3s linear infinite;
+      /* Chrome, Opera 15+, Safari 5+ */
+      animation: spin 3s linear infinite;
+      /* Chrome, Firefox 16+, IE 10+, Opera */
+    }
+    #loader:after {
+      content: "";
+      position: absolute;
+      top: 15px;
+      left: 15px;
+      right: 15px;
+      bottom: 15px;
+      border-radius: 50%;
+      border: 3px solid transparent;
+      border-top-color: #FFF;
+      /* COLOR 3 */
+      -moz-animation: spin 1.5s linear infinite;
+      /* Chrome, Opera 15+, Safari 5+ */
+      -o-animation: spin 1.5s linear infinite;
+      /* Chrome, Opera 15+, Safari 5+ */
+      -ms-animation: spin 1.5s linear infinite;
+      /* Chrome, Opera 15+, Safari 5+ */
+      -webkit-animation: spin 1.5s linear infinite;
+      /* Chrome, Opera 15+, Safari 5+ */
+      animation: spin 1.5s linear infinite;
+      /* Chrome, Firefox 16+, IE 10+, Opera */
+    }
+    @-webkit-keyframes spin {
+      0% {
+        -webkit-transform: rotate(0deg);
+        /* Chrome, Opera 15+, Safari 3.1+ */
+        -ms-transform: rotate(0deg);
+        /* IE 9 */
+        transform: rotate(0deg);
+        /* Firefox 16+, IE 10+, Opera */
+      }
+      100% {
+        -webkit-transform: rotate(360deg);
+        /* Chrome, Opera 15+, Safari 3.1+ */
+        -ms-transform: rotate(360deg);
+        /* IE 9 */
+        transform: rotate(360deg);
+        /* Firefox 16+, IE 10+, Opera */
+      }
+    }
+    @keyframes spin {
+      0% {
+        -webkit-transform: rotate(0deg);
+        /* Chrome, Opera 15+, Safari 3.1+ */
+        -ms-transform: rotate(0deg);
+        /* IE 9 */
+        transform: rotate(0deg);
+        /* Firefox 16+, IE 10+, Opera */
+      }
+      100% {
+        -webkit-transform: rotate(360deg);
+        /* Chrome, Opera 15+, Safari 3.1+ */
+        -ms-transform: rotate(360deg);
+        /* IE 9 */
+        transform: rotate(360deg);
+        /* Firefox 16+, IE 10+, Opera */
+      }
+    }
+    #loader-wrapper .loader-section {
+      position: fixed;
+      top: 0;
+      width: 51%;
+      height: 100%;
+      background: #49a9ee;
+      /* Old browsers */
+      z-index: 1000;
+      -webkit-transform: translateX(0);
+      /* Chrome, Opera 15+, Safari 3.1+ */
+      -ms-transform: translateX(0);
+      /* IE 9 */
+      transform: translateX(0);
+      /* Firefox 16+, IE 10+, Opera */
+    }
+    #loader-wrapper .loader-section.section-left {
+      left: 0;
+    }
+    #loader-wrapper .loader-section.section-right {
+      right: 0;
+    }
+    /* Loaded */
+    .loaded #loader-wrapper .loader-section.section-left {
+      -webkit-transform: translateX(-100%);
+      /* Chrome, Opera 15+, Safari 3.1+ */
+      -ms-transform: translateX(-100%);
+      /* IE 9 */
+      transform: translateX(-100%);
+      /* Firefox 16+, IE 10+, Opera */
+      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+    }
+    .loaded #loader-wrapper .loader-section.section-right {
+      -webkit-transform: translateX(100%);
+      /* Chrome, Opera 15+, Safari 3.1+ */
+      -ms-transform: translateX(100%);
+      /* IE 9 */
+      transform: translateX(100%);
+      /* Firefox 16+, IE 10+, Opera */
+      -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+      transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
+    }
+    .loaded #loader {
+      opacity: 0;
+      -webkit-transition: all 0.3s ease-out;
+      transition: all 0.3s ease-out;
+    }
+    .loaded #loader-wrapper {
+      visibility: hidden;
+      -webkit-transform: translateY(-100%);
+      /* Chrome, Opera 15+, Safari 3.1+ */
+      -ms-transform: translateY(-100%);
+      /* IE 9 */
+      transform: translateY(-100%);
+      /* Firefox 16+, IE 10+, Opera */
+      -webkit-transition: all 0.3s 1s ease-out;
+      transition: all 0.3s 1s ease-out;
+    }
+    /* JavaScript Turned Off */
+    .no-js #loader-wrapper {
+      display: none;
+    }
+    .no-js h1 {
+      color: #222222;
+    }
+    #loader-wrapper .load_title {
+      font-family: 'Open Sans';
+      color: #FFF;
+      font-size: 14px;
+      width: 100%;
+      text-align: center;
+      z-index: 9999999999999;
+      position: absolute;
+      top: 60%;
+      opacity: 1;
+      line-height: 30px;
+    }
+    #loader-wrapper .load_title span {
+      font-weight: normal;
+      font-style: italic;
+      font-size: 14px;
+      color: #FFF;
+      opacity: 0.5;
+    }
+    /* 滚动条优化 start */
+    ::-webkit-scrollbar{
+      width:8px;
+      height:8px;
+    }
+    ::-webkit-scrollbar-track{
+      background: #f6f6f6;
+      border-radius:2px;
+    }
+    ::-webkit-scrollbar-thumb{
+      background: #cdcdcd;
+      border-radius:2px;
+    }
+    ::-webkit-scrollbar-thumb:hover{
+      background: #747474;
+    }
+    ::-webkit-scrollbar-corner {
+      background: #f6f6f6;
+    }
+     
+     .ant-modal-body {
+       margin-left: 2%;
+       max-height: calc(80vh - 70px);
+       overflow-y: auto;
+       &::-webkit-scrollbar {
+         width: 6px;
+         /*高宽分别对应横竖滚动条的尺寸*/
+         height: 1px;
+       }
+      
+       &::-webkit-scrollbar-thumb {
+         // -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+         background: #e3e3e6;
+         border-radius: 6px;
+       }
+      
+       &::-webkit-scrollbar-track {
+         background: transparent;
+         // -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+         border-radius: 5px;
+       }
+     }
+      
+      /* 技能博物馆 */
+      #home .ccfullCalendar .fc-scrollgrid-sync-inner a{
+        color: black !important;
+      }
+      #home .ccfullCalendar[data-v-3ca0fc72] .fc-day-today{
+      background-color: #f0eff4 !important;
+      }
+    /* 滚动条优化 end */
+  </style>
+  <!-- 全局配置 -->
+  <script>
+    window._CONFIG = {};
+    // window._CONFIG['domianURL'] = 'http://127.0.0.1:8090/jeecg-boot'; // 本地测试
+    // window._CONFIG['domianURL'] = 'http://106.15.206.14:8087/jeecg-boot';// 测试服务器
+    // window._CONFIG['domianURL'] = 'http://www.myfitt.cn:18087/jeecg-boot';// 森语外网
+    window._CONFIG['domianURL'] = 'http://172.18.91.36:8081/jeecg-boot';// 博物馆oa
+    window._CONFIG['casPrefixUrl'] = 'http://www.myfitt.cn:18005/cas';
+    window._CONFIG['onlinePreviewDomainURL'] = 'http://fileview.jeecg.com/onlinePreview'
+    window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/static';
+    window._CONFIG['pdfDomainURL'] =  window._CONFIG['domianURL'] + '/sys/common/pdf/pdfPreviewIframe';
+  </script>
+</head>
+
+<body>
+<!-- built files will be auto injected -->
+<div id="app">
+  <div id="loader-wrapper">
+    <div id="loader"></div>
+    <div class="loader-section section-left"></div>
+    <div class="loader-section section-right"></div>
+    <div class="load_title">正在加载 请耐心等待
+
+    </div>
+  </div>
+</div>
+
+</body>
+
 </html>

+ 2 - 2
src/assets/less/mytodo.less

@@ -98,8 +98,8 @@
 
   // 日历
   .ccfullCalendar {
-    background-image: url('../date03.jpg');
-    // background-color: white; //技能博物馆
+    // background-image: url('../date03.jpg');
+    background-color: white; //技能博物馆
     opacity: 0.8;
     background-size: cover;
     background-repeat: no-repeat;

+ 2 - 2
src/components/tools/HeaderNotice.vue

@@ -84,9 +84,9 @@
     <span @click="fetchNotice" class="header-notice">
       <a-badge :count="msgTotal"><StepBackwardOutlined />
         <!-- 技能博物馆 -->
-        <!-- <a-icon style="color:grey; font-size: 16px; padding: 4px" type="bell" />    -->
+        <a-icon style="color:grey; font-size: 16px; padding: 4px" type="bell" />   
         <!-- 森语 -->
-        <a-icon style="font-size: 16px; padding: 4px" type="bell" />
+        <!-- <a-icon style="font-size: 16px; padding: 4px" type="bell" /> -->
       </a-badge>
     </span>
     <show-announcement ref="ShowAnnouncement" @ok="modalFormOk"></show-announcement>

+ 2 - 2
src/components/tools/UserMenu.vue

@@ -266,7 +266,7 @@
     text-decoration: none;
   }
   /* 技能博物馆 */
-  /* .layout .header .user-wrapper .action .avatar, .layout .top-nav-header-index .user-wrapper .action .avatar{
+  .layout .header .user-wrapper .action .avatar, .layout .top-nav-header-index .user-wrapper .action .avatar{
     background: grey;
-  } */
+  }
 </style>

+ 9 - 9
src/defaultSettings.js

@@ -24,19 +24,19 @@ export default {
   colorWeak: false,
   multipage: true, //默认多页签模式
   //登陆界面logo
-  imgUrl : require("@assets/logo-new.png"), //森语
-  // imgUrl : require("@assets/logo-cd-left1.png"), //技能博物馆
+  // imgUrl : require("@assets/logo-new.png"), //森语
+  imgUrl : require("@assets/logo-cd-left1.png"), //技能博物馆
   //首页左上角logo
-  //  logoUrl : require("@assets/logo-cd-left1.png"), 
-  logoUrl : require("@assets/logo-new.png"),
+   logoUrl : require("@assets/logo-cd-left1.png"), 
+  // logoUrl : require("@assets/logo-new.png"),
    //菜单样式
-   mode:'vertical', //森语
-  //  mode:'inline', //技能博物馆
+  //  mode:'vertical', //森语
+   mode:'inline', //技能博物馆
    //文字信息
-   bottonTitle:'森语国际贸易有限公司',
-  //  bottonTitle:'OA办公系统',
+  //  bottonTitle:'森语国际贸易有限公司',
+   bottonTitle:'OA办公系统',
   //  topTitle:'森语',
-  //  topTitle:'OA办公系统',
+   topTitle:'OA办公系统',
   // vue-ls options
   storageOptions: {
     namespace: 'pro__', // key prefix

+ 5 - 5
src/main.js

@@ -72,10 +72,10 @@ Vue.prototype.getAction = getAction
 
 Vue.use(dataV)
 
-SSO.init(() => {
-    main()
-  })
-function main() {
+// SSO.init(() => {
+//     main()
+//   })
+// function main() {
 new Vue({
     router,
     store,
@@ -99,4 +99,4 @@ new Vue({
     },
     render: h => h(App)
 }).$mount('#app')
-}
+// }

+ 2 - 2
url.config.js

@@ -14,7 +14,7 @@ export function getProjctManageUrl(){
 }
 
 export function getProjctName(){
-    let name="森语";
-    // let name="技能博物馆";
+    // let name="森语";
+    let name="技能博物馆";
     return name;
 }

+ 10 - 10
vue.config.js

@@ -47,16 +47,16 @@ module.exports = {
           /* less 变量覆盖,用于自定义 ant design 主题 */
           // 'primary-color': '#2f2c6a', //技能博物馆
           'primary-color': '#6bc5f3', //森语-技能博物馆也可用
-          // 'top-b-color': '#fff', //技能博物馆
-          'top-b-color': '#6bc5f3', //森语
+          'top-b-color': '#fff', //技能博物馆
+          // 'top-b-color': '#6bc5f3', //森语
           'link-color': '#6bc5f3',
           'border-radius-base': '4px',
-          'menu-top-font-color':'#fff', //顶部菜单字体颜色-森语
-          // 'menu-top-font-color':'grey', //顶部菜单字体颜色 - 技能博物馆
-          // 'font-color':'#fff', //侧边栏字体颜色-技能博物馆
-          'font-color':'#595959', //侧边栏字体颜色
-          'layout-color':'#fff', //侧边栏背景颜色-森语
-          // 'layout-color':' #221140', //侧边栏背景颜色-技能博物馆
+          // 'menu-top-font-color':'#fff', //顶部菜单字体颜色-森语
+          'menu-top-font-color':'grey', //顶部菜单字体颜色 - 技能博物馆
+          'font-color':'#fff', //侧边栏字体颜色-技能博物馆
+          // 'font-color':'#595959', //侧边栏字体颜色
+          // 'layout-color':'#fff', //侧边栏背景颜色-森语
+          'layout-color':' #221140', //侧边栏背景颜色-技能博物馆
          
         },
         javascriptEnabled: true
@@ -75,9 +75,9 @@ module.exports = {
         }
       }, */
       '/jeecg-boot': {
-        // target: 'http://127.0.0.1:8090', // 请求本地 需要jeecg-boot后台项目
+        target: 'http://127.0.0.1:8090', // 请求本地 需要jeecg-boot后台项目
         // target: 'http://106.15.206.14:8087', // 测试环境
-        target: 'http://220.191.168.86:18087', // 森语外
+        // target: 'http://220.191.168.86:18087', // 森语外
         // target: 'http://10.0.0.74:8090', // 
         // target: 'http://10.0.0.34:8090',