From 34752188274b4527f16934daf357ef7ef693deec Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Thu, 19 Dec 2024 16:25:57 +0800
Subject: [PATCH] =?UTF-8?q?=20fix(=E5=BE=AE=E5=89=8D=E7=AB=AF=E9=80=82?=
=?UTF-8?q?=E9=85=8D):=20=E9=80=82=E9=85=8D=E5=BE=AE=E5=89=8D=E7=AB=AF?=
=?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=B7=AF=E7=94=B1=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=A4=B4=E9=83=A8=E5=92=8Clogo=EF=BC=8C?=
=?UTF-8?q?=E5=85=B3=E9=97=AD=E5=AE=BD=E5=BA=A6=E5=B0=8F=E4=BA=8E1000?=
=?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BE=A7=E8=BE=B9=E8=8F=9C=E5=8D=95=E7=9A=84?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 2 +-
package.json | 1 +
public/favicon.ico | Bin 9286 -> 9286 bytes
public/js/config.js | 4 +-
src/assets/logo-mini.png | Bin 0 -> 6272 bytes
src/layout/component/aside.vue | 9 ++
src/layout/index.vue | 18 +--
src/layout/logo/index.vue | 5 +-
src/layout/main/defaults.vue | 13 ++-
src/main.js | 74 ++++++++++++-
src/router/index.js | 2 +-
src/stores/themeConfig.js | 2 +-
src/utils/request.js | 8 +-
src/utils/setIconfont.js | 2 +-
src/views/gateway/northboundtask.vue | 1 -
src/views/gateway/southdirection.vue | 1 -
src/views/login/index.vue | 2 +-
vite.config.js | 9 +-
yarn.lock | 158 ++++++++++++++++++++++++++-
19 files changed, 280 insertions(+), 31 deletions(-)
create mode 100644 src/assets/logo-mini.png
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 d7c508a69fa710d195026bb10e9d1ff1d3ed13a6..a256e260cccd57985c70b7080b2d117eb84dafc0 100644
GIT binary patch
literal 9286
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
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 0000000000000000000000000000000000000000..c57a1db89240184c8b68587352652f37a66b481c
GIT binary patch
literal 6272
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 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 @@