diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index 46bd3da5..2b325201 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -898,6 +898,8 @@ if (props.searchValue) { mapSearchParam.value.cameraName = props.searchValue } + // 消息列表页面 + let formPage = router.currentRoute.value.query.formPage || '' onMounted(() => { // 获取用户信息 handleUser() @@ -916,7 +918,15 @@ clickList.value.push(_obj) tabClick(0, '视频资源') } else { - tabClick(0, '政务云资源') + // 默认选中 + if(formPage && formPage == 'noticePage') { + tabClick(0, '城市云脑会客厅') + roomYuyue.value = false + roomResult.value = true + onSearch() + }else { + tabClick(0, '政务云资源') + } } } diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue index 695b569e..38fae12d 100644 --- a/front/src/views/mynoticeView/components/NoticeList.vue +++ b/front/src/views/mynoticeView/components/NoticeList.vue @@ -187,8 +187,9 @@ let typeObj = { 7: '需求后台', 8: '评论前台', 9: '评论后台', - 10: '评价前台', - 11: '评价后台', + 10: '会议室前台', + 11: '会议室后台', + 12: '其他' } // 对应的后台管理的页面 @@ -213,6 +214,10 @@ let pageObj = { 0: 'myAgent-CommentModeration', 1: 'hasToDoTasks-CommentModeration', }, + '会议室后台': { + 0: 'activiti-RoomExamineAdmin', + 1: 'activiti-RoomExamineAdmin', + }, } // 前台tab名称 @@ -222,10 +227,11 @@ const tabTypeObj = { '下架前台': '能力下架', '需求前台': '需求评论', '评论前台': '需求评论', + '会议室前台': '会议室前台' } +// 会议室后台 const goPage = (item) => { - console.log('item----更改消息状态-------->', item); let typeText = typeObj[item.type]; if (typeText) { console.log('typeText类型------------>', typeText); @@ -235,13 +241,24 @@ const goPage = (item) => { let _page = pageObj[typeText][_applyState] window.open(window.SITE_CONFIG.backUrl + `/#/${_page}`) } else if (typeText.indexOf('前台') !== -1) { - window.sessionStorage.setItem('type', JSON.stringify('apply')) - router.push({ - path: '/personalCenter', - query: { - tabTypeName: tabTypeObj[typeText] || '能力申请', - } - }) + if (typeText == '会议室前台') { + router.push({ + path: '/DetailsPageconetent', + query: { + select: '基础设施', + formPage: 'noticePage' + }, + }) + } else { + window.sessionStorage.setItem('type', JSON.stringify('apply')) + router.push({ + path: '/personalCenter', + query: { + tabTypeName: tabTypeObj[typeText] || '能力申请', + } + }) + } + } } }