|
|
@@ -4,43 +4,82 @@
|
|
|
<el-dialog
|
|
|
style=""
|
|
|
top="0"
|
|
|
- title="消息"
|
|
|
+ title="消息通知"
|
|
|
:visible.sync="dialogVisible"
|
|
|
width="30%">
|
|
|
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
|
|
|
- <el-tab-pane name="first">
|
|
|
+ <el-tab-pane v-for="(msgitem,index) in msgtype" :key="index" :label="msgitem.id+''" :name="msgitem.name">
|
|
|
+ <span slot="label">
|
|
|
+ {{ msgitem.name }}
|
|
|
+ <el-badge :hidden="msgitem.unReadCount==0?true:false" :value="msgitem.unReadCount" :max="9999"></el-badge>
|
|
|
+ </span>
|
|
|
+ </el-tab-pane>
|
|
|
+ <div class="msg-box">
|
|
|
+ <div class="read-btn">
|
|
|
+
|
|
|
+ <el-button type="primary" @click="taskclicks(2)" size="mini" :plain="tasknobtn" >未读</el-button>
|
|
|
+ <el-button type="primary" @click="taskclicks(3)" size="mini" :plain="taskbtn" >已读</el-button>
|
|
|
+ </div>
|
|
|
+ <div class="scroll-box">
|
|
|
+ <div class="news-box" v-for="(item,index) in msglist" :key="index">
|
|
|
+ <div class="news-box-list">
|
|
|
+ <div class="news-list-hade">
|
|
|
+ <div>{{item.title}}</div>
|
|
|
+ <div>所属部门: {{item.issuerDep}}</div>
|
|
|
+ </div>
|
|
|
+ <div class="news-list-content" v-html="item.content">
|
|
|
+ </div>
|
|
|
+ <div class="news-list-posts">
|
|
|
+ <div>发布人: {{item.issuerUser}}</div>
|
|
|
+ <div>发布时间: {{item.releaseTime}}</div>
|
|
|
+ </div>
|
|
|
+ <div class="news-list-btn" >
|
|
|
+ <el-button @click="DeleMsg(index,item)" v-if="item.isRead==0" type="primary">确认已读</el-button>
|
|
|
+ <el-button v-if="item.isRead==1" type="info">已读</el-button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div v-if="count>10&&msglist.length<count" class="loadmore">
|
|
|
+ <el-button @click="loadadd" size="mini">加载更多</el-button>
|
|
|
+ </div>
|
|
|
+ <el-divider v-if="msglist.length>=count" style="">没有更多了！</el-divider>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <!-- <el-tab-pane name="first">
|
|
|
<span slot="label">
|
|
|
任务操作通知
|
|
|
<el-badge :hidden="tasknot==0?true:false" :value="tasknot" :max="9999"></el-badge>
|
|
|
</span>
|
|
|
<div class="read-btn">
|
|
|
<el-badge :hidden="tasknot==0?true:false" :value="tasknot" class="item">
|
|
|
- <el-button size="mini" plain >未读</el-button>
|
|
|
+ <el-button type="primary" @click="taskclick('未读')" size="mini" :plain="tasknobtn" >未读</el-button>
|
|
|
</el-badge>
|
|
|
- <el-button size="mini" plain >
|
|
|
+ <el-button type="primary" @click="taskclick('已读')" size="mini" :plain="taskbtn" >
|
|
|
已读
|
|
|
</el-button>
|
|
|
</div>
|
|
|
- <div class="news-box" v-for="(item,index) in newstasklist" :key="index">
|
|
|
- <div class="news-box-list">
|
|
|
- <div class="news-list-hade">
|
|
|
- <div>{{item.title}}</div>
|
|
|
- <div>所属部门: {{item.issuerDep}}</div>
|
|
|
- </div>
|
|
|
- <div class="news-list-content" v-html="item.content">
|
|
|
- </div>
|
|
|
- <div class="news-list-posts">
|
|
|
- <div>发布人: {{item.issuerUser}}</div>
|
|
|
- <div>发布时间: {{item.releaseTime}}</div>
|
|
|
- </div>
|
|
|
- <div class="news-list-btn">
|
|
|
- <el-button v-if="item.isRead==0" type="primary">确认已读</el-button>
|
|
|
- <el-button v-if="item.isRead==1" type="info">已读</el-button>
|
|
|
+ <div class="scroll-box">
|
|
|
+ <div class="news-box" v-for="(item,index) in newstasklist" :key="index">
|
|
|
+ <div class="news-box-list">
|
|
|
+ <div class="news-list-hade">
|
|
|
+ <div>{{item.title}}</div>
|
|
|
+ <div>所属部门: {{item.issuerDep}}</div>
|
|
|
+ </div>
|
|
|
+ <div class="news-list-content" v-html="item.content">
|
|
|
+ </div>
|
|
|
+ <div class="news-list-posts">
|
|
|
+ <div>发布人: {{item.issuerUser}}</div>
|
|
|
+ <div>发布时间: {{item.releaseTime}}</div>
|
|
|
+ </div>
|
|
|
+ <div class="news-list-btn" >
|
|
|
+ <el-button @click="DeleMsg(index,item)" v-if="item.isRead==0" type="primary">确认已读</el-button>
|
|
|
+ <el-button v-if="item.isRead==1" type="info">已读</el-button>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- <div class="notyet" v-if="newstasklist.length==0">
|
|
|
- 暂无通知
|
|
|
+ <div class="notyet" v-if="newstasklist.length==0">
|
|
|
+ 暂无通知
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane name="second">
|
|
|
@@ -50,34 +89,36 @@
|
|
|
</span>
|
|
|
<div class="read-btn">
|
|
|
<el-badge :hidden="groupnot==0?true:false" :value="groupnot" class="item">
|
|
|
- <el-button size="mini" plain >未读</el-button>
|
|
|
+ <el-button type="primary" size="mini" @click="groupclick('未读')" :plain="groupnobtn" >未读</el-button>
|
|
|
</el-badge>
|
|
|
- <el-button size="mini" plain >
|
|
|
+ <el-button type="primary" size="mini" @click="groupclick('已读')" :plain="groupbtn" >
|
|
|
已读
|
|
|
</el-button>
|
|
|
</div>
|
|
|
- <div class="news-box" v-for="(item,index) in newsgrouplist" :key="index">
|
|
|
- <div class="news-box-list">
|
|
|
- <div class="news-list-hade">
|
|
|
- <div>{{item.title}}</div>
|
|
|
- <div>所属部门: {{item.issuerDep}}</div>
|
|
|
- </div>
|
|
|
- <div class="news-list-content" v-html="item.content">
|
|
|
- </div>
|
|
|
- <div class="news-list-posts">
|
|
|
- <div>发布人: {{item.issuerUser}}</div>
|
|
|
- <div>发布时间: {{item.releaseTime}}</div>
|
|
|
- </div>
|
|
|
- <div class="news-list-btn">
|
|
|
- <el-button v-if="item.isRead==0" type="primary">确认已读</el-button>
|
|
|
- <el-button v-if="item.isRead==1" type="info">已读</el-button>
|
|
|
+ <div class="scroll-box">
|
|
|
+ <div class="news-box" v-for="(item,index) in newsgrouplist" :key="index">
|
|
|
+ <div class="news-box-list">
|
|
|
+ <div class="news-list-hade">
|
|
|
+ <div>{{item.title}}</div>
|
|
|
+ <div>所属部门: {{item.issuerDep}}</div>
|
|
|
+ </div>
|
|
|
+ <div class="news-list-content" v-html="item.content">
|
|
|
+ </div>
|
|
|
+ <div class="news-list-posts">
|
|
|
+ <div>发布人: {{item.issuerUser}}</div>
|
|
|
+ <div>发布时间: {{item.releaseTime}}</div>
|
|
|
+ </div>
|
|
|
+ <div class="news-list-btn">
|
|
|
+ <el-button v-if="item.isRead==0" type="primary">确认已读</el-button>
|
|
|
+ <el-button v-if="item.isRead==1" type="info">已读</el-button>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <div class="notyet" v-if="newsgrouplist.length==0">
|
|
|
+ 暂无通知
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- <div class="notyet" v-if="newsgrouplist.length==0">
|
|
|
- 暂无通知
|
|
|
- </div>
|
|
|
- </el-tab-pane>
|
|
|
+ </el-tab-pane> -->
|
|
|
</el-tabs>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
@@ -159,7 +200,7 @@
|
|
|
<i class="icon-shiyonggongju"></i>
|
|
|
</div>
|
|
|
<div class="message">
|
|
|
- <el-badge :value="12" class="item">
|
|
|
+ <el-badge :value="unReadCount" class="item">
|
|
|
<i class="icon-tongzhi" @click="dialogVisible= true"></i>
|
|
|
</el-badge>
|
|
|
</div>
|
|
|
@@ -295,13 +336,25 @@ export default {
|
|
|
dialogVisible: false ,
|
|
|
newstasklist:[],
|
|
|
newsgrouplist:[],
|
|
|
- activeName: 'first',
|
|
|
+ activeName: '',
|
|
|
tasknot:0,//任务未读条数
|
|
|
groupnot:0,//团组未读条数
|
|
|
tasknotlist:[],//任务未读
|
|
|
taskReadlist:[],//任务以读
|
|
|
groupnotlist:[],//团组未读
|
|
|
groupReadlist:[],//团组以读
|
|
|
+ taskbtn:true,//plain任务已读
|
|
|
+ tasknobtn:false,//plain任务未读
|
|
|
+ groupbtn:true,//plain团组已读
|
|
|
+ groupnobtn:true,//plain团组未读
|
|
|
+ unReadCount:0,//未读总条数
|
|
|
+ msgtype:[],//未读总条数
|
|
|
+ pageIndex:1,//页码
|
|
|
+ pageSize:10,//条数
|
|
|
+ type:0,//类型
|
|
|
+ readStatus:2,//状态
|
|
|
+ msglist:[],//list
|
|
|
+ count:0,//list数量
|
|
|
};
|
|
|
},
|
|
|
// components: {
|
|
|
@@ -411,12 +464,100 @@ export default {
|
|
|
console.log('测试');
|
|
|
},
|
|
|
handleClick(tab, event) {
|
|
|
+ this.pageIndex=1;
|
|
|
+ this.pageSize=10;
|
|
|
+ this.msglist=[];
|
|
|
console.log(tab, event);
|
|
|
+ console.log(tab.label);
|
|
|
+ this.type=Number(tab.label);
|
|
|
+ this.PotsMessagePageList();
|
|
|
+ },
|
|
|
+ //已读未读切换
|
|
|
+ taskclicks(val){
|
|
|
+ if(val==2){
|
|
|
+ this.tasknobtn=false;
|
|
|
+ this.taskbtn=true;
|
|
|
+ }else{
|
|
|
+ this.tasknobtn=true;
|
|
|
+ this.taskbtn=false;
|
|
|
+ }
|
|
|
+ this.readStatus=val;
|
|
|
+ this.pageIndex=1;
|
|
|
+ this.pageSize=10;
|
|
|
+ this.msglist=[];
|
|
|
+ this.PotsMessagePageList();
|
|
|
+ },
|
|
|
+ //加载更多
|
|
|
+ loadadd(){
|
|
|
+ this.pageIndex++
|
|
|
+ this.PotsMessagePageList()
|
|
|
+ },
|
|
|
+ //消息list
|
|
|
+ PotsMessagePageList(){
|
|
|
+ console.log(this.type)
|
|
|
+ var url = "/api/System/PotsMessagePageList"
|
|
|
+ var that = this
|
|
|
+ this.$axios({
|
|
|
+ method: 'post',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer ' + that.token
|
|
|
+ },
|
|
|
+ data:{
|
|
|
+ portType:1,
|
|
|
+ pageIndex:that.pageIndex,
|
|
|
+ pageSize:that.pageSize,
|
|
|
+ type:that.type,
|
|
|
+ userId:that.userId,
|
|
|
+ readStatus:that.readStatus
|
|
|
+ }
|
|
|
+ }).then(function (res) {
|
|
|
+ console.log(res)
|
|
|
+ if(res.data.code==200){
|
|
|
+ var magarr=res.data.data;
|
|
|
+ that.count=res.data.count;
|
|
|
+ for(let j=0;j<magarr.length;j++){
|
|
|
+ that.msglist.push(magarr[j])
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ that.$message.error(res.data.msg);
|
|
|
+ }
|
|
|
+ }).catch(function (error) {
|
|
|
+ that.$message.error("获取消息列表失败！");
|
|
|
+ });
|
|
|
},
|
|
|
//任务通知切换
|
|
|
newstasklistclick(){
|
|
|
console.log(this.newstasklist)
|
|
|
-
|
|
|
+ },
|
|
|
+ //消息类型
|
|
|
+ PotsMsgTypeData(){
|
|
|
+ this.msglist=[];
|
|
|
+ var url = "/api/System/PotsMsgTypeData"
|
|
|
+ var that = this
|
|
|
+ this.$axios({
|
|
|
+ method: 'post',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer ' + that.token
|
|
|
+ },
|
|
|
+ data:{
|
|
|
+ portType:1,
|
|
|
+ userId:that.userId
|
|
|
+ }
|
|
|
+ }).then(function (res) {
|
|
|
+ console.log(res)
|
|
|
+ if(res.data.code==200){
|
|
|
+ that.msgtype=res.data.data;
|
|
|
+ that.activeName=that.msgtype[0].name;
|
|
|
+ that.type=that.msgtype[0].id;
|
|
|
+ that.PotsMessagePageList()
|
|
|
+ }else{
|
|
|
+ that.$message.error(res.data.msg);
|
|
|
+ }
|
|
|
+ }).catch(function (error) {
|
|
|
+ that.$message.error("获取消息类型失败！");
|
|
|
+ });
|
|
|
},
|
|
|
//消息列表
|
|
|
PsotMsgPageList(){
|
|
|
@@ -431,17 +572,14 @@ export default {
|
|
|
data:{
|
|
|
portType:1,
|
|
|
pageIndex:1,
|
|
|
- pageSize:10,
|
|
|
+ pageSize:100,
|
|
|
userId:that.userId
|
|
|
}
|
|
|
}).then(function (res) {
|
|
|
console.log(res)
|
|
|
if(res.data.code==200){
|
|
|
- that.newstasklist=res.data.data.taskNotificatio.taskNotificatioData;
|
|
|
- that.tasknot=res.data.data.taskNotificatio.unReadCount;
|
|
|
- that.newsgrouplist=res.data.data.operationNotificatio.operationNotificatioData;
|
|
|
- that.groupnot=res.data.data.operationNotificatio.unReadCount;
|
|
|
- console.log(that.newsgrouplist)
|
|
|
+ //初始化
|
|
|
+
|
|
|
}else{
|
|
|
that.$message.error(res.data.msg);
|
|
|
}
|
|
|
@@ -449,6 +587,89 @@ export default {
|
|
|
that.$message.error("获取消息列表失败！");
|
|
|
});
|
|
|
},
|
|
|
+ //消息确认已读
|
|
|
+ DeleMsg(index,row){
|
|
|
+ this.$confirm('此操作将认定你已知晓此通知?', '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+ var url = "/api/System/SetMessageRead"
|
|
|
+ var that = this
|
|
|
+ this.$axios({
|
|
|
+ method: 'post',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer ' + that.token
|
|
|
+ },
|
|
|
+ data:{
|
|
|
+ portType:1,
|
|
|
+ msgId:row.id,
|
|
|
+ userId:that.userId
|
|
|
+ }
|
|
|
+ }).then(function (res) {
|
|
|
+ console.log(res)
|
|
|
+ if(res.data.code==200){
|
|
|
+ if(that.type==1020){
|
|
|
+ that.$router.push({ path: "/home/TaskList"});
|
|
|
+ }
|
|
|
+ that.uplocal();
|
|
|
+ that.PotsMsgTypeData();
|
|
|
+ that.$message({
|
|
|
+ type: 'success',
|
|
|
+ message: res.data.msg
|
|
|
+ });
|
|
|
+ }else{
|
|
|
+ that.$message.error(res.data.msg);
|
|
|
+ }
|
|
|
+ }).catch(function (error) {
|
|
|
+ that.$message.error("确认已读失败！");
|
|
|
+ });
|
|
|
+
|
|
|
+ }).catch(() => {
|
|
|
+ this.$message({
|
|
|
+ type: 'info',
|
|
|
+ message: '已取消确认已读'
|
|
|
+ });
|
|
|
+ });
|
|
|
+ console.log(index,row)
|
|
|
+ console.log(this.type)
|
|
|
+
|
|
|
+ },
|
|
|
+ //修改未读条数
|
|
|
+ uplocal(){
|
|
|
+ console.log(this.msgtype.unReadCount);
|
|
|
+ window.localStorage.removeItem('unReadCount');
|
|
|
+ this.unReadCount--;
|
|
|
+ this.msgtype.unReadCount--;
|
|
|
+ console.log(this.msgtype.unReadCount);
|
|
|
+ localStorage.setItem('unReadCount', JSON.stringify(this.unReadCount));
|
|
|
+ },
|
|
|
+ //任务切换
|
|
|
+ taskclick(text){
|
|
|
+ if(text=='未读'){
|
|
|
+ this.newstasklist=this.tasknotlist
|
|
|
+ this.tasknobtn=false;
|
|
|
+ this.taskbtn=true;
|
|
|
+ }else{
|
|
|
+ this.newstasklist=this.taskReadlist
|
|
|
+ this.tasknobtn=true;
|
|
|
+ this.taskbtn=false;
|
|
|
+ }
|
|
|
+ console.log(this.newstasklist)
|
|
|
+ },
|
|
|
+ //团组切换
|
|
|
+ groupclick(text){
|
|
|
+ if(text=='未读'){
|
|
|
+ this.newsgrouplist=this.groupnotlist
|
|
|
+ this.groupnobtn=false;
|
|
|
+ this.groupbtn=true;
|
|
|
+ }else{
|
|
|
+ this.newsgrouplist=this.groupReadlist
|
|
|
+ this.groupnobtn=true;
|
|
|
+ this.groupbtn=false;
|
|
|
+ }
|
|
|
+ },
|
|
|
//消息通知
|
|
|
chatHub(){
|
|
|
var url = "/api/chatHub"
|
|
|
@@ -512,11 +733,17 @@ export default {
|
|
|
mounted() {
|
|
|
this.userId=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
|
|
|
this.token=JSON.parse(localStorage.getItem('userinif')).token;
|
|
|
+ this.unReadCount=JSON.parse(localStorage.getItem('unReadCount'));
|
|
|
this.removal();
|
|
|
this.radioChange(false);
|
|
|
this.ifIndexValue();
|
|
|
this.getmenu();
|
|
|
this.PsotMsgPageList();
|
|
|
+ this.PotsMsgTypeData();
|
|
|
+ // setTimeout(this.PotsMessagePageList(),500)
|
|
|
+
|
|
|
+ setInterval(this.PsotMsgPageList, 300000);
|
|
|
+ // setInterval(this.PsotMsgPageList, 3000);
|
|
|
// this.chatHub();
|
|
|
},
|
|
|
created() {
|
|
|
@@ -554,6 +781,12 @@ export default {
|
|
|
};
|
|
|
</script>
|
|
|
<style>
|
|
|
+*{
|
|
|
+ font-family: arial,"\5B8B\4F53";
|
|
|
+}
|
|
|
+.all-box{
|
|
|
+ font-family: arial,"\5B8B\4F53";
|
|
|
+}
|
|
|
.el-menu .el-menu-item.is-active {
|
|
|
color: #fff;
|
|
|
background-color: rgba(0, 0, 0, 0.1);
|
|
|
@@ -952,7 +1185,13 @@ i.icon-tongzhi {
|
|
|
.home-dialog .el-dialog__header{
|
|
|
padding: 10px 20px;
|
|
|
}
|
|
|
-
|
|
|
+.news-list-content{
|
|
|
+ line-height: 20px;
|
|
|
+}
|
|
|
+.loadmore{
|
|
|
+ margin-top: 20px;
|
|
|
+ text-align: center;
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -998,5 +1237,26 @@ i.icon-tongzhi {
|
|
|
padding: 0;
|
|
|
}
|
|
|
.delwh::-webkit-scrollbar {display:none}
|
|
|
+.scroll-box{
|
|
|
+ height: 750px;
|
|
|
+ overflow-y: auto;
|
|
|
+}
|
|
|
+.scroll-box::-webkit-scrollbar {
|
|
|
+ width: 6px;
|
|
|
+}
|
|
|
+.scroll-box::-webkit-scrollbar-track {
|
|
|
+ background: rgb(239, 239, 239);
|
|
|
+ border-radius: 2px;
|
|
|
+}
|
|
|
+.scroll-box::-webkit-scrollbar-thumb {
|
|
|
+ background: #40a0ff49;
|
|
|
+ border-radius: 10px;
|
|
|
+}
|
|
|
+.scroll-box::-webkit-scrollbar-thumb:hover {
|
|
|
+ background: #40a0ff;
|
|
|
+}
|
|
|
+.all-box .communal-box .el-autocomplete,.el-select{
|
|
|
+ margin-right: 0;
|
|
|
+}
|
|
|
</style>
|
|
|
|
yuanrf