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..5538c710 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,32 @@ 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':
+ bus.$emit('competencyApplicationInit')
+ break
+ case 'myAgent-AbilityResourceShelf':
+ bus.$emit('abilityResourceShelfInit')
+ break
+ case 'myAgent-ApplicationforCompetencyRequirements':
+ bus.$emit('applicationforRequirementsInit')
+ break
+ case 'myAgent-AbilityResourcesRemoved':
+ bus.$emit('AbilityResourcesRemovedInit')
+ break
+ case 'myAgent-CommentModeration':
+ bus.$emit('commentInit')
+ break
+ case 'activiti-RoomExamineAdmin':
+ bus.$emit('roomExamineAdminInit')
+ break
+ }
+ }
// 未读通知数
this.getUnReadCount()
diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index b25d4e28..b9e28967 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -271,7 +271,7 @@ export default {
radio: '',
showPutOnTheShelfFlag: false,
showPutOnTheShelfFlag2: false,
- routePath: '',
+ // routePath: '',
submitFrom: {
type: '组件服务',
deptId: '',
@@ -441,7 +441,12 @@ export default {
}
},
showDetail (val) {
+<<<<<<< HEAD
window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id)
+=======
+ console.log(val)
+ window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id + '&&hiddenBackFlag=true')
+>>>>>>> 1e4d145fe03902c4ae099d8c968b93c472595a68
// this.addOrUpdateHandle(id)
// this.addOrUpdateVisible = true
// this.disabled = false
@@ -626,7 +631,12 @@ export default {
},
// 新上架
clear () {
+<<<<<<< HEAD
this.$router.push(this.routePath)
+=======
+ // this.$router.push(this.routePath)
+ console.log('清空----------------------------------------')
+>>>>>>> 1e4d145fe03902c4ae099d8c968b93c472595a68
this.notFilled = []
this.showPutOnTheShelfFlag = false
this.showPutOnTheShelfFlag2 = false
@@ -656,7 +666,7 @@ export default {
})
},
showPutOnTheShelfVue () {
- this.routePath = this.$route.path
+ // this.routePath = this.$route.path
this.showPutOnTheShelfFlag = false
this.showPutOnTheShelfFlag2 = true
this.submitFrom.infoList[0].attrValue = this.radio
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index f5e420a1..11f43505 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -271,7 +271,7 @@ export default {
insertList: [],
putOnTheShelfList: [],
showPutOnTheShelfFlag2: false,
- routePath: '',
+ // routePath: '',
submitFrom: {
type: '应用资源',
deptId: '',
@@ -359,7 +359,7 @@ export default {
})
},
showDetail (val) {
- window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id)
+ window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id + '&&hiddenBackFlag=true')
// this.addOrUpdateVisible = true
// this.disabled = false
// this.$nextTick(() => {
@@ -595,7 +595,7 @@ export default {
},
// 新上架
clear () {
- this.$router.push(this.routePath)
+ // this.$router.push(this.routePath)
this.notFilled = []
this.showPutOnTheShelfFlag2 = false
this.insertList = []
@@ -617,7 +617,7 @@ export default {
},
// 上架
showPutOnTheShelf () {
- this.routePath = this.$route.path
+ // this.routePath = this.$route.path
this.showPutOnTheShelfFlag2 = true
this.$http.get('/category/getCategoryTree').then(res => {
this.insertList = res.data.data.filter(item => item.name === '应用资源')[0]
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 @@