Explorar o código

Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-pc

jianghaili hai 7 meses
pai
achega
910c5f219c

+ 11 - 21
src/components/resume/resume.vue

@@ -10,22 +10,21 @@
 			v-for="(item,index) in rightJobList" :key="index">
 			<div class="content-r-item-name flex align-center">
 				<img style="width: 50px;height: 50px;border-radius: 50%;margin-right: 10px;"
-					:src="item.avatar?item.avatar:'/logo.png'" alt="" srcset="" />
-				{{item.resumesName}} 【{{item.city}}】
+					:src="item.userAvatar ? item.userAvatar :'/logo.png'" alt="" srcset="" />
+				{{ item.userName }} 【{{item.city}}】
 			</div>
 			<div class="content-r-item-money flex align-center">
-				{{item.resumesCompensation}}
 				<div class="content-r-item-money-label">
-					{{item.resumesEducation}}
+					{{ item.userAge }}岁
 				</div>
 				<div class="content-r-item-money-label">
-					{{item.resumesMarriage}}
+					{{ item.resumesWorkExperience || 0 }}年
 				</div>
 				<div class="content-r-item-money-label">
-					{{item.resumesWorkExperience}}
+					{{ item.resumesSex == 1 ? '男' : '女' }}
 				</div>
 				<div class="content-r-item-money-label">
-					{{item.resumesPost}}
+					{{ item.degree }}
 				</div>
 			</div>
 			<div class="content-r-item-line">
@@ -69,13 +68,12 @@
 					page: 1,
 					limit: 5,
 					postType: '', //求职类型
-					resumesPost: '', //岗位名称
-					screen: 2, //1推荐 2最新
+					skillName: '', //岗位名称
+					screen: 1, //1推荐 2最新
 					city: this.city ? this.city : localStorage.getItem('city'), //城市
-					resumesCompensation: '', //薪资范围
-					resumesEducation: '', //学历
-					resumesWorkExperience: '', //经验
-					industryName: '', //行业
+					salaryRange: '', //薪资范围
+					eduRange: '', //学历
+					expRange: '', //经验
 					companyId: localStorage.getItem('companyId'),
 					userId: localStorage.getItem('userId') ? localStorage.getItem('userId') : ''
 				}
@@ -83,14 +81,6 @@
 					this.loading = false
 					if (res.code == 0) {
 						this.pages = res.data.total
-						res.data.records.map(item => {
-							if (item.industryName) {
-								item.industryName = item.industryName.split(',')
-							} else {
-								item.industryName = []
-							}
-
-						})
 						this.rightJobList = res.data.records
 					}
 				})

+ 10 - 3
src/views/home.vue

