front/src/api/home.js

@@ -460,10 +460,3 @@ export function soldierApply(data) {
     data,
   })
 }
-// 西海岸-基础设施-一键申请最大个数
-export function getMaxApplyNum(number) {
-  return request({
-    url: '/processForm/tabilityapplication/canApply/' + number,
-    method: 'get',
-  })
-}

front/src/global/GlobalConfig.js

@@ -507,5 +507,4 @@ export const RECOURCE_G_ICON = {
 }
 
 // 能力集市-默认选中tab
-// 西海岸-默认基础设施
+export const DETAIL_PAGE_CONTENT_DEFAULT_TAB = '应用资源'
-export const DETAIL_PAGE_CONTENT_DEFAULT_TAB = whoShow.itShowXiHaiAn ? '基础设施' : '应用资源'

front/src/router/index.js

@@ -85,7 +85,7 @@ export const constantRoutes = [
   {
     path: '/',
     component: Layout,
-    redirect: whoShow.itShowXiHaiAn ? '/DetailsPageconetent' : '/home',
+    redirect: '/home',
     meta: {
       title: '能力管理平台编目',
       icon: 'apps-line',

front/src/utils/request.js

@@ -119,6 +119,12 @@ instance.interceptors.response.use(
       if (_old_href === _new_href) {
         location.reload()
       }
+      
+      // location.reload()
+      // 西海岸-不重新加载
+      // if(!whoShow.itShowXiHaiAn) {
+      //   location.reload()
+      // }
       return response
     }
     if (response.headers.redirect === '/#/login') {
@@ -144,7 +150,7 @@ instance.interceptors.response.use(
         location.reload()
       }, 1000)
     }
-    handleCode(code, message || response.data.msg, response.headers)
+    handleCode(code, message, response.headers)
     if (loadingInstance) loadingInstance.close()
     // const { data, config } = response
     // const { code, msg } = data

front/src/views/home/DetailsPageconetent.vue

@@ -739,7 +739,6 @@
   // 基础设施引用
   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 {
@@ -782,8 +781,7 @@
       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)

front/src/views/home/detailsPageInfrastructureTree.vue

@@ -100,8 +100,6 @@
   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([])
@@ -120,7 +118,7 @@
           'router.currentRoute.value.query.select',
           router.currentRoute.value.query.select
         )
-        let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB
+        let select = router.currentRoute.value.query.select
         if (select === '123') {
           select = ''
         }

front/src/views/home/infrastructurePage.vue

@@ -752,7 +752,6 @@
     setSubmit,
     getYuyue,
     getSoldierList,
-    getMaxApplyNum,
   } from '@/api/home'
   import mybus from '@/myplugins/mybus'
   import dayjs from 'dayjs'
@@ -1777,31 +1776,16 @@
   const dept = reactive({})
   // eslint-disable-next-line no-undef
   if (infrastructure) {
+    console.log('infrastructure------------>', infrastructure)
+
     // eslint-disable-next-line no-undef
     dept.deptId = infrastructure.deptId || ''
     // eslint-disable-next-line no-undef
     dept.deptName = infrastructure.deptName || ''
   }
-
+  const apply = () => {
-  // 西海岸--判断设备最大数量个数
-  const judegNumber = () => {
-    return new Promise((resolve, reject) => {
-      getMaxApplyNum(selectedRowKeys.value.length).then(res => {
-        resolve(res)
-      }).catch(err => {
-        reject(err)
-      })
-    })
-  }
-
-  const apply = async () => {
-    console.log('一键申请', selectedList.value)
     if (selectedRowKeys.value.length != 0) {
-      // 判断最大数量
+      console.log('一键申请', selectedList.value)
-      let maxNumRes = await judegNumber();
-      if (maxNumRes.data.code != 0) {
-          return;
-      }
       let arr = [
         {
           arr: [
@@ -1937,9 +1921,9 @@
     },
     {
       title: '归属',
-      dataIndex: 'managementUnitName',
+      dataIndex: 'nodeName',
       width: '60%',
-      key: 'managementUnitName',
+      key: 'nodeName',
     },
     {
       title: '状态',