From a1c42a312f0e9a2d11e9940d9ed5a3b0bd65336b Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Sun, 28 Mar 2021 10:27:33 +0800
Subject: [PATCH] fix issue

---
 spug_web/src/pages/home/Notice.js         | 11 ++++++-----
 spug_web/src/pages/home/Todo.js           |  2 +-
 spug_web/src/pages/home/index.module.less | 15 +++++++++++++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/spug_web/src/pages/home/Notice.js b/spug_web/src/pages/home/Notice.js
index fa05ee6..d4b41d1 100644
--- a/spug_web/src/pages/home/Notice.js
+++ b/spug_web/src/pages/home/Notice.js
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
-import { Button, Card, List, Modal, Form, Input, Switch, Divider, Badge } from 'antd';
-import { DownSquareOutlined, PlusOutlined, UpSquareOutlined } from '@ant-design/icons';
+import { Button, Card, List, Modal, Form, Input, Switch, Divider, Tag } from 'antd';
+import { DownSquareOutlined, PlusOutlined, UpSquareOutlined, SoundOutlined } from '@ant-design/icons';
 import { http } from 'libs';
 import styles from "./index.module.less";
 
@@ -80,9 +80,10 @@ function NoticeIndex(props) {
       ) : (
         <List>
           {records.map(item => (
-            <List.Item key={item.id} onClick={() => setNotice(item)}>
-              <Badge dot={!item.read_ids.includes(id)}><span className={styles.title}>{item.title}</span></Badge>
-              <span style={{fontSize: 12, color: '#999'}}>{item.created_at.substr(0, 10)}</span>
+            <List.Item key={item.id} className={styles.item} onClick={() => setNotice(item)}>
+              {!item.read_ids.includes(id) && <SoundOutlined style={{color: '#ff4d4f', marginRight: 4}} />}
+              <span className={styles.title}>{item.title}</span>
+              <span className={styles.date}>{item.created_at.substr(0, 10)}</span>
             </List.Item>
           ))}
           {records.length === 0 && (
diff --git a/spug_web/src/pages/home/Todo.js b/spug_web/src/pages/home/Todo.js
index 98c8104..d8686e2 100644
--- a/spug_web/src/pages/home/Todo.js
+++ b/spug_web/src/pages/home/Todo.js
@@ -3,7 +3,7 @@ import { Button, Card, List } from 'antd';
 
 function TodoIndex(props) {
   return (
-    <Card title="待办事项" bodyStyle={{height: 220, padding: '0 24px'}}>
+    <Card title="待办事项" bodyStyle={{height: 234, padding: '0 24px'}}>
       <List>
         <List.Item extra={<Button type="link">已完成</Button>}>发布申请 测试未附件 需要你审核。</List.Item>
         <List.Item>工单 资源添加 需要你审核。</List.Item>
diff --git a/spug_web/src/pages/home/index.module.less b/spug_web/src/pages/home/index.module.less
index 8e48ea6..98a7145 100644
--- a/spug_web/src/pages/home/index.module.less
+++ b/spug_web/src/pages/home/index.module.less
@@ -1,7 +1,8 @@
 .notice {
   :global(.ant-card-body) {
-    height: 220px;
+    height: 234px;
     padding: 0 24px;
+    overflow: auto;
   }
 
   button {
@@ -9,17 +10,27 @@
   }
 
   .title {
+    flex: 1;
     cursor: pointer;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-
   }
 
   .title:hover {
     color: #1890ff
   }
 
+  .badge {
+    overflow: hidden;
+  }
+
+  .date {
+    display: inline-block;
+    font-size: 12px;
+    color: #999;
+  }
+
   .add {
     display: flex;
     justify-content: center;