@@ -38,11 +38,18 @@
 		},
 		mounted() {
 			if (localStorage.getItem('token')) {
-				this.getUserInfo()
+				this.getCompany();
 			}
 
 		},
 		methods: {
+			getCompany(){
+				this.$Request.get("/app/company/selectCompanyByUserId").then(res => {
+					this.$store.commit('SET_COMPANY_ID', res.data.companyId)
+					localStorage.setItem('companyId', res.data.companyId);
+					this.getUserInfo()
+				})
+			},
 			//获取用户信息
 			getUserInfo() {
 				this.$Request.get('/app/user/selectUserById').then(res => {
@@ -54,8 +61,8 @@
 						//设置手机号
 						this.$store.commit('SET_PHONE', res.data.phone)
 						//设置企业id
-						this.$store.commit('SET_COMPANY_ID', res.data.companyId)
-						localStorage.setItem('companyId', res.data.companyId)
+						// this.$store.commit('SET_COMPANY_ID', res.data.companyId)
+						// localStorage.setItem('companyId', res.data.companyId)
 						//设置邀请码
 						this.$store.commit('SET_INVITATION_CODE', res.data.invitationCode)
 						//设置头像

+ 50 - 58
src/views/index/indexCompany.vue

@@ -50,7 +50,7 @@
 			<div class="tabs-box">
 				<div @click="selectTabs(index)" :class="tabsCurr == index?'tabs-box-item-active':''"
 					class="tabs-box-item" v-for="(item,index) in tabs" :key="index">
-					{{item.name}}
+					{{ item.ruleClassifyName }}
 				</div>
 			</div>
 		</div>
@@ -123,33 +123,40 @@
 					v-for="(item,index) in recommendList" :key="index">
 					<div class="list-box-item-title flex align-center justify-between">
 						<div class="list-box-item-title-name">
-							{{item.resumesName}}
+							{{ item.userName }}
+							<!-- <el-divider direction="vertical" />
+							{{ item.onlineStatus == 'ONLINE' ? '在线' : '离线' }} -->
 							<el-divider direction="vertical" />
-							{{item.resumesCompensation}}
+							{{ item.userSex==2?'女':'男'}}
 							<el-divider direction="vertical" />
-							{{item.resumesSex==2?'女':'男'}}
+							{{ item.school }}
 						</div>
 						<div class="list-box-item-title-price">
-							<img :src="item.avatar?item.avatar:'/logo.png'" alt="" />
+							<img :src="item.userAvatar ? item.userAvatar :'/logo.png'" alt="" />
 						</div>
 					</div>
 					<div class="list-box-item-label flex align-center flex-wrap">
 						<div class="list-box-item-label-item">
-							{{item.resumesAge}}岁
+							{{ item.userAge }}岁
 						</div>
 						<div class="list-box-item-label-item">
-							{{item.resumesWorkExperience}}
+							{{ item.resumesWorkExperience || 0 }}
 						</div>
 						<div class="list-box-item-label-item">
-							{{item.school}}
+							{{ item.degree }}
 						</div>
 						<div class="list-box-item-label-item">
-							{{item.resumesEducation}}
+							期望{{ item.minSalary }}-{{ item.maxSalary }}元
 						</div>
 					</div>
+					<div class="list-box-item-label" style="line-height: 40px;font-size: 13px;color: #999999;">
+						{{ item.companyName || '暂无公司'}}&nbsp;&nbsp;
+						{{ item.lastWorkStartTime ? item.lastWorkStartTime.slice(0,10): ''}}--{{item.lastWorkEndTime ?
+						item.lastWorkEndTime.slice(0, 10) : '' }}
+					</div>
 					<div class="list-box-item-info flex align-center justify-between">
 						<div class="list-box-item-info-name">
-							期望岗位:{{item.resumesPost}}
+							期望岗位:{{ item.expectedPosition }}
 						</div>
 						<!-- <div class="list-box-item-info-price">
 							{{item.company.companyPeople}}
@@ -182,33 +189,40 @@
 					v-for="(item,index) in recommendLists" :key="index">
 					<div class="list-box-item-title flex align-center justify-between">
 						<div class="list-box-item-title-name">
-							{{item.resumesName}}
+							{{ item.userName }}
+							<!-- <el-divider direction="vertical" />
+							{{ item.onlineStatus == 'ONLINE' ? '在线' : '离线' }} -->
 							<el-divider direction="vertical" />
-							{{item.resumesCompensation}}
+							{{ item.userSex == 2 ? '女' : '男' }}
 							<el-divider direction="vertical" />
-							{{item.resumesSex==2?'女':'男'}}
+							{{ item.school }}
 						</div>
 						<div class="list-box-item-title-price">
-							<img :src="item.avatar?item.avatar:'/logo.png'" alt="" />
+							<img :src="item.userAvatar ? item.userAvatar : '/logo.png'" alt="" />
 						</div>
 					</div>
 					<div class="list-box-item-label flex align-center flex-wrap">
 						<div class="list-box-item-label-item">
-							{{item.resumesAge}}岁
+							{{ item.userAge }}岁
 						</div>
 						<div class="list-box-item-label-item">
-							{{item.resumesWorkExperience}}
+							{{ item.resumesWorkExperience || 0 }}
 						</div>
 						<div class="list-box-item-label-item">
-							{{item.school}}
+							{{ item.degree }}
 						</div>
 						<div class="list-box-item-label-item">
-							{{item.resumesEducation}}
+							期望{{ item.minSalary }}-{{ item.maxSalary }}元
 						</div>
 					</div>
+					<div class="list-box-item-label" style="line-height: 40px;font-size: 13px;color: #999999;">
+						{{ item.companyName || '暂无公司' }}&nbsp;&nbsp;
+						{{ item.lastWorkStartTime ? item.lastWorkStartTime.slice(0, 10) : '' }}--{{ item.lastWorkEndTime ?
+							item.lastWorkEndTime.slice(0, 10) : '' }}
+					</div>
 					<div class="list-box-item-info flex align-center justify-between">
 						<div class="list-box-item-info-name">
-							期望岗位:{{item.resumesPost}}
+							期望岗位:{{ item.expectedPosition }}
 						</div>
 						<!-- <div class="list-box-item-info-price">
 							{{item.company.companyPeople}}
@@ -307,10 +321,7 @@
 				isTop: false,
 				searchBg: 'background:#ffffff',
 				tabsCurr: 0,
-				tabs: [{
-					projectName: '',
-					name: '全部',
-				}],
+				tabs: [],
 				bannerType: [], //岗位分类
 				recommendList: [], //推荐岗位
 				recommendLists: [], //最新岗位
@@ -328,19 +339,11 @@
 				search: '', //城市搜索关键字
 				cityGroupList: [], //按字母分组的城市列表
 				rmCity: [], //热门城市列表
-			}
-		},
-		computed: {
-			avatar() {
-				return this.$store.state.avatar;
-			},
-			companyId() {
-				return this.$store.state.companyId ? this.$store.state.companyId : localStorage.getItem('companyId');
+				companyId:''//企业id
 			}
 		},
 		mounted() {
-
-
+			this.companyId = this.$store.state.companyId ? this.$store.state.companyId : localStorage.getItem('companyId');
 			let inviterCode = this.$route.query.inviterCode
 			if (inviterCode) {
 				localStorage.setItem('inviterCode', inviterCode)
@@ -417,13 +420,13 @@
 						page: 1,
 						limit: 9,
 						postType: '', //工作性质
-						resumesPost: this.tabs[this.tabsCurr].projectName, //岗位名称
+						expectedPosition: this.tabs[this.tabsCurr].ruleClassifyName, //岗位名称
 						screen: 1, //1推荐 2最新
 						city: this.city == '全国' ? '' : this.city, //城市
-						resumesCompensation: '', //薪资范围
-						resumesEducation: '', //学历
-						resumesWorkExperience: '', //经验
-						industryName: '', //行业
+						salaryRange: '', //薪资范围
+						eduRange: '', //学历
+						expRange: '', //经验
+						// industryName: '', //行业
 						lng: this.longitude,
 						lat: this.latitude,
 						companyId: this.companyId
@@ -434,13 +437,12 @@
 						page: 1,
 						limit: 9,
 						postType: '', //工作性质
-						resumesPost: this.tabs[this.tabsCurr].projectName, //岗位名称
+						expectedPosition: this.tabs[this.tabsCurr].ruleClassifyName, //岗位名称
 						screen: 2, //1推荐 2最新
 						city: this.city == '全国' ? '' : this.city, //城市
-						resumesCompensation: '', //薪资范围
-						resumesEducation: '', //学历
-						resumesWorkExperience: '', //经验
-						industryName: '', //行业
+						salaryRange: '', //薪资范围
+						eduRange: '', //学历
+						expRange: '', //经验
 						lng: this.longitude,
 						lat: this.latitude,
 						companyId: this.companyId
@@ -475,21 +477,9 @@
 					params: data
 				}).then(res => {
 					if (res.code == 0) {
-						let arr = [{
-							projectName: '',
-							name: '全部',
-						}]
-						res.data.map(item => {
-							let obj = {
-								projectName: item,
-								name: item,
-							}
-							arr.push(obj)
-						})
-						this.tabs = arr
+						this.tabs = res.data;
 						//定位
 						this.getLocation();
-						console.log(arr, 'ccccc')
 					}
 				})
 			},
@@ -606,7 +596,8 @@
 					this.$router.push({
 						name: 'resumeInfo',
 						query: {
-							resumesId: item.resumesId
+							resumesId: item.resumesId,
+							postPushId: this.tabs[this.tabsCurr].postPushId
 						}
 					})
 				} else {
@@ -631,7 +622,8 @@
 			 * 切换类型
 			 */
 			selectTabs(index) {
-				this.tabsCurr = index
+				this.tabsCurr = index;
+				console.log(this.tabsCurr)
 				//重新获取岗位
 				this.getRecommendJob(1)
 				this.getRecommendJob(2)

+ 3 - 20
src/views/resume/resumeInfo.vue

@@ -10,7 +10,7 @@
 						{{info.resumesName}}
 						<!-- <span>{{info.salaryRange}}</span> -->
 					</div>
-					<div class="postInfo-box-top-r flex align-center">
+					<!-- <div class="postInfo-box-top-r flex align-center">
 						<div @click.stop="getShare()" class="postInfo-box-top-r-qr flex align-center">
 							<img src="/images/postimg/share.png" alt="" />
 							分享简历
@@ -31,7 +31,7 @@
 							<img src="/images/postimg/jubao.png" alt="" />
 							举报
 						</div>
-					</div>
+					</div> -->
 				</div>
 				<div class="postInfo-box-status flex align-center">
 					<img src="/images/postimg/time.png" alt="" />
@@ -241,6 +241,7 @@
 		mounted() {
 			this.screenHeight = window.innerHeight
 			this.resumesId = this.$route.query.resumesId
+			this.postPushId = this.$route.query.postPushId || ''
 			let inviterCode = this.$route.query.inviterCode
 			if (inviterCode) {
 				localStorage.setItem('inviterCode', inviterCode)
@@ -683,7 +684,6 @@
 							resumesEducation: this.info.resumesEducation
 						}]
 						this.info.schoolList = arr
-						this.getJobList(this.info.resumesPost)
 					} else {
 						ElMessage({
 							type: 'info',
@@ -699,23 +699,6 @@
 
 				})
 			},
-			//使用岗位名称查询出企业正在招聘的该岗位拿到对应的岗位id
-			getJobList(ruleClassifyName) {
-				let data = {
-					status: 2,
-					page: 1,
-					limit: 1,
-					ruleClassifyName: ruleClassifyName,
-					companyId: localStorage.getItem('companyId')
-				}
-				this.$Request.get('/app/postPush/getPostPushList', {
-					params: data
-				}).then(res => {
-					if (res.code == 0) {
-						this.postPushId = res.data.records[0].postPushId
-					}
-				})
-			},
 		}
 	}
 </script>

