2023-7-21

src/layout/components/Sidebar/Logo.vue

@@ -1,89 +1,89 @@
-<template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}">
-    <transition name="sidebarLogoFade">
+<template>
+  <div class="sidebar-logo-container" :class="{'collapse':collapse}">
+    <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
 
-          <img src="../../../assets/logo-mini.png?v=1" class="sidebar-logo">
-      </router-link>
+          <img src="../../../assets/logo-mini.png?v=1" class="sidebar-logo">
+      </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
           <img src="../../../assets/logo-mini.png?v=1" class="sidebar-logo">
-        <img src="../../../assets/logo.png?v=2" class="sidebar-name-logo" />
-      </router-link>
-    </transition>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: 'SidebarLogo',
-    props: {
-      collapse: {
-        type: Boolean,
-        required: true
-      }
-    },
-    data() {
-      return {
-        title: '',
-        logo: false
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .sidebarLogoFade-enter-active {
-    transition: opacity 1.5s;
-  }
-  .sidebar-name-logo {
-    width: 120px;
-    height: 22px;
-  }
-
-  .sidebarLogoFade-enter,
-  .sidebarLogoFade-leave-to {
-    opacity: 0;
-  }
-
-  .sidebar-logo-container {
-    position: relative;
-    width: 100%;
-    height: 50px;
-    line-height: 50px;
-    background: #fff;
-    text-align: center;
-    overflow: hidden;
-
-    & .sidebar-logo-link {
-      height: 100%;
-      width: 100%;
-      display: flex !important;
-      justify-content: center;
-      align-items: center;
-
-      & .sidebar-logo {
-        width: 38px;
-        height: 38px;
-        vertical-align: middle;
-        margin-right: 12px;
-      }
-
-      & .sidebar-title {
-        display: inline-block;
-        margin: 0;
-        color: #fff;
-        font-weight: 600;
-        line-height: 50px;
-        font-size: 14px;
-        font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
-        vertical-align: middle;
-      }
-    }
-
-    &.collapse {
-      .sidebar-logo {
-        margin-right: 0px;
-      }
-    }
-  }
+          <img src="../../../assets/logo.png?v=2" class="sidebar-name-logo" />
+      </router-link>
+    </transition>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'SidebarLogo',
+    props: {
+      collapse: {
+        type: Boolean,
+        required: true
+      }
+    },
+    data() {
+      return {
+        title: '',
+        logo: false
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .sidebarLogoFade-enter-active {
+    transition: opacity 1.5s;
+  }
+  .sidebar-name-logo {
+    width: 120px;
+    object-fit: contain;
+  }
+
+  .sidebarLogoFade-enter,
+  .sidebarLogoFade-leave-to {
+    opacity: 0;
+  }
+
+  .sidebar-logo-container {
+    position: relative;
+    width: 100%;
+    height: 50px;
+    line-height: 50px;
+    background: #fff;
+    text-align: center;
+    overflow: hidden;
+
+    & .sidebar-logo-link {
+      height: 100%;
+      width: 100%;
+      display: flex !important;
+      justify-content: center;
+      align-items: center;
+
+      & .sidebar-logo {
+        width: 38px;
+        height: 38px;
+        vertical-align: middle;
+        margin-right: 12px;
+      }
+
+      & .sidebar-title {
+        display: inline-block;
+        margin: 0;
+        color: #fff;
+        font-weight: 600;
+        line-height: 50px;
+        font-size: 14px;
+        font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
+        vertical-align: middle;
+      }
+    }
+
+    &.collapse {
+      .sidebar-logo {
+        margin-right: 0px;
+      }
+    }
+  }
 </style>

src/store/modules/permission.js

@@ -96,6 +96,9 @@ const componentHandler = (path) => {
 // path为#,左边栏根目录无视图，##下级根目录无视图，$不显示在左边栏视图，^左边栏根目录有视图
 export function generaMenu(routes, data) {
   data.forEach(item => {
+    if (!item.path) {
+      item.path = item.url
+    }
     let params = {};
     if(item.path?.includes('?')){
       let flag = item.path.split('?')
@@ -128,6 +131,7 @@ export function generaMenu(routes, data) {
             id: item.id,
             roles: ['admin'],
             params,
+            auths:item.has_auth_node_tags,
 
             icon: item.icon
           }

src/styles/element-variables.scss

@@ -1,7 +1,7 @@
 /* 改变主题色变量 */
-$--color-primary: #0077CC;
+$--color-primary: #5585bf;
 
 /* 改变 icon 字体路径变量，必需 */
 $--font-path: '~element-ui/lib/theme-chalk/fonts';
 
-@import "~element-ui/packages/theme-chalk/src/index";
+@import "~element-ui/packages/theme-chalk/src/index";

src/styles/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 4052909 */
-  src: url('iconfont.woff2?t=1683361610626') format('woff2'),
-       url('iconfont.woff?t=1683361610626') format('woff'),
-       url('iconfont.ttf?t=1683361610626') format('truetype');
+  font-family: "iconfont"; /* Project id 4177958 */
+  src: url('iconfont.woff2?t=1689926089256') format('woff2'),
+       url('iconfont.woff?t=1689926089256') format('woff'),
+       url('iconfont.ttf?t=1689926089256') format('truetype');
 }
 
 .iconfont {
@@ -13,107 +13,55 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-jurassic_process-list:before {
-  content: "\e6c4";
+.icon-zaixianquhao:before {
+  content: "\e63a";
 }
 
-.icon-biaodan:before {
-  content: "\e663";
+.icon-anquan:before {
+  content: "\e865";
 }
 
-.icon-biaozhunhuaguizeguanli:before {
-  content: "\e60a";
+.icon-bencunjiadi:before {
+  content: "\e606";
 }
 
-.icon-a-zhidu6:before {
-  content: "\eb07";
+.icon-jingyingzhuangkuang-2:before {
+  content: "\e604";
 }
 
-.icon-dat:before {
-  content: "\e691";
+.icon-zcjd:before {
+  content: "\e601";
 }
 
-.icon-audio:before {
-  content: "\e692";
+.icon-jingyingfengxianfenxi:before {
+  content: "\e609";
 }
 
-.icon-video:before {
-  content: "\e693";
+.icon-shujudizuo:before {
+  content: "\e6dc";
 }
 
-.icon-zip:before {
-  content: "\e694";
+.icon-iconfontzhizuobiaozhunbduan27:before {
+  content: "\e6e1";
 }
 
-.icon-image:before {
-  content: "\e695";
+.icon-chuzu:before {
+  content: "\e6d6";
 }
 
-.icon-pdf:before {
-  content: "\e696";
+.icon-xunjian:before {
+  content: "\e685";
 }
 
-.icon-ppt:before {
-  content: "\e697";
+.icon-taizhangzhangbumingxiweihu:before {
+  content: "\e654";
 }
 
-.icon-21excel:before {
-  content: "\e698";
+.icon-shujutongji:before {
+  content: "\e614";
 }
 
-.icon-21word:before {
-  content: "\e699";
-}
-
-.icon-21move:before {
-  content: "\e69a";
-}
-
-.icon-21setting:before {
-  content: "\e69b";
-}
-
-.icon-21upload:before {
-  content: "\e69c";
-}
-
-.icon-21download:before {
-  content: "\e69d";
-}
-
-.icon-21cancel:before {
-  content: "\e69e";
-}
-
-.icon-21ok:before {
-  content: "\e69f";
-}
-
-.icon-21copy:before {
-  content: "\e6a0";
-}
-
-.icon-21delete:before {
-  content: "\e6a1";
-}
-
-.icon-21edit:before {
-  content: "\e6a2";
-}
-
-.icon-21new:before {
-  content: "\e6a3";
-}
-
-.icon-21folder:before {
-  content: "\e6a4";
-}
-
-.icon-21mutil:before {
-  content: "\e6a5";
-}
-
-.icon-21file:before {
-  content: "\e6a6";
+.icon-jingyingguanli:before {
+  content: "\e600";
 }
 

src/styles/variables.scss

@@ -13,7 +13,7 @@ $subMenuHover:rgba(242, 242, 242, .4);
 $submenuActiveBg:rgba(242, 242, 242, .4);
 
 $sideBarWidth: 210px;
-$primaryColor: #0077CC;
+$primaryColor: #5585bf;
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
 :export {

src/styles/viewui-mine.less

@@ -1,4 +1,4 @@
 @import '~view-design/src/styles/index.less';
 
 // Here are the variables to cover, such as:
-@primary-color: #0077CC;
+@primary-color: #5585bf;