diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index dee8e5b0..1947a3ba 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -1784,6 +1784,7 @@ Cardsname.value = name newQuery.select = Cardsname.value newQuery.type = '' + newQuery.zwy = '' router .replace({ query: newQuery, diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index c9e1c4f6..5031c4f4 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -1024,6 +1024,7 @@ } // 消息列表页面 let formPage = router.currentRoute.value.query.formPage || '' + let zwy = router.currentRoute.value.query.zwy || '' // 设施类型--无人机和单兵设备 let facilitiesType = router.currentRoute.value.query.facilitiesType || '' onMounted(() => { @@ -1054,7 +1055,12 @@ roomResult.value = true onSearch() } else { - tabClick(0, '城市云脑会客厅') + // 如果是通过自愿申请跳转 默认打开政务云资源 + if (zwy) { + tabClick(0, '政务云资源') + } else { + tabClick(0, '城市云脑会客厅') + } } } } @@ -1264,10 +1270,10 @@ } // 时间选择器限制----可用时间查询 //获取不可选择的日期 - const disabledDate = (current) => { - const time = moment().endOf('day').subtract(1, 'days') - return current && current < time - } + const disabledDate = (current) => { + const time = moment().endOf('day').subtract(1, 'days') + return current && current < time + } //获取不可选择的小时 const disabledStartHours = () => { if (roomEndTime.value) { diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue index 6de21b31..b3151918 100644 --- a/front/src/views/newHome/components/WorkDynamics.vue +++ b/front/src/views/newHome/components/WorkDynamics.vue @@ -13,14 +13,7 @@

能力上架

- - - +
能力上架申请 @@ -42,7 +35,7 @@
- +
{{ item }}
- - - - + + +
-