+ 31 - 142
src/views/search/searchCom.vue

@@ -83,67 +83,27 @@
 												</el-icon>
 											</div>
 										</template>
-										<!-- 行业选择 -->
-										<div class="hangye" v-if="index==0">
-											<div v-if="itemList.length>0" class="hangye-item flex justify-between"
-												v-for="(item,index) in itemList" :key="index">
-												<div class="hangye-l">
-													{{item.industryName}}
-												</div>
-												<div class="hangye-r flex flex-wrap">
-													<div @click="selectHy(ite.industryName)"
-														:style="isSelectHy(ite.industryName)?'color:#00DD9A':''"
-														class="hangye-r-item" v-for="(ite,ind) in item.childrenList">
-														{{ite.industryName}}
-													</div>
-												</div>
-											</div>
-											<el-empty v-else description="暂无数据" />
-										</div>
-										<div class="zhiwei" v-if="index == 1">
-											<div v-if="jobList.length>0" class="zhiwei-item flex justify-between"
-												v-for="(item,index) in jobList" :key="index">
-												<div class="zhiwei-item-l">
-													{{item.ruleClassifyName}}
-												</div>
-												<div class="zhiwei-item-r">
-													<div class="zhiwei-item-r-i flex flex-wrap"
-														v-for="(ite,ind) in item.childrens" :key="ind">
-														<div class="zhiwei-item-r-txt">
-															{{ite.title}}
-														</div>
-														<div :style="keyWord==it.ruleClassifyName?'color:#00DD9A':''"
-															class="zhiwei-item-r-i-i"
-															@click="selectCondition(it.ruleClassifyName,1)"
-															v-for="(it,ins) in ite.childrens" :key="ins">
-															{{it.ruleClassifyName}}
-														</div>
-													</div>
-												</div>
-											</div>
-											<el-empty v-else description="暂无数据" />
-										</div>
 										<!-- 工作经验 -->
