From f6722e13ba28cd292c162df9292bb3418ba12bec Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 25 六月 2025 15:17:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/layouts/AppLayout.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/company/src/layouts/AppLayout.vue b/company/src/layouts/AppLayout.vue
index 96b84b5..c3cf0f8 100644
--- a/company/src/layouts/AppLayout.vue
+++ b/company/src/layouts/AppLayout.vue
@@ -47,7 +47,8 @@
// 浼佷笟绔敤鎴疯缃按鍗�
if (this.userInfo.type === 1 || this.userInfo.type === 2) {
if(this.userInfo.company && this.userInfo.company.name){
- Watermark.set(this.userInfo.company.name, this.$refs.containerS);
+ Watermark.set(this.userInfo.showCompany.name, this.$refs.containerS);
+ // Watermark.set(this.userInfo.company.name, this.$refs.containerS);
}
}
},
@@ -66,7 +67,7 @@
display: flex;
// overflow: hidden;
- overflow: scroll;
+ overflow: hidden;
// 宸﹁竟鑿滃崟
.el-aside {
width: $menu-width !important;
--
Gitblit v1.9.3