diff --git a/src/forge/Nodata.js b/src/forge/Nodata.js
index 3147e560..ccc74ac5 100644
--- a/src/forge/Nodata.js
+++ b/src/forge/Nodata.js
@@ -1,7 +1,7 @@
 import React , { Component } from 'react';
 
 import nodata from './Images/nodata.png';
-
+import './css/index.scss';
 class Nodata extends Component{
   render(){
     const { _html , small } = this.props;
diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx
index 50f1bb39..65a80048 100644
--- a/src/forge/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@@ -62,7 +62,7 @@ function Index(props){
             <ul className="securityUl ul-border-buttom">
               <li>消息通知</li>
               <li className={pathname.indexOf("/settings/notice/myNotice")>-1 || pathname.indexOf("/settings/notice/privateLetter")>-1 ?"active":""}><Link to={`/settings/notice/myNotice`}><i className="iconfont icon-wodetongzhi"></i><span className="text-shodow-bold">我的通知</span></Link></li>
-              <li className={pathname.indexOf("/settings/notice/noticeManager")>-1 ?"active":""}><Link to={`/settings/notice/noticeManager`}><i className="iconfont icon-tongzhiguanli"></i><span className="text-shodow-bold">通知管理</span></Link></li>
+              {/* <li className={pathname.indexOf("/settings/notice/noticeManager")>-1 ?"active":""}><Link to={`/settings/notice/noticeManager`}><i className="iconfont icon-tongzhiguanli"></i><span className="text-shodow-bold">通知管理</span></Link></li> */}
             </ul>
             <ul className="securityUl">
               <li>安全设置</li>
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.jsx b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
index a2d5631b..bb19a60f 100644
--- a/src/forge/SecuritySetting/notice/myNotice/Index.jsx
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
@@ -1,147 +1,271 @@
 import React, { useState, useEffect } from 'react';
-import { Badge, Button, Checkbox, Menu } from 'antd';
+import { Badge, Button, Checkbox, Menu, Pagination } from 'antd';
 import './Index.scss';
 import '../manager/Index.scss'
 import DelModal from '../../../Wiki/components/ModalFun';
-import Axios from 'axios';
+import axios from 'axios';
 import { Link } from 'react-router-dom';
+import NoneData from '../../../Nodata.js';
 
 function MyNotice(props) {
+  let current_user = props.current_user;
+  let pageSize = 20;
 
-  const [noticeType, setNoticeType] = useState("0");
-  const [selectedNum, setSelectedNum] = useState(0);
-  const [isBatchDelete, setIsBatchDelete] = useState(false);
-  const [notice_unread_count, setNotice_unread_count] = useState();//未读系统通知数量
-  const [letter_unread_count, setLetter_unread_count] = useState(0);//未读私信数量
-  const [at_unread_count, setAt_unread_count] = useState();//未读@我数量
-  const [message_list, setMessage_list] = useState([]);
-  const [onlyUnread,setOnlyUnread] = useState();
+  const [noticeType, setNoticeType] = useState("2");//消息类别tab栏选择
+  const [selectedNum, setSelectedNum] = useState(0);//@我批量删除选择消息条数
+  const [isBatchDelete, setIsBatchDelete] = useState(false);//@我是否批量删除
+  const [batchDeleteCheckedAll, setBatchDeleteCheckAll] = useState(false);//@我批量删除--全选
+
+  const [noticeUnreadCount, setNoticeUnreadCount] = useState();//未读系统通知数量
+  // const [letterUnreadCount, setLetterUnreadCount] = useState(0);//未读私信数量
+  const [atUnreadCount, setAtUnreadCount] = useState();//未读@我数量
+  const [messageList, setMessageList] = useState([]);
+  const [messTotalCount, setMessTotalCount] = useState();//消息总数
+  const [currentPage, setCurrentPage] = useState(1);//当前页数
+  const [onlyUnread, setOnlyUnread] = useState();
+  const noticeSourceType = {
+    // 易修
+    IssueAssigned:"icon-yixiuicon1",  //	有新指派给我的易修
+    IssueAssignerExpire:"icon-yixiuicon1",  //	我负责的易修截止日期到达最后一天
+    IssueAtme:"icon-yixiuicon1",  //	在易修中@我
+    IssueChanged:"icon-yixiuicon1",  //	我创建或负责的易修状态变更
+    IssueCreatorExpire:"icon-yixiuicon1",  //	我创建的易修截止日期到达最后一天
+    IssueDelete:"icon-yixiuicon1",  //	我创建或负责的易修删除
+    IssueDeleted:"icon-yixiuicon1",  //	我创建或负责的易修删除
+    IssueJournal:"icon-yixiuicon1",  //	我创建或负责的易修有新的评论
+    //平台通知
+    LoginIpTip:"icon-xitongtongzhiicon",  //登录异常提示
+    //个人状态类通知
+    OrganizationJoined:"icon-xiaoxi2",  //	账号被拉入组织
+    OrganizationLeft:"icon-xiaoxi2",  //	账号被移出组织
+    rganizationRole:"icon-xiaoxi2",  //	账号组织权限变更
+    ProjectJoined:"icon-xiaoxi2",  //	账号被拉入项目
+    ProjectLeft:"icon-xiaoxi2",  //		账号被移出项目
+    ProjectRole:"icon-xiaoxi2",  //	账号仓库权限变更
+    //其他仓库通知
+    ProjectDelete:"icon-daimakuicon1",  //  我关注的仓库被删除
+    ProjectFollowed:"icon-daimakuicon1",  //	我管理的仓库被关注
+    ProjectForked:"icon-daimakuicon1",  //	我管理的仓库被复刻
+    ProjectIssue:"icon-daimakuicon1",  //	我管理/关注的仓库有新的易修
+    ProjectSettingChanged:"icon-daimakuicon1",  //	我管理的仓库项目设置被更改
+    ProjectTransfer:"icon-daimakuicon1",  //	我关注的仓库被转移
+    ProjectVersion:"icon-daimakuicon1",  //	我关注的仓库有新的发行版
+    ProjectMemberJoined:"icon-daimakuicon1",  //	我管理的仓库有成员加入
+    ProjectMemberLeft:"icon-daimakuicon1",  //  	我管理的仓库有成员移出
+    ProjectPraised:"icon-daimakuicon1",  //	我管理的仓库被点赞
+    //合并请求类通知
+    ProjectPullRequest:"icon-hebingqingqiuicon",  //	我管理/关注的仓库有新的合并请求
+    PullRequestAssigned:"icon-hebingqingqiuicon",  //	有新指派给我的合并请求
+    PullRequestAtme:"icon-hebingqingqiuicon",  //	在合并请求中@我
+    PullRequestChanged:"icon-hebingqingqiuicon",  //	我创建或负责的合并请求状态变更
+    PullRequestJournal:"icon-hebingqingqiuicon",  //	我创建或负责的合并请求有新的评论
+    //里程碑
+    ProjectMilestone:"icon-lichengbeiicon",  //	我管理的仓库有新的里程碑
+  };
 
   useEffect(() => {
-    const params = {
-      type:noticeType==="0"?"notification":noticeType==="2"?"atme":"",
-      status:onlyUnread?onlyUnread:"",
-      limit: 20,
-      page: 0,
-    }
-    getMessageList(params);
-  }, [noticeType,onlyUnread])
+    // const params = {
+    //   type: noticeType === "0" ? "notification" : noticeType === "2" ? "atme" : "",
+    //   status: onlyUnread ? onlyUnread : "",
+    //   limit: pageSize,
+    //   page: currentPage,
+    // }
+    getMessageList();
+  }, [noticeType, onlyUnread, currentPage])
 
-  function getMessageList(params) {
-    Axios.get(`/users/yystopf/messages.json`, {
+  function getMessageList() {
+    const params = {
+      type: noticeType === "0" ? "notification" : noticeType === "2" ? "atme" : "",
+      status: onlyUnread ? onlyUnread : "",
+      limit: pageSize,
+      page: currentPage,
+    };
+    axios.get(`/users/${current_user.login}/messages.json`, {
       params: params,
     }).then((response) => {
-      setNotice_unread_count(response.data.unread_notification);
-      setAt_unread_count(response.data.unread_atme);
-      setMessage_list(response.data.messages);
-    })
+      if(response && response.data){
+        setNoticeUnreadCount(response.data.unread_notification);
+        setAtUnreadCount(response.data.unread_atme);
+        setMessageList(response.data.messages);
+        setMessTotalCount(response.data.total_count);
+      }
+    });
+  }
+
+  function readNotice(id){
+    if(id){
+      const params = {
+        type: noticeType === "0" ? "notification" : noticeType === "2" ? "atme" : "",
+        ids:id,
+      };
+      axios.post(`/users/${current_user.login}/messages/read.json`,params).then((response)=>{
+        response.status === 0 && getMessageList();
+      });
+    }
   }
 
   function handleClick(e) {
     setNoticeType(e.key);
+    setCurrentPage(1);
+    setOnlyUnread();
     if (e.key != "2") {
       setIsBatchDelete(false);
     }
-    
   }
 
-  function onChange() {
-    var selectedNum = 0;
-    const checkbox = document.getElementsByClassName("atme-checkbox");
-    for (var i = 0; i < checkbox.length; i++) {
-      checkbox[i].checked ? selectedNum++ : "";
-    }
-    document.getElementById("checkAll").checked = selectedNum === checkbox.length;
-    setSelectedNum(selectedNum === checkbox.length ? checkbox.length : selectedNum);
-  }
-
-
-  function onCheckAllChange(e) {
-    const checkbox = document.getElementsByClassName("atme-checkbox");
-    for (var i = 0; i < checkbox.length; i++) {
-      checkbox[i].checked = e.target.checked;
-    }
-    setSelectedNum(e.target.checked ? checkbox.length : 0);
-  }
-
-  function deleteNotice() {
-    DelModal({
-      title: noticeType === "1" ? '删除私信' : '删除与我相关',
-      contentTitle: noticeType === "1" ? '您确定要删除与 xxx 的聊天吗？' : selectedNum === 0 ? '您确定要删除这条@我消息吗？' : '您确定要删除选中的' + selectedNum + '条消息吗？',
-      content: noticeType === "1" ? '此操作将删除与xxx的聊天框和xxx的所有聊天记录，请进行确认以防数据的丢失' : selectedNum === 0 ? '此操作将删除这条消息，请进行确认以防数据的丢失' : '此操作将删除选中的' + selectedNum + '条消息，请进行确认以防数据的丢失',
-      onOk: () => {
-
+  function onChange(e) {
+    var checkboxNum = 0;
+    let messageListNew=messageList.slice();
+    messageListNew.map((item)=>{
+      if(item.id===e.target.value){
+        item.checkedBatch = e.target.checked;
       }
+      item.checkedBatch?checkboxNum++:"";
     });
+    setMessageList(messageListNew);
+    setSelectedNum(checkboxNum);
+    setBatchDeleteCheckAll(checkboxNum === messageList.length);
+  }
+
+
+  function onChangeAll(e) {
+    setBatchDeleteCheckAll(e.target.checked);
+    setSelectedNum(e.target.checked?messageList.length:0);
+    let messageListNew=messageList.slice();
+    messageListNew.map((item)=>{
+      item.checkedBatch = e.target.checked;
+    });
+    setMessageList(messageListNew);
+  }
+
+  function deleteNotice(id) {
+    
+    const ids = [];
+    console.log(messageList);
+    if(!id){
+      messageList.map(item=>{
+        item.checkedBatch && ids.push(item.id);
+      });
+    }
+    console.log(ids);
+      DelModal({
+        title: noticeType === "1" ? '删除私信' : '删除与我相关',
+        contentTitle: noticeType === "1" ? '您确定要删除与 xxx 的聊天吗？' : id ? '您确定要删除这条@我消息吗？' : '您确定要删除选中的' + selectedNum + '条消息吗？',
+        content: noticeType === "1" ? '此操作将删除与xxx的聊天框和xxx的所有聊天记录，请进行确认以防数据的丢失' : id ? '此操作将删除这条消息，请进行确认以防数据的丢失' : '此操作将删除选中的' + selectedNum + '条消息，请进行确认以防数据的丢失',
+        onOk: () => {
+          const params = {
+            type: noticeType === "0" ? "notification" : noticeType === "2" ? "atme" : "",
+            ids:id?id:ids,
+          };
+          console.log(params);
+          axios.delete(`/users/${current_user.login}/messages.json`,{
+            data:params,
+          }).then((response)=>{
+            response.status === 0 && getMessageList();
+          });
+        }
+      });
+    
   }
 
   return (
     <div className="notice01">
       <div className="sshHead">
         <Menu mode="horizontal" selectedKeys={noticeType} onClick={handleClick}>
-          <Menu.Item key="0"><Badge count={notice_unread_count} title="">系统通知</Badge></Menu.Item>
-          <Menu.Item key="1" id="item-private"><Badge count={0}>私信</Badge></Menu.Item>
-          <Menu.Item key="2"><Badge count={at_unread_count}>@我</Badge></Menu.Item>
+          <Menu.Item key="0"><Badge count={noticeUnreadCount} title="">系统通知</Badge></Menu.Item>
+          {/* <Menu.Item key="1" id="item-private"><Badge count={0}>私信</Badge></Menu.Item> */}
+          <Menu.Item key="2"><Badge count={atUnreadCount}>@我</Badge></Menu.Item>
         </Menu>
-        <button>所有{noticeType === "0" ? "系统通知" : noticeType === "1" ? "私信" : "@我"}一键已读</button>
+        <button onClick={()=>{readNotice([-1])}}>所有{noticeType === "0" ? "系统通知" : noticeType === "1" ? "私信" : "@我"}一键已读</button>
       </div>
 
       <div className={isBatchDelete ? "invisible " : "visible"}>
         <div className="vertical-center-style">
-          <Checkbox onChange={(e)=>e.target.checked?setOnlyUnread(1):setOnlyUnread(2)}>仅看未读{noticeType === "1" ? `私信（12）` : noticeType==="0"?`消息（${notice_unread_count}）`:`消息（${at_unread_count}）`}</Checkbox>
+          <Checkbox checked={onlyUnread === 1?true:false} onChange={(e) => e.target.checked ? setOnlyUnread(1) : setOnlyUnread()}>仅看未读{noticeType === "1" ? `私信（12）` : noticeType === "0" ? `消息（${noticeUnreadCount}）` : `消息（${atUnreadCount}）`}</Checkbox>
         </div>
-        {noticeType === "2" ? <button onClick={() => { setIsBatchDelete(true); }}>批量删除</button> : ""}
+        {noticeType === "2" && messageList.length > 0 ? <button onClick={() => { setIsBatchDelete(true); }}>批量删除</button> : ""}
       </div>
 
-      <div className={isBatchDelete ? 'visible' : 'invisible'}>
+      {messageList.length===0 ? <NoneData _html="暂无相关消息"/>:""}
+
+      {messageList && messageList.length>0 && <div className={isBatchDelete ? 'visible' : 'invisible'}>
         <div className="vertical-center-style">
-          <input type="checkbox" id="checkAll" onChange={onCheckAllChange} />&nbsp;
-          全选&nbsp;&nbsp;&nbsp;已选择&nbsp;<span id="numberSpan">{selectedNum}</span>&nbsp;项
+          {/* <input type="checkbox" id="checkAll" onChange={onChangeAll} />&nbsp; */}
+          <Checkbox onChange={onChangeAll} checked={batchDeleteCheckedAll}>全选</Checkbox>
+          &nbsp;&nbsp;&nbsp;已选择&nbsp;<span id="numberSpan">{selectedNum}</span>&nbsp;项
         </div>
         <div>
           <button onClick={() => { setIsBatchDelete(false); setSelectedNum(0); }}>取消</button>&nbsp;&nbsp;&nbsp;&nbsp;
-          <button className="deleteBut" onClick={selectedNum > 0 ? deleteNotice : () => { }}>删除</button>
+          <button className="deleteBut" onClick={selectedNum > 0 ? ()=>deleteNotice() : () => { }}>删除</button>
         </div>
-      </div>
+      </div>}
 
-      {message_list.map(item => {
+      {messageList.map(item => {
         // 系统消息
-        // 消息类别
-        // const iconName = item.source.startsWith("Issue")?"icon-yixiuicon1":item.source.startsWith("Project")?"icon-daimakuicon1":item.source.startsWith("Project")?"icon-daimakuicon1":
-        if(noticeType ==="0" && item.type === "notification"){
-          return(
+        if (noticeType === "0") {
+          // 消息类别
+          return (
             <div className="mynotice-content vertical-center-style" key={item.id}>
-              <div className="mynotice-cont vertical-center-style">
-                {item.status === 1? <Badge color="#FA2020" />:<span className="system-notice-blank"></span>}
-                <i className="iconfont icon-yixiuicon1"></i>
-                <span className="sysNotice-length highlightSpan" onClick={()=>window.location.href=(`${item.notification_url}`)}>{item.content}</span>
+              <div className="mynotice-cont stretch-style">
+                {item.status === 1 ? <Badge color="#FA2020" /> : <span className="system-notice-blank"></span>}
+                <i className={"iconfont "+noticeSourceType[item.source]}></i>
+                <span className="sysNotice-length highlightSpan" onClick={() => window.open("https://"+`${item.notification_url}`)}>{item.content}</span>
               </div>
               <div className="mynotice-cont vertical-center-style float-left-little">
-                <span className="timeSpan">{item.time_ago}</span>
-                <a>标记为已读</a>
+                <span className={item.status === 1?"timeSpan":""}>{item.time_ago}</span>
+                {item.status === 1 && <span className="invisable-read" onClick={()=>readNotice([item.id])}>标记为已读</span>}
               </div>
             </div>
           )
-        } else if(noticeType ==="2" && item.type === "atme"){
+        } else if (noticeType === "2") {
           //@我
-          return(
+          return (
             <div className="mynotice-content vertical-center-style" key={item.id}>
               <div className="mynotice-cont vertical-center-style">
-                <input type="checkbox" className={isBatchDelete ? 'atme-checkbox' : 'invisible'} onChange={onChange} />
-                <img src={`https://testforgeplus.trustie.net//${item.sender.image_url}`} className="currentImg" />
-                <span className="at-length highlightSpan">
-                  {item.status === 1? <Badge color="#FA2020" className="at-badge"/>:<span className="system-notice-blank"></span>}
-                  {item.content}
-                </span>
+                {/* <input type="checkbox" className={isBatchDelete ? 'atme-checkbox' : 'invisible'} onChange={onChange} /> */}
+                <Checkbox value={item.id} className={isBatchDelete ? 'visible-checkbox' : 'invisible-checkbox'} onChange={onChange} checked={item.checkedBatch}></Checkbox>
+                {item.sender && <img src={`https://testforgeplus.trustie.net//${item.sender.image_url}`} className="currentImg" />}
+                <div className="atme-notice-text">
+                  <div className="at-badge">{item.status === 1 ? <Badge color="#FA2020" /> : <span className="system-notice-blank"></span>}</div>
+                  <div className="highlightSpan">{item.content}</div>
+                </div>
               </div>
               <div className="mynotice-cont vertical-center-style">
-                <span className="timeSpan">{item.time_ago}</span>
-                <a>标记为已读</a>&nbsp;&nbsp;&nbsp;<a className="float-left-little" onClick={deleteNotice}>删除</a>
+                <span className={item.status === 1?"timeSpan":""}>{item.time_ago}</span>
+                {item.status === 1 && <span className="invisable-read" onClick={()=>readNotice([item.id])}>标记为已读</span>}&nbsp;&nbsp;&nbsp;
+                <span className="invisable-read float-left-little" onClick={()=>deleteNotice([item.id])}>删除</span>
               </div>
             </div>
           )
         }
       })}
+
+      {/* 分页 */}
+      <div className="paging">
+        <Pagination
+          simple
+          current = {currentPage}
+          pageSize={pageSize}
+          onChange={(page)=>{setCurrentPage(page)}}
+          total = {messTotalCount}
+          hideOnSinglePage
+        ></Pagination>
+      </div>
+
+      {/* 私信 */}
+      {/* <div className="mynotice-content vertical-center-style">
+        <Badge count={95}><img src="https://testforgeplus.trustie.net//system/lets/letter_avatars/2/D/208_124_118/120.png" className="currentImg private-letter-img" /></Badge>
+        <div className="private-letter-right">
+          <div>
+            <span>蒋宇航</span>
+            <span className="timeSpan">4分钟前</span>
+            <a onClick={deleteNotice}>删除</a>
+          </div>
+          <div onClick={() => props.history.push('/settings/notice/privateLetter')}>
+            <span className="highlightSpan letter-length-limit">最好的OpenStack控制台，对标OpenStack社区Horizon项目,最好的OpenStack控制台，对标OpenStack社区Horizon项目，在易用性、页面性能等方面进行深度优化，提供简单控制台。</span>
+          </div>
+        </div>
+      </div> */}
     </div>
   )
 }
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.scss b/src/forge/SecuritySetting/notice/myNotice/Index.scss
index 1a5ee3fb..b4a02b35 100644
--- a/src/forge/SecuritySetting/notice/myNotice/Index.scss
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.scss
@@ -6,7 +6,7 @@
   }
   .ant-menu-item{
     padding:0px;
-    // margin-right:34px!important;
+    margin-right:34px!important;
     height: 34px;
     width: 64px;
     text-align: center;
@@ -82,18 +82,18 @@ button:active {
   padding: 15px 0 15px 10px;
   border-bottom: 1px solid #EEEEEE;
   color: #333333;
-
   &:hover{
     background: #F3F4F6;
   }
 
-  & a{
+  & .invisable-read{
     display: none;
   }
 
-  &:hover a{
+  &:hover .invisable-read{
     display: block;
     color: #466AFF;
+    cursor: pointer;
   }
 
   &:hover .timeSpan{
@@ -128,9 +128,24 @@ button:active {
   .mynotice-cont{
     padding:0;
 
-    & .atme-checkbox{
+    & .visible-checkbox{
       margin-right: 10px;
     }
+    & .invisible-checkbox{
+      display: none;
+    }
+    .atme-notice-text{
+      position: relative;
+      margin-left: 12px;
+      max-width: 48rem;
+      & .at-badge{
+        position:absolute;
+      }
+
+      & .highlightSpan{
+        margin-left: 12px;
+      }
+    }
   }
 
   & .ant-badge-count, .ant-badge-dot, .ant-badge .ant-scroll-number-custom-component {
@@ -194,10 +209,7 @@ button:active {
   max-width: 52rem;
 }
 
-.at-length{
-  max-width: 48rem;
-  margin-left: 18px;
-}
+
 #numberSpan{
   color: #466AFF;
 }
@@ -207,6 +219,28 @@ button:active {
   align-items: center;
 }
 
+.stretch-style{
+  display: flex;
+  align-items: baseline;
+}
+
 .float-left-little{
   margin-right: 10px;
-}
\ No newline at end of file
+}
+
+.paging{
+  float: right;
+  margin: 12px;
+}
+
+// .invisible_checkGroup{
+//   & .ant-checkbox-inner{
+//     display: none;
+//   }
+// }
+// .notice01{
+//   & .ant-checkbox-group{
+//     display: flex;
+//     flex-direction: column;
+//   }
+// }
\ No newline at end of file