-										<div class="jobType" v-if="index==2">
+										<div class="jobType" v-if="index==0">
 											<div class="jobType-item" :style="experience==item.value?'color:#00DD9A':''"
-												@click="selectCondition(item.value,2)" v-for="(item,index) in jyList"
+												@click="selectCondition(item.value,0)" v-for="(item,index) in jyList"
 												:key="index">
 												{{item.value}}
 											</div>
 										</div>
 										<!-- 薪资 -->
-										<div class="jobType" v-if="index==3">
+										<div class="jobType" v-if="index==1">
 											<div class="jobType-item"
 												:style="salaryRange==item.value?'color:#00DD9A':''"
-												@click="selectCondition(item.value,3)" v-for="(item,index) in moneyList"
+												@click="selectCondition(item.value,1)" v-for="(item,index) in moneyList"
 												:key="index">
 												{{item.value}}
 											</div>
 										</div>
 										<!-- 学历 -->
-										<div class="jobType" v-if="index==4">
+										<div class="jobType" v-if="index==2">
 											<div class="jobType-item" :style="education==item.value?'color:#00DD9A':''"
-												@click="selectCondition(item.value,4)"
+												@click="selectCondition(item.value,2)"
 												v-for="(item,index) in schoolList" :key="index">
 												{{item.value}}
 											</div>
