From 04c0c631fdd53211f96a34ce07268e21fd17c81c Mon Sep 17 00:00:00 2001 From: Apcallover <1503963513@qq.com> Date: Tue, 23 Apr 2024 19:41:17 +0800 Subject: [PATCH] flat: cityId --- api/mission.js | 2 +- pages/project/project.vue | 21 +++++++++++---------- pages/projectInfo/userrecruitInfo.vue | 7 ++++--- pages/projectInfo/userrecruitWorkInfo.vue | 2 +- pages/recruit/subPage/task.vue | 17 ++++++++--------- pages/recruit/subPage/work.vue | 17 ++++++++--------- vue.config.js | 5 +++-- 7 files changed, 36 insertions(+), 35 deletions(-) diff --git a/api/mission.js b/api/mission.js index b86569b..633f23c 100644 --- a/api/mission.js +++ b/api/mission.js @@ -103,7 +103,7 @@ export const recommendMissionSearch = (params) => { /*抢任务-推荐岗位*/ export const newMissionAllSearch = (params) => { return request({ - url: '/api/jobslink-api/user/userrecruit/searchList', + url: '/api/jobslink-api/user/userWork/searchList', method: 'get', params, headers: getHeader() diff --git a/pages/project/project.vue b/pages/project/project.vue index 2348aff..29ccb2e 100644 --- a/pages/project/project.vue +++ b/pages/project/project.vue @@ -474,7 +474,7 @@ areaModal, industryModal } - console.log(this.searchData, '------'); + console.log(this.searchData, this.activeTab, '------'); if (submitData || areaModal || industryModal) { this.isSearch = true; } @@ -513,9 +513,9 @@ education: submitData["学历"], salary: submitData["工资"], industry: industryModal?.industry, - province: areaModal?.address1[0], - city: areaModal?.address1[1], - cityId: areaModal?.info[areaModal?.info?.length - 2]?.id + // province: areaModal?.address1[0], + // city: areaModal?.address1[1], + cityId: areaModal?.info.map((v) => v.areaName).join('-') } nearMissionSearch(params).then(res => { if (this.policyPage.current === 1) { @@ -536,15 +536,16 @@ areaModal, industryModal } = this.searchData; + console.log(areaModal) let params = { current: this.nearPage.current, size: this.nearPage.size, education: submitData["学历"], salary: submitData["工资"], industry: industryModal?.industry, - province: areaModal?.address1[0], - city: areaModal?.address1[1], - cityId: areaModal?.info[areaModal?.info?.length - 2]?.id + // province: areaModal?.address1[0], + // city: areaModal?.address1[1], + cityId: areaModal?.info.map((v) => v.areaName).join('-') } newMissionAllSearch(params).then(res => { if (this.nearPage.current === 1) { @@ -570,10 +571,10 @@ education: submitData["学历"], salary: submitData["工资"], industry: industryModal?.info?.id, - province: areaModal?.address1[0], - city: areaModal?.address1[1], + // province: areaModal?.address1[0], + // city: areaModal?.address1[1], wageUnitCategory: submitData["wageUnitCategory"], - cityId: areaModal?.info[areaModal?.info?.length - 2]?.id + cityId: areaModal?.info.map((v) => v.areaName).join('-') } recommendMissionSearch(params).then(res => { if (this.newPage.current === 1) { diff --git a/pages/projectInfo/userrecruitInfo.vue b/pages/projectInfo/userrecruitInfo.vue index d36e1d6..1415c23 100644 --- a/pages/projectInfo/userrecruitInfo.vue +++ b/pages/projectInfo/userrecruitInfo.vue @@ -50,7 +50,7 @@ 任务描述 - {{info.missionDesc || '暂无'}} + {{info.jobDescription || '暂无'}} @@ -95,7 +95,7 @@ 公司地址：{{info.companyAddress || '暂无'}} --> - 工作地址：{{info.jobAddress || cityNamed || '暂无'}} + 工作地址：{{info.cityId || '暂无'}} 详细地址：{{info.address || '暂无'}} @@ -435,7 +435,8 @@ }, cityNamed() { console.log('val', this.info, this.area.dic) - if (this.info && this.info.cityId !== -1 && this.area.dic) { + if (this.info && this.info.cityId !== -1 && this.area + .dic) { return this.area.dic[this.info.cityId].label } else { return '无' diff --git a/pages/projectInfo/userrecruitWorkInfo.vue b/pages/projectInfo/userrecruitWorkInfo.vue index 9754853..9f384eb 100644 --- a/pages/projectInfo/userrecruitWorkInfo.vue +++ b/pages/projectInfo/userrecruitWorkInfo.vue @@ -100,7 +100,7 @@ 座机号：{{info.callNumber}} --> - 工作地址：{{`${info.province}${info.city}${info.county}` || info.jobAddress || '暂无'}} + 工作地址：{{ info.cityId || '暂无'}} 详细地址：{{info.address || '暂无'}} diff --git a/pages/recruit/subPage/task.vue b/pages/recruit/subPage/task.vue index 07e12b7..05909a5 100644 --- a/pages/recruit/subPage/task.vue +++ b/pages/recruit/subPage/task.vue @@ -116,11 +116,10 @@ - - + + @@ -191,7 +190,7 @@ value: '', showCalendar: false, showStime: false, - showjobAddress: false, + showCityId: false, showEtime: false, info: { jobName: '', // 招工名称 @@ -213,7 +212,7 @@ ageDesc: dic.ageArr[0][0].label, // 年龄要求 education: dic.eduArr[0][0].value, // 学历要求 experienceDesc: dic.expeArr[0][0].label, // 经验要求 - jobAddress: '', + cityId: '', jobCompanyName: '', // 企业名称 jobCompanyScale: '', // 企业信用代码 jobCompanyIndustry: '', // 所属行业 @@ -318,7 +317,7 @@ message: '请选择经验要求', trigger: ['change'] }, - jobAddress: { + cityId: { type: 'string', required: true, message: '请选择工作地址', @@ -658,7 +657,7 @@ 'education', 'educationLabel', 'experienceDesc', - 'jobAddress', + 'cityId', 'jobCompanyName', 'jobCompanyScale', 'jobCompanyIndustry', diff --git a/pages/recruit/subPage/work.vue b/pages/recruit/subPage/work.vue index e36992a..c89f657 100644 --- a/pages/recruit/subPage/work.vue +++ b/pages/recruit/subPage/work.vue @@ -120,11 +120,10 @@ - - + + @@ -196,7 +195,7 @@ showCalendar: false, showStime: false, showEtime: false, - showjobAddress: false, + showCityId: false, info: { jobName: '', // 招工名称 stime: '', // 发布时间 @@ -217,7 +216,7 @@ ageDesc: dic.ageArr[0][0].label, // 年龄要求 education: dic.eduArr[0][0].value, // 学历要求 experienceDesc: dic.expeArr[0][0].label, // 经验要求 - jobAddress: '', + cityId: '', jobCompanyName: '', // 企业名称 jobCompanyScale: '', // 企业信用代码 jobCompanyIndustry: '', // 所属行业 @@ -322,7 +321,7 @@ message: '请选择经验要求', trigger: ['change'] }, - jobAddress: { + cityId: { type: 'string', required: true, message: '请选择工作地址', @@ -663,7 +662,7 @@ 'education', 'educationLabel', 'experienceDesc', - 'jobAddress', + 'cityId', 'jobCompanyName', 'jobCompanyScale', 'jobCompanyIndustry', diff --git a/vue.config.js b/vue.config.js index 5771477..740d8ef 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,10 +3,11 @@ module.exports = { port: 1887, proxy: { '/api': { - target: 'http://10.165.0.173:8000', + target: 'http://192.168.1.101:8200', ws: true, + changeOrigin: true, pathRewrite: { - '^/api': '/' + "^/api/jobslink-api": "/" } }, '/qq/map': {