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

components.d.ts

@@ -31,8 +31,8 @@ declare module 'vue' {
     CtTextField: typeof import('./src/components/CtVuetify/CtTextField/index.vue')['default']
     DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElTree: typeof import('element-plus/es')['ElTree']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     File: typeof import('./src/components/Upload/file.vue')['default']
     HeadSearch: typeof import('./src/components/headSearch/index.vue')['default']

src/views/recruit/personal/companyDetail/index.vue

@@ -28,8 +28,8 @@
       <v-divider></v-divider>
       <div class="mt-3">
         <v-tabs v-model="tab" align-tabs="start" color="primary" bg-color="#f3f3f3" @update:model-value="handleTabClick">
-          <v-tab :value="2">在招职位</v-tab>
           <v-tab :value="1">公司简介</v-tab>
+          <v-tab :value="2">在招职位</v-tab>
         </v-tabs>
         <div class="d-flex" v-if="Object.keys(info).length">
           <div class="content-left">
@@ -82,9 +82,9 @@ import { formatName } from '@/utils/getText'
 const route = useRoute()
 const router = useRouter()
 const { id } = router.currentRoute.value.params
-const tab = ref(2)
+const tab = ref(1)
 const savedTab = new URLSearchParams(window.location.search).get('key')
-tab.value = savedTab ? (savedTab === 'briefIntroduction' ? 1 : 2) : 2
+tab.value = savedTab ? (savedTab === 'briefIntroduction' ? 1 : 2) : 1
 
 const handleTabClick = () => {
   router.push(`${route.path}?key=${tab.value === 1 ? 'briefIntroduction' : 'recruitmentPositions'}`)

src/views/recruit/personal/jobFair/details.vue

@@ -53,11 +53,11 @@ const content = ref('')
 
 const list = ref([
 	{
-		name: '烟台金海岸希尔顿酒店',
-		id: '590327104604868608',
+		name: '苏州华贸姑苏里服务公寓',
+		id: '755518158911180800',
 		industryName: '全服务中档酒店/4星级',
-		jobNum: 16,
-		logoUrl: 'https://www.mendunerhr.com/images/1675850394485_590327104604868608_mini.jpg',
+		jobNum: 8,
+		logoUrl: 'https://www.mendunerhr.com/images/1715235010000_755518158911180800_mini.jpg',
 		job: [
 			{ name: 'Executive Chef 行政总厨' },
 			{ name: 'Sales Manager 销售经理' },

src/views/recruit/personal/jobFair/enterprise/index.vue

@@ -98,7 +98,10 @@ const savedTab = new URLSearchParams(window.location.search).get('key')
 tab.value = savedTab ? (savedTab === 'briefIntroduction' ? 1 : 2) : 2
 
 const handleTabClick = () => {
-  router.push(`${route.path}?key=${tab.value === 1 ? 'briefIntroduction' : 'recruitmentPositions'}`)
+  // router.push(`${route.path}?key=${tab.value === 1 ? 'briefIntroduction' : 'recruitmentPositions'}`)
+  const key = tab.value === 1 ? 'briefIntroduction' : 'recruitmentPositions'
+  const query = { ...route?.query, key }
+  router.push({ path, query })
 }