diff --git a/src/api/system/notice.js b/src/api/system/notice.js index c274ea5..96afb59 100644 --- a/src/api/system/notice.js +++ b/src/api/system/notice.js @@ -8,6 +8,17 @@ export function listNotice(query) { params: query }) } +//用户消息列表展示 +export function listNoticeByNotice(data) { + return request({ + url: '/system/notice/userList', + method: 'post', + params: data + }) +} + + + // 查询公告详细 export function getNotice(noticeId) { @@ -16,6 +27,21 @@ export function getNotice(noticeId) { method: 'get' }) } +// 查询公告详细和阅读量 +export function getNoticeAndCount(noticeId) { + return request({ + url: '/system/notice/' + noticeId, + method: 'post' + }) +} + +// 阅读文件 +export function readNotice(noticeId) { + return request({ + url: '/system/notice/'+noticeId, + method: 'put', + }) +} // 新增公告 export function addNotice(data) { @@ -41,4 +67,4 @@ export function delNotice(noticeId) { url: '/system/notice/' + noticeId, method: 'delete' }) -} \ No newline at end of file +} diff --git a/src/api/system/user.js b/src/api/system/user.js index 89d3972..0864504 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -1,6 +1,15 @@ import request from '@/utils/request' import {parseStrEmpty} from "@/utils/muyu"; +//查询所有用户 +export function getUserList() { + return request({ + url: '/system/user/userList', + method: 'get' + }) +} + + // 查询用户列表 export function listUser(query) { return request({ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 7ccea26..896d43d 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -8,6 +8,9 @@
+ +
@@ -46,9 +163,32 @@ import Hamburger from '@/components/Hamburger' import Screenfull from '@/components/Screenfull' import SizeSelect from '@/components/SizeSelect' import Search from '@/components/HeaderSearch' +import Notice from "@/views/system/notice/index.vue"; +import notice from "../../views/system/notice/index.vue"; +import {listNoticeByNotice, readNotice} from "@/api/system/notice"; +import ComponentA from '@/views/system/notice/index.vue' export default { + data() { + return { + open: false, + + noticeList: [], + notice: { + readStatus: null, + noticeType: null, + }, + drawer: false, + direction: 'rtl', + + title: undefined, + + form: {} + }; + }, + components: { + Notice, Breadcrumb, TopNav, Hamburger, @@ -56,7 +196,11 @@ export default { SizeSelect, Search }, + computed: { + notice() { + return notice + }, ...mapGetters([ 'sidebar', 'avatar', @@ -80,6 +224,37 @@ export default { } }, methods: { + cancel() { + this.open = false; + this.reset(); + }, + reset() { + this.form = { + noticeId: undefined, + noticeTitle: undefined, + noticeType: undefined, + noticeContent: undefined, + status: "0" + }; + this.resetForm("form"); + }, + //阅读消息 + readNoticeChilk(no) { + let noticeId = no.noticeId; + readNotice(noticeId).then(res => { + + this.getNoticeList(); + this.$modal.msgSuccess("阅读成功"); + }) + }, + + getNoticeList() { + listNoticeByNotice(this.notice).then(res => { + + this.noticeList = res.data; + console.log(res); + }) + }, toggleSideBar() { this.$store.dispatch('app/toggleSideBar') }, diff --git a/src/utils/request.js b/src/utils/request.js index 47d1bcb..922e8c2 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -73,7 +73,7 @@ service.interceptors.request.use(config => { // 响应拦截器 service.interceptors.response.use(res => { - debugger + //debugger // 未设置状态码则默认成功状态 const code = res.data.code || 200; // 获取错误信息 diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue index edfb938..ca4cca5 100644 --- a/src/views/system/notice/index.vue +++ b/src/views/system/notice/index.vue @@ -99,6 +99,12 @@