From 6e15b825f30c97667408a54445a8f8cb52345947 Mon Sep 17 00:00:00 2001
From: liting <994745334@qq.com>
Date: Sun, 16 Jun 2024 10:44:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/Index.vue | 61 ++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index 43d574cca..19054726e 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -15,7 +15,7 @@
             </el-avatar>
             <div>
               <div class="text-14px">
-                <Highlight :keys="item.keys.map((v) => t(v))">
+                <Highlight :keys="item.keys">
                   {{ item.type }} : {{ item.title }}
                 </Highlight>
               </div>
@@ -100,7 +100,7 @@ import { formatTime } from '@/utils'
 
 import { useUserStore } from '@/store/modules/user'
 import type { TodoList, Notice, Message } from './types'
-
+import * as NoticeApi from '@/api/system/notice'
 
 defineOptions({ name: 'Home' })
 
@@ -179,31 +179,44 @@ const getTodoList = async () => {
   TodoList = Object.assign(TodoList, data)
 }
 
-
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 100,
+  title: '',
+  type: undefined,
+  status: undefined
+})
 // 获取通知公告
 let notice = reactive<Notice[]>([])
 const getNotice = async () => {
-  const data = [
-    {
-      title: '系统升级版本',
-      type: '通知',
-      keys: ['通知', '升级'],
-      date: new Date()
-    },
-    {
-      title: '系统凌晨维护',
-      type: '公告',
-      keys: ['公告', '维护'],
-      date: new Date()
-    },
-    {
-      title: '系统升级版本',
-      type: '通知',
-      keys: ['通知', '升级'],
-      date: new Date()
-    },
-  ]
-  notice = Object.assign(notice, data)
+  try {
+    const data = await NoticeApi.getNoticePage(queryParams)
+    notice = data.list
+    
+  } finally {
+    loading.value = false
+  }
+  // const data = [
+  //   {
+  //     title: '系统升级版本',
+  //     type: '通知',
+  //     keys: ['通知', '升级'],
+  //     date: new Date()
+  //   },
+  //   {
+  //     title: '系统凌晨维护',
+  //     type: '公告',
+  //     keys: ['公告', '维护'],
+  //     date: new Date()
+  //   },
+  //   {
+  //     title: '系统升级版本',
+  //     type: '通知',
+  //     keys: ['通知', '升级'],
+  //     date: new Date()
+  //   },
+  // ]
+ // notice = Object.assign(notice, data)
 }
 //获取通知
 let message = reactive<Message[]>([])