@@ -170,36 +130,33 @@
 						<div class="content-l-item-l">
 							<div class="content-l-item-title flex align-center">
 								<img style="width: 50px;height: 50px;border-radius: 50%;margin-right: 10px;"
-									:src="item.userAvatar?item.userAvatar:'/logo.png'" alt="" />
-								{{item.userName}}
+									:src="item.userAvatar ? item.userAvatar :'/logo.png'" alt="" />
+								{{ item.userName }}
 								<span>
 									【{{item.city}}】
 								</span>
 							</div>
 							<div class="content-l-item-info flex align-center flex-wrap">
-								<div class="content-l-item-infomoney">
-									{{item.resumesCompensation}}
-								</div>
 								<div class="content-l-item-infolabel">
-									{{item.resumesWorkExperience}}
+									{{ item.userAge }}岁
 								</div>
 								<div class="content-l-item-infolabel">
-									{{item.resumesSex==1?'男':'女'}}
+									{{ item.resumesWorkExperience || 0 }}年
 								</div>
 								<div class="content-l-item-infolabel">
-									{{item.resumesAge}}岁
+									{{item.resumesSex==1?'男':'女'}}
 								</div>
 								<div class="content-l-item-infolabel">
-									{{item.resumesMarriage}}
+									{{ item.degree }}
 								</div>
 								<div class="content-l-item-infolabel">
-									{{item.resumesPost}}
+									{{ item.minSalary }} -{{ item.maxSalary }}
 								</div>
 
 							</div>
 							<div class="content-l-item-btn flex align-center">
-								<div class="content-l-item-btn-item" v-for="(ite,ind) in item.industryName">
-									{{ite}}<el-divider v-if="ind+1<item.industryName.length" direction="vertical" />
+								<div class="content-l-item-btn-item">
+									求职期望:{{ item.expectedPosition }}
 								</div>
 							</div>
 						</div>
@@ -208,24 +165,21 @@
 								<!-- <img :src="item.company.companyLogo" alt="" /> -->
 								<div class="content-l-item-r-title-r">
 									<div class="content-l-item-r-title-r-t">
-										{{item.school}}
+										{{ item.companyName }}
 									</div>
 									<div style="margin-top: 20px;" class="content-l-item-r-title-r-b flex align-center">
 										<div class="content-l-item-r-title-r-b-i">
-											{{item.resumesEducation}}
-										</div>
-										<div class="content-l-item-r-title-r-b-i">
-											{{item.major}}
+											{{ item.lastWorkPosition }}
 										</div>
 									</div>
 								</div>
 							</div>
 							<div class="content-l-item-r-bom flex align-center">
-								<el-icon size="13" style="margin-right: 10px;">
+								<!-- <el-icon size="13" style="margin-right: 10px;">
 									<MapLocation />
-								</el-icon>
+								</el-icon> -->
 								<div class="content-l-item-r-bomtxt">
-									毕业时间:{{item.graduationTime}}
+									个人优势:{{ item.adv }}
 								</div>
 							</div>
 						</div>
