diff --git a/ant-design-vue-jeecg/src/components/tools/HeaderNotice.vue b/ant-design-vue-jeecg/src/components/tools/HeaderNotice.vue
index 584f4c2..131c0dd 100644
--- a/ant-design-vue-jeecg/src/components/tools/HeaderNotice.vue
+++ b/ant-design-vue-jeecg/src/components/tools/HeaderNotice.vue
@@ -6,7 +6,7 @@
:arrowPointAtCenter="true"
overlayClassName="header-notice-wrapper"
@visibleChange="handleHoverChange"
- :overlayStyle="{ width: '300px', top: '50px' }">
+ :overlayStyle="{ width: '350px', top: '50px' }">
<template slot="content">
<a-spin :spinning="loadding">
<a-tabs>
@@ -30,17 +30,20 @@
</a-list>-->
<a-list>
<a-list-item :key="index" v-for="(record, index) in announcement1">
- <div style="margin-left: 5%;width: 80%">
- <p><a @click="showAnnouncement(record)">{{ record.titile }}</a></p>
+ <div style="margin-left: 5%;width: 100%">
+ <p>
+ <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'L'" color="blue">一般消息</a-tag>
+ <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'M'" color="orange">重要消息</a-tag>
+ <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'H'" color="red">紧急消息</a-tag>
+ <a @click="showAnnouncement(record)">{{ record.titile }}</a>
+ </p>
<p style="color: rgba(0,0,0,.45);margin-bottom: 0px">{{ record.createTime }} 发布</p>
</div>
<div style="text-align: right">
- <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'L'" color="blue">一般消息</a-tag>
- <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'M'" color="orange">重要消息</a-tag>
- <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'H'" color="red">紧急消息</a-tag>
</div>
</a-list-item>
- <div style="margin-top: 5px;text-align: center">
+ <div style="margin-top: 5px;text-align: center; display: flex; justify-content: space-between;">
+ <a-button @click="readAll()" type="dashed" block style="margin-right: 12px;">全部标注已读</a-button>
<a-button @click="toMyAnnouncement()" type="dashed" block>查看更多</a-button>
</div>
</a-list>
@@ -48,17 +51,18 @@
<a-tab-pane :tab="msg2Title" key="2">
<a-list>
<a-list-item :key="index" v-for="(record, index) in announcement2">
- <div style="margin-left: 5%;width: 80%">
- <p><a @click="showAnnouncement(record)">{{ record.titile }}</a></p>
+ <div style="margin-left: 5%;width: 100%">
+ <p>
+ <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'L'" color="blue">一般消息</a-tag>
+ <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'M'" color="orange">重要消息</a-tag>
+ <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'H'" color="red" >紧急消息</a-tag>
+ <a @click="showAnnouncement(record)">{{ record.titile }}</a>
+ </p>
<p style="color: rgba(0,0,0,.45);margin-bottom: 0px">{{ record.createTime }} 发布</p>
</div>
- <div style="text-align: right">
- <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'L'" color="blue">一般消息</a-tag>
- <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'M'" color="orange">重要消息</a-tag>
- <a-tag @click="showAnnouncement(record)" v-if="record.priority === 'H'" color="red">紧急消息</a-tag>
- </div>
</a-list-item>
- <div style="margin-top: 5px;text-align: center">
+ <div style="margin-top: 5px;text-align: center; display: flex; justify-content: space-between;">
+ <a-button @click="readAll()" type="dashed" block style="margin-right: 12px;">全部标注已读</a-button>
<a-button @click="toMyAnnouncement()" type="dashed" block>查看更多</a-button>
</div>
</a-list>
@@ -96,6 +100,7 @@ export default {
listCementByUser: "/sys/annountCement/listByUser",
editCementSend: "/sys/sysAnnouncementSend/editByAnntIdAndUserId",
queryById: "/sys/annountCement/queryById",
+ readAllMsg: "sys/sysAnnouncementSend/readAll",
},
hovered: false,
announcement1: [],
@@ -165,7 +170,7 @@ export default {
this.loadding = false
return
}
- this.loadding = true
+ // this.loadding = true
setTimeout(() => {
this.loadding = false
}, 200)
@@ -199,6 +204,15 @@ export default {
path: '/isps/userAnnouncement'
});
},
+ readAll() {
+ var that = this;
+ putAction(that.url.readAllMsg).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.loadData();
+ }
+ });
+ },
modalFormOk() {
},
handleHoverChange(visible) {
diff --git a/ant-design-vue-jeecg/src/views/system/UserAnnouncementList.vue b/ant-design-vue-jeecg/src/views/system/UserAnnouncementList.vue
index 2caa4ec..d37a593 100644
--- a/ant-design-vue-jeecg/src/views/system/UserAnnouncementList.vue
+++ b/ant-design-vue-jeecg/src/views/system/UserAnnouncementList.vue
@@ -170,7 +170,7 @@ export default {
if (res.success) {
that.$message.success(res.message);
that.loadData();
- that.syncHeadNotic();
+ // that.syncHeadNotic();
}
});
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
index cb56948..0651e31 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
@@ -244,9 +244,9 @@ public class SysAnnouncementSendController {
updateWrapper.last("where user_id ='" + userId + "'");
SysAnnouncementSend announcementSend = new SysAnnouncementSend();
sysAnnouncementSendService.update(announcementSend, updateWrapper);
- JSONObject socketParams = new JSONObject();
- socketParams.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
- webSocket.sendMessage(socketParams.toJSONString());
+// JSONObject socketParams = new JSONObject();
+// socketParams.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
+// webSocket.sendMessage(socketParams.toJSONString());
result.setSuccess(true);
result.setMessage("全部已读");
return result;