Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

components.d.ts

@@ -20,7 +20,7 @@ declare module 'vue' {
     CtPagination: typeof import('./src/components/CtPagination/index.vue')['default']
     CtSearch: typeof import('./src/components/CtSearch/index.vue')['default']
     CtTextField: typeof import('./src/components/CtVuetify/CtTextField/index.vue')['default']
-    DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
+    DatePicker: typeof import('./src/components/FormUI/datePicker/index.vue')['default']
     Details: typeof import('./src/components/Enterprise/details.vue')['default']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     HeadSearch: typeof import('./src/components/headSearch/index.vue')['default']

src/router/modules/enterprise.js

@@ -4,6 +4,7 @@ import Layout from '@/layout/enterprise.vue'
 const enterprise = [
   {
     path: '/enterprise',
+    show: true,
     redirect: '/enterprise/talentPool',
   },
   {
@@ -33,11 +34,6 @@ const enterprise = [
       icon: 'mdi-chart-arc'
     },
     children: [
-      // {
-      //   path: '/enterprise/statistics',
-      //   show: true,
-      //   component: () => import('@/views/enterprise/statistics/index.vue')
-      // },
       {
         path: '/enterprise/statistics/overallAnalysis',
         meta: {

src/router/modules/personal.js

@@ -88,10 +88,10 @@ const personal = [
       },
       {
         path: '/enterprise/joiningEnterprise',
-        component: () => import('@/views/enterprise/components/joiningEnterprise'),
+        component: () => import('@/views/enterprise/components/JoiningEnterprise.vue'),
         meta: {
           title: '加入企业'
-        },
+        }
       }
     ]
   }