@@ -334,16 +288,7 @@
 				keyWord: '', //搜索内容
 				cityList: [], //城市列表
 				cityIndex: 0,
-				searchCondizione: [{
-						name: '公司行业',
-						num: 0,
-						isUp: false
-					},
-					{
-						name: '职位类型',
-						num: 0,
-						isUp: false
-					},
+				searchCondizione: [
 					{
 						name: '工作经验',
 						num: 0,
@@ -360,9 +305,6 @@
 						isUp: false
 					}
 				], //筛选条件
-				itemList: [], //行业数据
-				jobList: [], //岗位列表
-				jobTypeList: [], //工作性质
 				moneyList: [], //薪资列表
 				jyList: [], //工作经验
 				schoolList: [], //学历列表
@@ -411,12 +353,6 @@
 			this.getAppDown()
 			//获取城市列表
 			this.getList()
-			//获取行业列表
-			this.getIndustryList()
-			//获取岗位列表
-			this.getJobList()
-			//工作性质
-			this.getPostType()
 			//薪资
 			this.getMoneyList()
 			//工作经验
@@ -465,21 +401,17 @@
 			//选择筛选条件
 			selectCondition(ite, type) {
 				switch (type) {
-					case 1: //职位
-						this.keyWord = ite
-						this.searchCondizione[1].name = ite
-						break;
-					case 2: //工作经验
+					case 0: //工作经验
 						this.experience = ite
-						this.searchCondizione[2].name = ite
+						this.searchCondizione[0].name = ite
 						break;
-					case 3: //薪资
+					case 1: //薪资
 						this.salaryRange = ite
-						this.searchCondizione[3].name = ite
+						this.searchCondizione[1].name = ite
 						break;
-					case 4: //选择学历
+					case 2: //选择学历
 						this.education = ite
-						this.searchCondizione[4].name = ite
+						this.searchCondizione[2].name = ite
 						break;
 					default:
 						break;
@@ -727,24 +659,20 @@
 			 * 获取岗位列表
 			 */
 			getUserList() {
-				// debugger;
 				this.loading = true
 				let data = {
 					page: this.page,
 					limit: this.limit,
-					resumesPost: this.keyWord, //岗位名称
+					skillName: this.keyWord, //岗位名称
 					screen: 2, //1推荐 2最新
-					// resumesIntention: this.city, //城市
 					city: this.city, //城市
-					resumesCompensation: this.salaryRange, //薪资范围
-					resumesEducation: this.education, //学历
-					resumesWorkExperience: this.experience, //经验
-					industryName: this.industry.join(','), //行业
+					salaryRange: this.salaryRange, //薪资范围
+					eduRange: this.education, //学历
+					expRange: this.experience, //经验
 					companyId: localStorage.getItem('companyId'),
 					userId: localStorage.getItem('userId') ? localStorage.getItem('userId') : ''
 				}
 				this.$Request.post('/app/resumes/selectResumesList', data,{type: 'json'}).then(res => {
-					console.log(res)
 					this.loading = false
 					if (res.code == 0) {
 						this.pages = res.data.total
@@ -821,45 +749,6 @@
 					}
 				})
 			},
-			/**
-			 * 工作性质
-			 */
-			getPostType() {
-				let data = {
-					type: '工作性质'
-				}
-				this.$Request.get('/app/dict/list', {
-					params: data
-				}).then(res => {
-					if (res.code == 0) {
-						this.jobTypeList = res.data
-					}
-				})
-			},
-			/**
-			 * 获取岗位列表
-			 */
-			getJobList() {
-				this.$Request.get('/app/rule/getClassifyList').then(res => {
-					if (res.code == 0) {
-						if (res.data) {
-							this.jobList = res.data
-							// this.rightList = this.list[this.current].childrens
-						}
-
-					}
-				})
-			},
-			/**
-			 * 获取行业数据
-			 */
-			getIndustryList() {
-				this.$Request.get('/app/industry/getIndustryList').then(res => {
-					if (res.code == 0) {
-						this.itemList = res.data
-					}
-				})
-			},
 			getLocation() {
 				let data = {
 					key: 'ZBABZ-ZWECU-UQTVV-4LYDR-COK3F-5SF75', //申请的密钥