diff --git a/front/src/api/home.js b/front/src/api/home.js index 52ddff8c..e29fce91 100644 --- a/front/src/api/home.js +++ b/front/src/api/home.js @@ -459,4 +459,11 @@ export function soldierApply(data) { method: 'post', data, }) +} +// 西海岸-基础设施-一键申请最大个数 +export function getMaxApplyNum(number) { + return request({ + url: '/processForm/tabilityapplication/canApply/' + number, + method: 'get', + }) } \ No newline at end of file diff --git a/front/src/global/GlobalConfig.js b/front/src/global/GlobalConfig.js index b3d218e3..66bf3de7 100644 --- a/front/src/global/GlobalConfig.js +++ b/front/src/global/GlobalConfig.js @@ -507,4 +507,5 @@ export const RECOURCE_G_ICON = { } // 能力集市-默认选中tab -export const DETAIL_PAGE_CONTENT_DEFAULT_TAB = '应用资源' +// 西海岸-默认基础设施 +export const DETAIL_PAGE_CONTENT_DEFAULT_TAB = whoShow.itShowXiHaiAn ? '基础设施' : '应用资源' diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index 68271b96..5c6a9675 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -739,6 +739,7 @@ // 基础设施引用 import infrastructurePage from '@/views/home/infrastructurePage.vue' import detailsPageInfrastructureTree from '@/views/home/detailsPageInfrastructureTree.vue' + import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js' import { message } from 'ant-design-vue' import { @@ -781,7 +782,8 @@ let currentPageSize = ref(5) const pageSizeOptions = ref(['5', '10', '20', '50']) const router = useRouter() - let select = router.currentRoute.value.query.select || '应用资源' + // let select = router.currentRoute.value.query.select || '应用资源' + let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB const select2 = router.currentRoute.value.query.select const str = router.currentRoute.value.query.str const searchValue = ref(str) diff --git a/front/src/views/home/detailsPageInfrastructureTree.vue b/front/src/views/home/detailsPageInfrastructureTree.vue index a4aaab3b..1e2a6875 100644 --- a/front/src/views/home/detailsPageInfrastructureTree.vue +++ b/front/src/views/home/detailsPageInfrastructureTree.vue @@ -100,6 +100,8 @@ import mybus from '@/myplugins/mybus' import { useRouter } from 'vue-router' import { UpOutlined, DownOutlined } from '@ant-design/icons-vue' + import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js' + export default defineComponent({ setup() { const selectedKeys = ref([]) @@ -118,7 +120,7 @@ 'router.currentRoute.value.query.select', router.currentRoute.value.query.select ) - let select = router.currentRoute.value.query.select + let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB if (select === '123') { select = '' }