diff --git a/api/resume.js b/api/resume.js index 0d8635e..d9bcba2 100644 --- a/api/resume.js +++ b/api/resume.js @@ -1,121 +1,131 @@ -import { request } from "@/untils/AxiosUtils.js"; -/*我的简历-查看*/ -export const myResume = () => { - return request({ - url: "/api/jobslink-api/user/user/resume/find", - method: "get", - }); -}; - -/*我的简历-查看-我的技能工种*/ -export const mySkills = () => { - return request({ - url: "/api/jobslink-api/user/user/skills/find", - method: "get", - }); -}; - -/*我的简历-删除-我的技能工种*/ -export const removeSkills = (id) => { - return request({ - url: "/api/jobslink-api/user/user/skills/remove", - method: "post", - params: { - id, - }, - }); -}; - -/*我的简历-设置我想工作的地点*/ -export const setCity = (id, cityId) => { - return request({ - url: "/api/jobslink-api/user/user/resume/update", - method: "post", - data: { - id, - workplace: cityId, - }, - }); -}; - -/*我的简历-设置我想学习的技能*/ -export const setLearn = (id, learnSkill) => { - return request({ - url: "/api/jobslink-api/user/user/resume/update", - method: "post", - data: { - id, - learnSkill, - }, - }); -}; - -/*保存我的简历信息*/ -export const setResume = ({id,education,wage,workplace,telephone}) => { - return request({ - url: "/api/jobslink-api/user/user/resume/update", - method: "post", - data: { - id, - education, - wage, - workplace, - telephone - }, - }); -}; - -/*行业库*/ -export const getTrade = () => { - return request({ - url: "/api/jobslink-api/tenant/base/config/trade", - method: "get", - }); -}; - -/*工种库*/ -export const getWorktypes = (id) => { - return request({ - url: "/api/jobslink-api/tenant/base/config/worktypes", - method: "get", - params: { - id, - }, - }); -}; - -/*技能库*/ -export const getSkills = (id) => { - return request({ - url: "/api/jobslink-api/tenant/base/config/skills", - method: "get", - params: { - id, - }, - }); -}; - -/*新增职业技能*****/ -export const addSkills = (trade, worktypes, skills, type) => { - return request({ - url: "/api/jobslink-api/user/user/skills/save", - method: "post", - data: { - trade, - worktypes, - skills, - type, - }, - }); -}; -/*工种/岗位列表*****/ -export const getWorktypesList = (type) => { - console.log(type, "================="); - return request({ - url: "/api/jobslink-api/tenant/worktypes/base/list", - method: "get", - params: { - type, - }, - }); -}; +import { + request +} from "@/untils/AxiosUtils.js"; +/*我的简历-查看*/ +export const myResume = () => { + return request({ + url: "/api/jobslink-api/user/user/resume/find", + method: "get", + }); +}; + +/*我的简历-查看-我的技能工种*/ +export const mySkills = () => { + return request({ + url: "/api/jobslink-api/user/user/skills/find", + method: "get", + }); +}; + +/*我的简历-删除-我的技能工种*/ +export const removeSkills = (id) => { + return request({ + url: "/api/jobslink-api/user/user/skills/remove", + method: "post", + params: { + id, + }, + }); +}; + +/*我的简历-设置我想工作的地点*/ +export const setCity = (id, cityId) => { + return request({ + url: "/api/jobslink-api/user/user/resume/update", + method: "post", + data: { + id, + workplace: cityId, + }, + }); +}; + +/*我的简历-设置我想学习的技能*/ +export const setLearn = (id, learnSkill) => { + return request({ + url: "/api/jobslink-api/user/user/resume/update", + method: "post", + data: { + id, + learnSkill, + }, + }); +}; + +/*保存我的简历信息*/ +export const setResume = ({ + id, + education, + wage, + workplace, + telephone, + workExperience +}) => { + return request({ + url: "/api/jobslink-api/user/user/resume/update", + method: "post", + data: { + id, + education, + wage, + workplace, + telephone, + workExperience + }, + }); +}; + +/*行业库*/ +export const getTrade = () => { + return request({ + url: "/api/jobslink-api/tenant/base/config/trade", + method: "get", + }); +}; + +/*工种库*/ +export const getWorktypes = (id) => { + return request({ + url: "/api/jobslink-api/tenant/base/config/worktypes", + method: "get", + params: { + id, + }, + }); +}; + +/*技能库*/ +export const getSkills = (id) => { + return request({ + url: "/api/jobslink-api/tenant/base/config/skills", + method: "get", + params: { + id, + }, + }); +}; + +/*新增职业技能*****/ +export const addSkills = (trade, worktypes, skills, type) => { + return request({ + url: "/api/jobslink-api/user/user/skills/save", + method: "post", + data: { + trade, + worktypes, + skills, + type, + }, + }); +}; +/*工种/岗位列表*****/ +export const getWorktypesList = (type) => { + console.log(type, "================="); + return request({ + url: "/api/jobslink-api/tenant/worktypes/base/list", + method: "get", + params: { + type, + }, + }); +}; \ No newline at end of file diff --git a/api/userrecruit.js b/api/userrecruit.js index a6dd67e..271582b 100644 --- a/api/userrecruit.js +++ b/api/userrecruit.js @@ -136,7 +136,7 @@ export const cancelUserInvite = (params) => request({ params }) export const getDeptAllTree = (params) => request({ - url: '/api/jobslink-api/system/dept/all-tree', + url: '/api/jobslink-api/system/dept/town-tree', method: 'get', params }) \ No newline at end of file diff --git a/components/companyList/companyList.vue b/components/companyList/companyList.vue index 4911c3b..203f0ac 100644 --- a/components/companyList/companyList.vue +++ b/components/companyList/companyList.vue @@ -111,7 +111,7 @@ lon, lat } = item - if (this.position && lon) { + if (this.position && lon > 0) { const { longitude, latitude diff --git a/components/companyList/workList.vue b/components/companyList/workList.vue index db4ac15..3ac848b 100644 --- a/components/companyList/workList.vue +++ b/components/companyList/workList.vue @@ -115,7 +115,7 @@ lon, lat } = item - if (this.position && lon) { + if (this.position && lon > 0) { const { longitude, latitude diff --git a/components/custom-popup/custom-popup.vue b/components/custom-popup/custom-popup.vue new file mode 100644 index 0000000..14b4fd1 --- /dev/null +++ b/components/custom-popup/custom-popup.vue @@ -0,0 +1,128 @@ + + + + + \ No newline at end of file diff --git a/components/uMapView/uMapView.vue b/components/uMapView/uMapView.vue index 2f7ebeb..4410e73 100644 --- a/components/uMapView/uMapView.vue +++ b/components/uMapView/uMapView.vue @@ -185,7 +185,7 @@ latitude: lat, longitude: lon, iconPath: mypoint, - title: '我的位置', + title: '', width: 20, height: 20 }]) diff --git a/config.js b/config.js index 55eeb98..604a21e 100644 --- a/config.js +++ b/config.js @@ -3,7 +3,7 @@ module.exports = { // 图片地址 imageUrl: '', // 天地图tk - apiKey: 'e122b0518f43b32dcc256edbae20a5d1', + apiKey: 'e4266a5e84fe6c10f60c559967f0a03f', // 显示标题 showTitle: false, // map 1、黑色模块 2、白色模块 diff --git a/package.json b/package.json index ede3d46..cb2f72a 100644 --- a/package.json +++ b/package.json @@ -1,29 +1,29 @@ -{ - "name": "jobslink-user-clent", - "version": "1.0.0", - "description": "{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}", - "main": "main.js", - "directories": { - "lib": "lib" - }, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "git@192.168.22.101:clent/jobslink-user-clent.git" - }, - "keywords": [], - "author": "", - "license": "ISC", - "dependencies": { - "@supermap/iclient-ol": "^11.1.1", - "decimal.js": "^10.2.0", - "js-base64": "^2.4.9", - "js-md5": "^0.7.3", - "vue-jsonp": "^2.0.0" - }, - "devDependencies": { - "@supermap/babel-plugin-import": "0.0.1" - } -} +{ + "name": "jobslink-user-clent", + "version": "1.0.0", + "description": "{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}", + "main": "main.js", + "directories": { + "lib": "lib" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git@192.168.22.101:clent/jobslink-user-clent.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "dependencies": { + "@supermap/iclient-ol": "^11.1.1", + "decimal.js": "^10.2.0", + "js-base64": "^2.4.9", + "js-md5": "^0.7.3", + "vue-jsonp": "^2.0.0" + }, + "devDependencies": { + "@supermap/babel-plugin-import": "0.0.1" + } +} \ No newline at end of file diff --git a/pageMy/my/resume/index.vue b/pageMy/my/resume/index.vue index 92bf239..213a895 100644 --- a/pageMy/my/resume/index.vue +++ b/pageMy/my/resume/index.vue @@ -95,18 +95,73 @@ placeholder="请输入您的电话" border="none" clearable> + + 工作经历 + + + + + + + {{item.name}} + {{item.stime}}-{{item.etime}} + + + {{item.work}} + {{item.department}} + + + {{item.content}} + + + + + 取消 + 确认 + + + + + + + + + + + + + + + + + + + + + + + + + - + + item.id !== vItem.id) + } + }, + + }) + }, + updataGz(item) { + this.cardaddshow = true + this.gzInfo = item + }, + confimPopup1() { + const copy = cloneDeep(this.gzInfo) + const keys = Object.keys(validateForm) + console.log(keys, copy) + for (let i = 0; i < keys.length; i++) { + if (!copy[keys[i]]) { + return this.$api.msg(validateForm[keys[i]]) + } + } + if (copy.id) { + this.gzList = this.gzList.map((item) => { + if (item.id === copy.id) { + return copy + } else { + return item + } + }) + } else { + copy.id = Date.now() + this.gzList.push(copy) + } + this.isShowButton = true + this.cardaddshow = false + }, + stimeClose() { + this.showStime = false + }, + stimeConfirm(e) { + this.showStime = false + this.gzInfo.stime = uni.$u.timeFormat(e.value, 'yyyy.mm.dd') + }, + etimeClose() { + this.showStime = false + }, + etimeConfirm(e) { + this.showEtime = false + this.gzInfo.etime = uni.$u.timeFormat(e.value, 'yyyy.mm.dd') + }, + hideKeyboard() { + uni.hideKeyboard() + }, getResume() { myResume().then(res => { const data = res.data.data + if (data.workExperience) { + this.gzList = JSON.parse(data.workExperience) + } this.myResume = { city: { workplace: data.workplace @@ -381,6 +514,7 @@ // 中国大陆座机号码正则表达式 const landlineRegex = /\b(0\d{2,3}-\d{7,8}(-\d{1,4})?)\b/; + const workList = JSON.stringify(this.gzList) if (mobileRegex.test(phone) || landlineRegex.test(phone)) { // 电话号码格式正确 @@ -390,7 +524,8 @@ education: education.label, workplace: city.workplace ? city.workplace : city.parentLabel + '-' + city.label, telephone: phone, - wage + wage, + workExperience: workList }).then(res => { this.isShowButton = false; this.getResume() @@ -421,6 +556,121 @@ } + \ No newline at end of file diff --git a/pages/projectInfo/projectInfo.vue b/pages/projectInfo/projectInfo.vue index b97765e..d7064f1 100644 --- a/pages/projectInfo/projectInfo.vue +++ b/pages/projectInfo/projectInfo.vue @@ -95,10 +95,10 @@ 用工单位地址:{{info.companyAddress || '暂无'}} --> - 工作地址:{{info.cityId || '暂无'}} + 注册地址:{{info.cityId || '暂无'}} - 详细地址:{{info.address || '暂无'}} + 工作地址:{{info.address || '暂无'}} --> - 工作地址:{{info.cityId || '暂无'}} + 注册地址:{{info.cityId || '暂无'}} - 详细地址:{{info.address || '暂无'}} + 工作地址:{{info.address || '暂无'}} @@ -336,10 +336,12 @@ self.longitude = self.info.lon; self.covers[0].latitude = self.info.lat; self.covers[0].longitude = self.info.lon; - self.$refs.uMap.initMap({ - lat: self.info.lat, - lon: self.info.lon, - }) + if (!(self.info.lat && self.info.lat === -1)) { + self.$refs.uMap.initMap({ + lat: self.info.lat, + lon: self.info.lon, + }) + } // this.$refs.cMap.open() self.showDetail = true; if (!this.seeDeatil) { diff --git a/pages/projectInfo/userrecruitWorkInfo.vue b/pages/projectInfo/userrecruitWorkInfo.vue index 95fe5ba..eca2105 100644 --- a/pages/projectInfo/userrecruitWorkInfo.vue +++ b/pages/projectInfo/userrecruitWorkInfo.vue @@ -103,10 +103,10 @@ 座机号:{{info.callNumber}} --> - 工作地址:{{ info.cityId || '暂无'}} + 注册地址:{{ info.cityId || '暂无'}} - 详细地址:{{info.address || '暂无'}} + 工作地址:{{info.address || '暂无'}} --> - 工作地址:{{ info.cityId || '暂无'}} + 注册地址:{{ info.cityId || '暂无'}} - 详细地址:{{info.address || '暂无'}} + 工作地址:{{info.address || '暂无'}} - - - - - - - - - {{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }} - - - - - - {{ companyitem.tradeNames }} - - - {{ item }} - - - - - - - - - - - - - - - - {{ companyitem.jobCompanyName }} - - - - - --km - - - - - - - - - 评价 - - - - - - - - \ No newline at end of file diff --git a/pages/recruit/subPage/index.vue b/pages/recruit/subPage/index.vue index 1a3b2da..2086844 100644 --- a/pages/recruit/subPage/index.vue +++ b/pages/recruit/subPage/index.vue @@ -1,212 +1,243 @@ - - - - - \ No newline at end of file diff --git a/pages/recruit/subPage/task.vue b/pages/recruit/subPage/task.vue index 37c43ba..9b3fbd6 100644 --- a/pages/recruit/subPage/task.vue +++ b/pages/recruit/subPage/task.vue @@ -125,14 +125,17 @@ - - - - {{info.address}} + + + {{info.address || '请选择'}} +