Merge remote-tracking branch 'origin/dev' into dev

src/config/setting.js

@@ -2,7 +2,7 @@
 export const API_BASE_URL = process.env.VUE_APP_API_BASE_URL;
 
 // 项目名称
-export const PROJECT_NAME = '工业互联网平台';
+export const PROJECT_NAME = ''; // '工业互联网平台'
 
 // 不显示侧栏的路由
 export const HIDE_SIDEBARS = [];

src/layout/components/setting-drawer.vue

@@ -339,7 +339,7 @@ export default {
   },
   created() {
     this.initColorValue();
-    // this.getLogo()
+    this.getLogo()
   },
   methods: {
 

src/layout/index.vue

@@ -21,7 +21,7 @@
     :colorful-icon="theme.colorfulIcon"
     :side-unique-open="theme.sideUniqueOpen"
     :style-responsive="theme.styleResponsive"
-
+    :project-name="projectName"
     :hide-footers="HIDE_FOOTERS"
     :hide-sidebars="HIDE_SIDEBARS"
     :repeatable-tabs="REPEATABLE_TABS"
@@ -48,12 +48,12 @@
     @set-home-components="setHomeComponents"
     @tab-context-menu="onTabContextMenu"
   >
-<!--    :project-name="projectName"   -->
+
     <!-- 路由出口 -->
     <router-layout />
     <!-- logo 图标 -->
     <template v-slot:logo>
-      <!-- <el-image v-if="logoImg" fit="contain" :src="logoImg" alt="logo" /> -->
+      <el-image  v-if="logoImg" fit="contain" :src="logoImg" alt="logo" />
     </template>
 
     <!-- 顶栏右侧区域 -->
@@ -266,11 +266,12 @@
 <style lang="scss">
   .ele-admin-layout {
     .ele-admin-logo {
-      //font-size: 18px !important;
+      font-size: 18px !important;
 
       img {
-        width: 50px !important;
-        height: auto !important;
+        height: 32px !important;
+        width: auto;
+        margin-right: 6px;
       }
     }
   }
@@ -373,7 +374,6 @@
   //}
   .ele-admin-layout .ele-admin-logo {
     //font-size: 0 !important;
-    background-image: url('@/assets/logo.png') !important;
     background-size: cover !important;
     background-repeat: no-repeat !important;
     background-position: center center !important;