From 1297ef87483c43310053df124563761b9ba00c14 Mon Sep 17 00:00:00 2001 From: lijingyu007 <904564792@qq.com> Date: Fri, 31 May 2024 15:55:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .env.production | 5 +- .../homepage/personability/abilityApply.vue | 54 ++++++++++++++++--- .../personability/abilityMoreDetail.vue | 47 +++++++++------- .../personability/abilityUserDetail.vue | 13 +++-- src/page/homepage/traininstitute/train.vue | 14 +++-- 6 files changed, 98 insertions(+), 39 deletions(-) diff --git a/.env.development b/.env.development index 0c46376..51ba03e 100644 --- a/.env.development +++ b/.env.development @@ -5,12 +5,12 @@ ENV = 'development' VUE_APP_BASE_API = '/prod-api' -VUE_APP_BASE_TARGET = 'http://192.168.0.129:9999' +# VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999' # VUE_APP_BASE_TARGET = 'http://192.168.0.129:9999' # VUE_APP_BASE_TARGET = 'http://172.16.36.180:9999' # VUE_APP_BASE_TARGET = 'http://172.16.36.176:9998' -# VUE_APP_BASE_TARGET = 'http://www.keyitest.cn/test-api' +VUE_APP_BASE_TARGET = 'https://www.keyitest.cn/test-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true \ No newline at end of file diff --git a/.env.production b/.env.production index bf90341..4f9988a 100644 --- a/.env.production +++ b/.env.production @@ -8,5 +8,6 @@ VUE_APP_BASE_API = '/prod-api' # VUE_APP_BASE_TARGET = 'https://www.keyitest.cn/prod-api' -# VUE_APP_BASE_TARGET = 'http://www.keyitest.cn/test-api' -VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999' \ No newline at end of file +VUE_APP_BASE_TARGET = 'https://www.keyitest.cn/test-api' + +# VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999' \ No newline at end of file diff --git a/src/page/homepage/personability/abilityApply.vue b/src/page/homepage/personability/abilityApply.vue index ddb0b20..2ee188e 100644 --- a/src/page/homepage/personability/abilityApply.vue +++ b/src/page/homepage/personability/abilityApply.vue @@ -85,7 +85,7 @@ -
+
上一步
提交审核
下一步
@@ -116,11 +116,25 @@
-
开始验证
+
+ 开始验证 +
验证通过
+
+ + 验证不通过 +
@@ -465,9 +479,7 @@ export default { return { active: 0, // 实名认证 - certifform: { - - }, + certifform: {}, certifRules: { name: [ { required: true, message: '真实姓名不能为空', trigger: 'blur' }, @@ -552,7 +564,7 @@ export default { }, }, computed: { - ...mapGetters(['userinform','userId', 'token']), + ...mapGetters(['userinform', 'userId', 'token']), }, created() { this.getCloudAllList() @@ -586,6 +598,11 @@ export default { // 个人简介 if (res.personalInfo) { this.userForm = res.personalInfo + if (!this.userForm.city || !this.userForm.testSkills || !this.userForm.personalAdvantage) { + this.userForm.flag = false + } else { + this.userForm.flag = true + } this.province = this.userForm.city.split('-')[0] this.city = this.userForm.city.split('-')[1] @@ -637,6 +654,8 @@ export default { this.$message.success('实名认证成功') this.searchApply() } else { + this.$message.error('实名认证失败') + this.searchApply() } }) .catch((error) => {}) @@ -647,6 +666,8 @@ export default { this.$message.success('实名认证成功') this.searchApply() } else { + this.$message.error('实名认证失败') + this.searchApply() } }) .catch((error) => {}) @@ -667,6 +688,26 @@ export default { return this.$message.warning('请先通过实名认证') } } + if (this.active == 2) { + // 项目经历 + if (this.projectList.length && this.projectList[0].caseId) { + } else { + return this.$message.warning('至少保存一条项目经历') + } + } + if (this.active == 3) { + // 个人简介 + if (!this.userForm.flag) { + return this.$message.warning('请先保存个人简介') + } + } + if (this.active == 5) { + // 教育经历 + if (this.educationList.length && this.educationList[0].caseId) { + } else { + return this.$message.warning('至少保存一条教育经历') + } + } this.active++ }, // 工作经历添加 @@ -787,6 +828,7 @@ export default { } couldUserInfoAdd(this.userForm).then((res) => { this.$message.success('保存个人简介成功') + this.userForm.flag = true }) } }) diff --git a/src/page/homepage/personability/abilityMoreDetail.vue b/src/page/homepage/personability/abilityMoreDetail.vue index 10cd22e..bf87565 100644 --- a/src/page/homepage/personability/abilityMoreDetail.vue +++ b/src/page/homepage/personability/abilityMoreDetail.vue @@ -4,7 +4,7 @@
{{ userInfo.name }} - {{ userInfo.testSkills }} + {{ userInfo.testSkills || '未填写' }}
@@ -34,7 +34,7 @@ 个人优势
- {{ userInfo.personalAdvantage }} + {{ userInfo.personalAdvantage || '未填写' }}
@@ -42,43 +42,50 @@
工作经历
-
-
-
公司名称:{{ it.name }}
-
职位:{{ it.title }}
-
{{ it.startTime }}-{{ it.endTime }}
+ +
未填写
项目经历
-
-
-
公司名称:{{ it.name }}
-
担任角色:{{ it.title }}
-
{{ it.startTime }}-{{ it.endTime }}
-
-
- 应用技术:{{ it.applyTech }} + +
未填写
资格证书
-
+
{{ it.fileName }}
+
未填写
diff --git a/src/page/homepage/personability/abilityUserDetail.vue b/src/page/homepage/personability/abilityUserDetail.vue index 8b2c7ee..8945d69 100644 --- a/src/page/homepage/personability/abilityUserDetail.vue +++ b/src/page/homepage/personability/abilityUserDetail.vue @@ -89,7 +89,7 @@ export default { mounted() {}, beforeDestroy() {}, computed: { - ...mapGetters(['userId', 'token']), + ...mapGetters(['userId', 'userinform', 'token']), }, created() { this.getDetail() @@ -110,9 +110,14 @@ export default { this.$router.push('/login?type=log') }) } else { - shenqingJob(this.jonInfo.jobId, {userId: this.userId}).then(res => { - this.$message.success('职位申请成功') - }) + if (this.userinform.testerStatus == 2) { + shenqingJob(this.jonInfo.jobId, { userId: this.userId }).then((res) => { + this.$message.success('职位申请成功') + }) + } else { + this.$message.warning('请先入驻成为云员工') + // this.$router.push('/ability/apply') + } } }, }, diff --git a/src/page/homepage/traininstitute/train.vue b/src/page/homepage/traininstitute/train.vue index 0db7367..cc50665 100644 --- a/src/page/homepage/traininstitute/train.vue +++ b/src/page/homepage/traininstitute/train.vue @@ -212,7 +212,7 @@ >
@@ -918,9 +918,8 @@ export default { '1.安全测试基本理论、安全测试方法、安全测试工具使用介绍。&2.GJB9433-2018标准下可编程逻辑器件软件测试级别、测试过程、测试类型、测试方法讲解,以及在工程项目中的应用。', }, ], - activeZj: { }, - baseu: process.env.VUE_APP_BASE_API - + activeZj: {}, + baseu: process.env.VUE_APP_BASE_API, } }, computed: { @@ -948,7 +947,7 @@ export default { this.teacherList = res.concat(res.slice(0, 3)) this.activeZj = this.teacherList[0] this.$refs.zhuanjiaRboxCon.style.width = 230 * this.teacherList.length + 'px' - this.$refs.zhuanjiaRboxCon.style.setProperty('--offset', `-${230 * (this.teacherList.length-3)}px`); + this.$refs.zhuanjiaRboxCon.style.setProperty('--offset', `-${230 * (this.teacherList.length - 3)}px`) }) }, @@ -2417,6 +2416,11 @@ export default { font-weight: 500; font-size: 15px; color: #666666; + -webkit-line-clamp: 8; + display: -webkit-box; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; } .unlineCon1 {