Merge pull request #2684 from hLinx/hotfix_master

feature: 对接蓝鲸消息通知中心 #2659
TencentBlueKing · Dec 20, 2023 · 4f33ba5 · 4f33ba5
2 parents 342ba20 + bc0c123
commit 4f33ba5
Showing 1 changed file with 15 additions and 8 deletions.
diff --git 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,15 +348,19 @@
    */
   QueryGlobalSettingService.fetchJobConfig()
     .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 侧导航展开收起
    */