diff --git a/back/public/index.html b/back/public/index.html
index 6dfeafc1..8d7d520c 100644
--- a/back/public/index.html
+++ b/back/public/index.html
@@ -1,8 +1,8 @@
@@ -39,7 +39,8 @@
window.SITE_CONFIG['previewUrl'] = _global.config.previewUrl;
window.SITE_CONFIG['apiURL'] = _global.config.apiURL;
// WebSocket地址
- window.SITE_CONFIG['socketURL'] =_global.config.socketURL;
+ // window.SITE_CONFIG['socketURL'] =_global.config.socketURL;
+ window.SITE_CONFIG['websocketURL'] = _global.config.websocketURL
diff --git a/back/src/views/main-navbar.vue b/back/src/views/main-navbar.vue
index 0df84d2c..bd089054 100644
--- a/back/src/views/main-navbar.vue
+++ b/back/src/views/main-navbar.vue
@@ -105,8 +105,9 @@ import { messages } from '@/i18n'
import screenfull from 'screenfull'
import UpdatePassword from './main-navbar-update-password'
import { clearLoginInfo } from '@/utils'
-// import Cookies from 'js-cookie'
-// var socket = null
+import Cookies from 'js-cookie'
+import bus from '@/views/bus.js'
+var socket = null
export default {
inject: ['refresh'],
data () {
@@ -120,29 +121,38 @@ export default {
UpdatePassword
},
created () {
- // var vue = this
- // socket = new WebSocket(`${window.SITE_CONFIG['socketURL']}?token=${Cookies.get('token')}`)
- // socket.onopen = function () {}
- // socket.onerror = function () {
- // vue.$notify.error({
- // title: vue.$t('notice.disconnect'),
- // message: vue.$t('notice.disconnectMessage')
- // })
- // }
- // socket.onmessage = function (evt) {
- // const result = JSON.parse(evt.data)
-
- // // 如果是有新文本通知，则提示有新通知
- // if (result.type === 0) {
- // vue.messageTip = true
- // vue.$notify({
- // title: vue.$t('notice.new'),
- // message: result.msg,
- // type: 'info',
- // duration: 5000
- // })
- // }
- // }
+ const that = this
+ socket = new WebSocket(`${window.SITE_CONFIG.websocketURL}?token=${Cookies.get('ucsToken')}`)
+ socket.onopen = function () {}
+ socket.onerror = function () {}
+ socket.onmessage = function (res) {
+ switch (that.$route.name) {
+ case 'myAgent-CompetencyApplication':
+ console.log('websocket,11')
+ bus.$emit('competencyApplicationInit')
+ break
+ case 'myAgent-AbilityResourceShelf':
+ console.log('websocket,22')
+ bus.$emit('abilityResourceShelfInit')
+ break
+ case 'myAgent-ApplicationforCompetencyRequirements':
+ console.log('websocket,33')
+ bus.$emit('applicationforRequirementsInit')
+ break
+ case 'myAgent-AbilityResourcesRemoved':
+ console.log('websocket,44')
+ bus.$emit('AbilityResourcesRemovedInit')
+ break
+ case 'myAgent-CommentModeration':
+ console.log('websocket,55')
+ bus.$emit('commentInit')
+ break
+ case 'activiti-RoomExamineAdmin':
+ console.log('websocket,66')
+ bus.$emit('roomExamineAdminInit')
+ break
+ }
+ }
// 未读通知数
this.getUnReadCount()
diff --git a/back/src/views/modules/activiti/RoomExamineAdmin.vue b/back/src/views/modules/activiti/RoomExamineAdmin.vue
index 214018a1..78fdadb9 100644
--- a/back/src/views/modules/activiti/RoomExamineAdmin.vue
+++ b/back/src/views/modules/activiti/RoomExamineAdmin.vue
@@ -215,6 +215,7 @@