diff --git a/index.html b/index.html
index 72dff54..3609a99 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
网关采集配置器
-
+
diff --git a/package.json b/package.json
index c873d00..918d964 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
"qs": "^6.11.1",
"screenfull": "^6.0.2",
"sortablejs": "^1.15.0",
+ "vite-plugin-qiankun": "^1.0.15",
"vue": "^3.2.47",
"vue-clipboard3": "^2.0.0",
"vue-demi": "^0.13.11",
diff --git a/public/favicon.ico b/public/favicon.ico
index d7c508a..a256e26 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/js/config.js b/public/js/config.js
index ff830b9..1e72cc8 100644
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -13,4 +13,6 @@ window.baseConfig = {
prodApi: '',
protocol: 'http://',
wsProtocol: 'ws://'
-}
\ No newline at end of file
+}
+
+localStorage.setItem('baseConfig', JSON.stringify(window.baseConfig));
diff --git a/src/assets/logo-mini.png b/src/assets/logo-mini.png
new file mode 100644
index 0000000..c57a1db
Binary files /dev/null and b/src/assets/logo-mini.png differ
diff --git a/src/layout/component/aside.vue b/src/layout/component/aside.vue
index 2f55062..a49f2ee 100644
--- a/src/layout/component/aside.vue
+++ b/src/layout/component/aside.vue
@@ -16,10 +16,12 @@ import { useRoutesList } from '/@/stores/routesList';
import { useThemeConfig } from '/@/stores/themeConfig';
import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
import mittBus from '/@/utils/mitt';
+import { useRoute } from 'vue-router';
// 引入组件
const Logo = defineAsyncComponent(() => import('/@/layout/logo/index.vue'));
const Vertical = defineAsyncComponent(() => import('/@/layout/navMenu/vertical.vue'));
+const route = useRoute();
// 定义变量内容
const layoutAsideScrollbarRef = ref();
@@ -69,6 +71,13 @@ const setCollapseStyle = computed(() => {
// 设置显示/隐藏 logo
const setShowLogo = computed(() => {
let { layout, isShowLogo } = themeConfig.value;
+ let hideHeader = JSON.parse(localStorage.getItem('hideHeader'));
+ if(hideHeader!==null){
+ isShowLogo = hideHeader?true:false;
+ }
+ if(route.query.hideHeader!=undefined){
+ isShowLogo = route.query.hideHeader!='true'?true:false;
+ }
return (isShowLogo && layout === 'defaults') || (isShowLogo && layout === 'columns');
});
// 关闭移动端蒙版
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 331cf29..4c27a87 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -26,16 +26,16 @@ const onLayoutResize = () => {
if (!Local.get('oldLayout')) Local.set('oldLayout', themeConfig.value.layout);
const clientWidth = document.body.clientWidth;
if (clientWidth < 1000) {
- themeConfig.value.isCollapse = false;
- mittBus.emit('layoutMobileResize', {
- layout: 'defaults',
- clientWidth,
- });
+ // themeConfig.value.isCollapse = false;
+ // mittBus.emit('layoutMobileResize', {
+ // layout: 'defaults',
+ // clientWidth,
+ // });
} else {
- mittBus.emit('layoutMobileResize', {
- layout: Local.get('oldLayout') ? Local.get('oldLayout') : themeConfig.value.layout,
- clientWidth,
- });
+ // mittBus.emit('layoutMobileResize', {
+ // layout: Local.get('oldLayout') ? Local.get('oldLayout') : themeConfig.value.layout,
+ // clientWidth,
+ // });
}
};
// 页面加载前
diff --git a/src/layout/logo/index.vue b/src/layout/logo/index.vue
index b8ad31b..28f1e33 100644
--- a/src/layout/logo/index.vue
+++ b/src/layout/logo/index.vue
@@ -12,7 +12,7 @@
import { computed } from 'vue';
import { storeToRefs } from 'pinia';
import { useThemeConfig } from '/@/stores/themeConfig';
-import logoMini from '/@/assets/logo-mini.svg';
+import logoMini from '/@/assets/logo-mini.png';
// 定义变量内容
const storesThemeConfig = useThemeConfig();
@@ -52,8 +52,9 @@ const onThemeConfigChange = () => {
}
}
&-medium-img {
- width: 20px;
+ width: 35px;
margin-right: 5px;
+ height: 35px;
}
}
.layout-logo-size {
diff --git a/src/layout/main/defaults.vue b/src/layout/main/defaults.vue
index d064bc3..c351c27 100644
--- a/src/layout/main/defaults.vue
+++ b/src/layout/main/defaults.vue
@@ -11,7 +11,7 @@