diff --git a/src/api/index.js b/src/api/index.js index 1a13ba9..1a7d4ba 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -17,6 +17,7 @@ export default { deleteProfile : `users/users/userInfo/deleteProfile`, getUserRolesPermissionMenu: `${host}users/users/user-role/getUserRolesPermissionMenu`, fileUploadNakadai: `${host}nakadai/nakadai/oss/fileUpload`, + refreshPageNotification : `nakadai/message/refreshPageNotification`, platformLogList: `nakadai/nakadai/log/platformLogList`, logNotification: `nakadai/nakadai/log/logNotification`, diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index 744c7c5..888138b 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -71,6 +71,7 @@ import Setting from "@/setting"; import util from "@/libs/util"; import navbar from "../navbar"; import axios from 'axios' +import Bus from '@/libs/bus' export default { data () { return { @@ -97,7 +98,6 @@ export default { this.getUserInfo(); this.getNotice() } - this.$once('hook:beforeDestroy', function () { clearInterval(this.noticeTimer) }) @@ -118,25 +118,66 @@ export default { } }).catch(res => { }); }, + + // socket连接成功 + open () { + console.log("socket连接成功"); + }, + // socket连接失败 + error () { + console.log("连接错误"); + }, + // 接收消息 + getMessage (msg) { + console.log("==websocket接收数据=="); + console.log(JSON.parse(msg.data)); + + const { content } = JSON.parse(msg.data) + // 1赛事、2创业、3考核、4模型。-号拼接携带id + if (content == 1) { + Bus.$emit('matchSocket') + } else if (content == 2) { + Bus.$emit('activitySocket') + } else if (content == 4) { + Bus.$emit('modelSocket') + } else { + this.getNotice() + } + }, + // 关闭socket + close () { + console.log("socket已经关闭"); + }, + initSocket ({ id, account }) { + // 实例化socket + // this.socket = new WebSocket(`ws://${Setting.isDev ? '192.168.31.51' : location.host}:9100/nakadai/websocket/${id}/${account}`) + this.socket = new WebSocket(`ws://121.37.12.51:9100/nakadai/websocket/${id}/${account}`) + // 监听socket连接 + this.socket.onopen = this.open; + // 监听socket错误信息 + this.socket.onerror = this.error; + // 监听socket消息 + this.socket.onmessage = this.getMessage; + }, + + // 获取消息 getNotice () { - if (!Setting.isDev) { - this.noticeTimer = setInterval(() => { - this.$get(this.api.messageNotificationList, { - type: 2 - }).then(res => { - this.notices = res.notificationList - }).catch(res => { }); - }, 5000) - } + this.$get(this.api.messageNotificationList, { + type: 2 + }).then(res => { + this.notices = res.notificationList + }).catch(res => { }); }, // 前往评论列表 - toComment (item) { + async toComment (item) { + await this.$post(`${this.api.noticeRead}?isRead=1¬ifyId=${item.notifyId}`) // 该通知置为已读 this.$router.push(`/station/preview?courseId=${item.cid}&commentId=${item.commentId}¬ifyId=${item.notifyId}`) }, // 获取用户信息 getUserInfo () { this.$get(this.api.queryUserInfoDetails).then(res => { + this.initSocket(res.result.userAccount) const { userAvatars, userName, userId } = res.result.hrUserInfo || {} userAvatars && this.setAvatar(userAvatars); this.setUserId(userId) diff --git a/src/pages/activity/list/index.vue b/src/pages/activity/list/index.vue index eddf59e..e401180 100644 --- a/src/pages/activity/list/index.vue +++ b/src/pages/activity/list/index.vue @@ -141,11 +141,11 @@ import { mapState, mapMutations } from "vuex"; import { Loading } from "element-ui"; import Setting from "@/setting" import util from "@/libs/util" +import Bus from '@/libs/bus' export default { data () { return { timer: null, - redisTimer: null, token: util.local.get(Setting.tokenKey), statusList: ["待报名", "取消报名", "马上报名", "报名截止", "已结束"], endList: ["报名开始", "报名截止", "报名截止", "项目开始", "项目结束"], @@ -200,17 +200,21 @@ export default { } }, mounted () { + // websocket实时刷新 + Bus.$on('activitySocket', () => { + this.getData() + }) + this.getData() this.$once('hook:beforeDestroy', function () { this.clearTimer() - clearInterval(this.redisTimer) }) }, methods: { ...mapMutations('match', [ 'SET_TYPE' ]), - getList () { + getData () { this.clearTimer() const { form } = this const data = { @@ -281,27 +285,10 @@ export default { }) this.timerList = [] }, - getData () { - // this.loadIns = Loading.service() - this.getList() - if (!Setting.isDev) { - clearInterval(this.redisTimer) - this.redisTimer = setInterval(this.getRedis, 1000) - } - }, initData () { this.page = 1 this.getData() }, - // 获取redis缓存 - getRedis () { - this.$post(this.api.getRedisCacheActivity).then(({ data }) => { - if (data) { - localStorage.getItem('activityTimestampClient') !== data && this.getList() // 本地缓存跟redis返回的不一样，就查询列表 - localStorage.setItem('activityTimestampClient', data) - } - }).catch(res => { }) - }, changeType (type) { const { form } = this form.competitionScope = 3 diff --git a/src/pages/activity/manage/list/index.vue b/src/pages/activity/manage/list/index.vue index ff36aae..0fdc25e 100644 --- a/src/pages/activity/manage/list/index.vue +++ b/src/pages/activity/manage/list/index.vue @@ -155,6 +155,7 @@ import Setting from "@/setting"; import { mapMutations } from "vuex"; import { Loading } from 'element-ui' import breadcrumb from '@/components/breadcrumb' +import Bus from '@/libs/bus' export default { components: { breadcrumb }, data () { @@ -211,7 +212,6 @@ export default { playingStages: [] }, timer: null, - redisTimer: null, pickerOptions: { shortcuts: [{ text: '此刻', @@ -249,18 +249,21 @@ export default { } }, mounted () { + // websocket实时刷新 + Bus.$on('activitySocket', () => { + this.getData() + }) + this.getData() this.$once('hook:beforeDestroy', function () { clearInterval(this.timer) - clearInterval(this.redisTimer) }) }, methods: { ...mapMutations('activity', [ 'setPage' ]), - getList () { - // const load = Loading.service() + getData () { const { form } = this this.$post(this.api.myActivities, { pageNum: this.page, @@ -308,33 +311,12 @@ export default { this.getData() } } - }).catch(res => { - // load.close() - }) - }, - getData () { - this.getList() + }).catch(res => { }) }, initData () { this.page = 1; this.getData(); }, - // 获取redis缓存 - getRedis () { - this.$post(this.api.getRedisCacheActivity).then(({ data }) => { - if (data) { - localStorage.getItem('activityTimestampClient') !== data && this.getList() // 本地缓存跟redis返回的不一样，就查询列表 - localStorage.setItem('activityTimestampClient', data) - } - }).catch(res => { }) - }, - getData () { - this.getList() - if (!Setting.isDev) { - clearInterval(this.redisTimer) - this.redisTimer = setInterval(this.getRedis, 1000) - } - }, add () { this.$router.push("add"); }, @@ -392,7 +374,7 @@ export default { if (date == "0000-00-00 00:00:00") return "---"; return date; }, - switchOff (val, row) { + async switchOff (val, row) { this.$post(this.api.disabledEventsActivity, { activityId: row.id, isOpen: val, @@ -400,6 +382,7 @@ export default { }).then(res => { }).catch(err => { row.isOpen = val ? 0 : 1 }) + await this.$post(`${this.api.refreshPageNotification}?content=2`) }, } }; diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue index 775104d..86e67d8 100644 --- a/src/pages/ass/list/index.vue +++ b/src/pages/ass/list/index.vue @@ -1,140 +1,201 @@ diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue index 82c28f2..bd330db 100644 --- a/src/pages/match/details/index.vue +++ b/src/pages/match/details/index.vue @@ -1425,6 +1425,7 @@ export default { util.cookies.set('courseId', form.cid) util.cookies.set('curriculumName', escape(form.systemName)) util.cookies.set('systemId', form.systemId) + util.cookies.set('isSubmit', '', -1) util.cookies.set('competitionId', this.form.id) util.cookies.set('stageId', form.stageId) util.cookies.set('teamId', this.form.competitionRegistration.teamId) @@ -1442,7 +1443,7 @@ export default { // 进入子系统 toSub () { const { form } = this - const { systemId, projectId, cid, stageId } = this.curStage + const { systemId, projectId, cid, stageId, endTime } = this.curStage const competitionId = form.id const teamId = form.competitionRegistration.teamId let token = util.local.get(Setting.tokenKey); @@ -1451,7 +1452,7 @@ export default { location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${cid}&systemId=${systemId}&projectId=${projectId}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&assessmentId=&classId=&stopTime=&test=true` } else if (systemId == 12) { // 众筹系统 - window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}`); + window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&endTime=${endTime}`); } else { // python系统 this.toPython(this.curProject) diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue index 041d501..de646e2 100644 --- a/src/pages/match/list/index.vue +++ b/src/pages/match/list/index.vue @@ -1,194 +1,269 @@