From 1be13e7b11925c404a2d4f125651b35b8b744b31 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Wed, 20 Dec 2023 14:44:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feature:=20=E5=AF=B9=E6=8E=A5=E8=93=9D?=
 =?UTF-8?q?=E9=B2=B8=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=20#2659?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Reviewed, transaction id: 674
---
 src/frontend/src/layout-new.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/frontend/src/layout-new.vue b/src/frontend/src/layout-new.vue
index d39f026434..71e4b87c11 100644
--- a/src/frontend/src/layout-new.vue
+++ b/src/frontend/src/layout-new.vue
@@ -27,7 +27,9 @@
 
 <template>
   <div>
-    <notice-component :list="noticeList" />
+    <notice-component
+      v-if="isEnableBKNotice"
+      :list="noticeList" />
     <site-frame
       :side-fixed="isFrameSideFixed"
       @on-side-expand="handleSideExpandChange"
@@ -309,6 +311,7 @@
   const isAdmin = ref(false);
   const routerTitle = ref('');
   const isEnableFeatureFileManage = ref(false);
+  const isEnableBKNotice = ref(false);
 
   const noticeList = ref([]);
 
@@ -345,6 +348,7 @@
    */
   QueryGlobalSettingService.fetchJobConfig()
     .then((data) => {
+      isEnableBKNotice.value = data.ENABLE_BK_NOTICE;
       isEnableFeatureFileManage.value = data.ENABLE_FEATURE_FILE_MANAGE;
     });
   NoticeService.fetchAnnouncement()

From bc0c1238efacaa970f185e500840c8986c0b8567 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Wed, 20 Dec 2023 16:33:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feature:=20=E5=AF=B9=E6=8E=A5=E8=93=9D?=
 =?UTF-8?q?=E9=B2=B8=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=20#2659?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Reviewed, transaction id: 686
---
 src/frontend/src/layout-new.vue | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/frontend/src/layout-new.vue b/src/frontend/src/layout-new.vue
index 71e4b87c11..b9d383e73b 100644
--- a/src/frontend/src/layout-new.vue
+++ b/src/frontend/src/layout-new.vue
@@ -350,14 +350,17 @@
     .then((data) => {
       isEnableBKNotice.value = data.ENABLE_BK_NOTICE;
       isEnableFeatureFileManage.value = data.ENABLE_FEATURE_FILE_MANAGE;
+      if (isEnableBKNotice.value) {
+        NoticeService.fetchAnnouncement()
+          .then((data) => {
+            noticeList.value = data.map((item, index) => ({
+              id: index,
+              ...item,
+            }));
+          });
+      }
     });
-  NoticeService.fetchAnnouncement()
-    .then((data) => {
-      noticeList.value = data.map((item, index) => ({
-        id: index,
-        ...item,
-      }));
-    });
+
   /**
    * @desc 侧导航展开收起
    */