main
lijingyu007 11 months ago
parent 1228d13ed7
commit 1297ef8748
  1. 4
      .env.development
  2. 5
      .env.production
  3. 54
      src/page/homepage/personability/abilityApply.vue
  4. 47
      src/page/homepage/personability/abilityMoreDetail.vue
  5. 13
      src/page/homepage/personability/abilityUserDetail.vue
  6. 14
      src/page/homepage/traininstitute/train.vue

@ -5,12 +5,12 @@ ENV = 'development'
VUE_APP_BASE_API = '/prod-api' 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://192.168.0.129:9999'
# VUE_APP_BASE_TARGET = 'http://172.16.36.180: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://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 VUE_CLI_BABEL_TRANSPILE_MODULES = true

@ -8,5 +8,6 @@ VUE_APP_BASE_API = '/prod-api'
# VUE_APP_BASE_TARGET = 'https://www.keyitest.cn/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 = 'https://www.keyitest.cn/test-api'
VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999'
# VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999'

@ -85,7 +85,7 @@
</template> </template>
</el-step> </el-step>
</el-steps> </el-steps>
<div class="stepBoxBtn"> <div class="stepBoxBtn" v-if="!userForm.status">
<div class="backBtn" @click="back">上一步</div> <div class="backBtn" @click="back">上一步</div>
<div class="nextBtn" v-if="active == 6" @click="saveInfo">提交审核</div> <div class="nextBtn" v-if="active == 6" @click="saveInfo">提交审核</div>
<div class="nextBtn" v-else @click="next">下一步</div> <div class="nextBtn" v-else @click="next">下一步</div>
@ -116,11 +116,25 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div v-if="active == 0 && !certifform.applyId" class="addWork" @click="applyBegin">开始验证</div> <div
v-if="active == 0 && (!certifform.applyId || certifform.status != 1)"
class="addWork"
@click="applyBegin"
>
开始验证
</div>
<div class="applySuccess" v-if="certifform.applyId && certifform.status == 1"> <div class="applySuccess" v-if="certifform.applyId && certifform.status == 1">
<img src="/assets/ability/applysuccess.png" alt="" /> <img src="/assets/ability/applysuccess.png" alt="" />
验证通过 验证通过
</div> </div>
<div
class="applySuccess"
v-if="certifform.applyId && certifform.status != 1"
style="color: #fc4444"
>
<img src="/assets/ability/applyfail.png" alt="" />
验证不通过
</div>
</div> </div>
<div class="active2" v-show="active == 1 || active == 6"> <div class="active2" v-show="active == 1 || active == 6">
<!-- 工作经历 --> <!-- 工作经历 -->
@ -465,9 +479,7 @@ export default {
return { return {
active: 0, active: 0,
// //
certifform: { certifform: {},
},
certifRules: { certifRules: {
name: [ name: [
{ required: true, message: '真实姓名不能为空', trigger: 'blur' }, { required: true, message: '真实姓名不能为空', trigger: 'blur' },
@ -552,7 +564,7 @@ export default {
}, },
}, },
computed: { computed: {
...mapGetters(['userinform','userId', 'token']), ...mapGetters(['userinform', 'userId', 'token']),
}, },
created() { created() {
this.getCloudAllList() this.getCloudAllList()
@ -586,6 +598,11 @@ export default {
// //
if (res.personalInfo) { if (res.personalInfo) {
this.userForm = 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.province = this.userForm.city.split('-')[0]
this.city = this.userForm.city.split('-')[1] this.city = this.userForm.city.split('-')[1]
@ -637,6 +654,8 @@ export default {
this.$message.success('实名认证成功') this.$message.success('实名认证成功')
this.searchApply() this.searchApply()
} else { } else {
this.$message.error('实名认证失败')
this.searchApply()
} }
}) })
.catch((error) => {}) .catch((error) => {})
@ -647,6 +666,8 @@ export default {
this.$message.success('实名认证成功') this.$message.success('实名认证成功')
this.searchApply() this.searchApply()
} else { } else {
this.$message.error('实名认证失败')
this.searchApply()
} }
}) })
.catch((error) => {}) .catch((error) => {})
@ -667,6 +688,26 @@ export default {
return this.$message.warning('请先通过实名认证') 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++ this.active++
}, },
// //
@ -787,6 +828,7 @@ export default {
} }
couldUserInfoAdd(this.userForm).then((res) => { couldUserInfoAdd(this.userForm).then((res) => {
this.$message.success('保存个人简介成功') this.$message.success('保存个人简介成功')
this.userForm.flag = true
}) })
} }
}) })

@ -4,7 +4,7 @@
<div class="topNA"> <div class="topNA">
<div class="topNAT"> <div class="topNAT">
<span class="topNAT1">{{ userInfo.name }}</span> <span class="topNAT1">{{ userInfo.name }}</span>
<span class="topNAT2">{{ userInfo.testSkills }}</span> <span class="topNAT2">{{ userInfo.testSkills || '未填写' }}</span>
</div> </div>
<div class="topNAB"> <div class="topNAB">
<div class="topNABit"> <div class="topNABit">
@ -34,7 +34,7 @@
个人优势 个人优势
</div> </div>
<div class="contentitemB"> <div class="contentitemB">
{{ userInfo.personalAdvantage }} {{ userInfo.personalAdvantage || '未填写' }}
</div> </div>
</div> </div>
<div class="contentitem"> <div class="contentitem">
@ -42,43 +42,50 @@
<div class="contentTline"></div> <div class="contentTline"></div>
工作经历 工作经历
</div> </div>
<div v-for="it in workList" :key="it.caseId"> <template v-if="workList.length">
<div class="contentitemM"> <div v-for="it in workList" :key="it.caseId">
<div class="contentitemML">公司名称{{ it.name }}</div> <div class="contentitemM">
<div class="contentitemML">职位{{ it.title }}</div> <div class="contentitemML">公司名称{{ it.name }}</div>
<div class="contentitemMR">{{ it.startTime }}-{{ it.endTime }}</div> <div class="contentitemML">职位{{ it.title }}</div>
<div class="contentitemMR">{{ it.startTime }}-{{ it.endTime }}</div>
</div>
<div class="contentitemB"><span class="contentitemBF">工作内容</span>{{ it.intro }}</div>
</div> </div>
<div class="contentitemB"><span class="contentitemBF">工作内容</span>{{ it.intro }}</div> </template>
</div> <div class="contentitemTBook" v-else>未填写</div>
</div> </div>
<div class="contentitem"> <div class="contentitem">
<div class="contentitemT"> <div class="contentitemT">
<div class="contentTline"></div> <div class="contentTline"></div>
项目经历 项目经历
</div> </div>
<div v-for="it in projectList" :key="it.caseId"> <template v-if="projectList.length">
<div class="contentitemM"> <div v-for="it in projectList" :key="it.caseId">
<div class="contentitemML">公司名称{{ it.name }}</div> <div class="contentitemM">
<div class="contentitemML">担任角色{{ it.title }}</div> <div class="contentitemML">公司名称{{ it.name }}</div>
<div class="contentitemMR">{{ it.startTime }}-{{ it.endTime }}</div> <div class="contentitemML">担任角色{{ it.title }}</div>
</div> <div class="contentitemMR">{{ it.startTime }}-{{ it.endTime }}</div>
<div class="contentitemB" style="margin-bottom: 20px"> </div>
<span class="contentitemBF">应用技术</span>{{ it.applyTech }} <div class="contentitemB" style="margin-bottom: 20px">
<span class="contentitemBF">应用技术</span>{{ it.applyTech }}
</div>
<div class="contentitemB"><span class="contentitemBF">工作内容</span>{{ it.intro }}</div>
</div> </div>
<div class="contentitemB"><span class="contentitemBF">工作内容</span>{{ it.intro }}</div> </template>
</div> <div class="contentitemTBook" v-else>未填写</div>
</div> </div>
<div class="contentitem"> <div class="contentitem">
<div class="contentitemT"> <div class="contentitemT">
<div class="contentTline"></div> <div class="contentTline"></div>
资格证书 资格证书
</div> </div>
<div class="contentitemTBook"> <div class="contentitemTBook" v-if="certificateList.length">
<div class="contentitemTBookit" v-for="it in certificateList" :key="it.fileId"> <div class="contentitemTBookit" v-for="it in certificateList" :key="it.fileId">
<div class="contentitemTBookitT">{{ it.fileName }}</div> <div class="contentitemTBookitT">{{ it.fileName }}</div>
<img class="contentitemTBookitTimg" :src="it.fileUrl" alt="" /> <img class="contentitemTBookitTimg" :src="it.fileUrl" alt="" />
</div> </div>
</div> </div>
<div class="contentitemTBook" v-else>未填写</div>
</div> </div>
</div> </div>
</div> </div>

@ -89,7 +89,7 @@ export default {
mounted() {}, mounted() {},
beforeDestroy() {}, beforeDestroy() {},
computed: { computed: {
...mapGetters(['userId', 'token']), ...mapGetters(['userId', 'userinform', 'token']),
}, },
created() { created() {
this.getDetail() this.getDetail()
@ -110,9 +110,14 @@ export default {
this.$router.push('/login?type=log') this.$router.push('/login?type=log')
}) })
} else { } else {
shenqingJob(this.jonInfo.jobId, {userId: this.userId}).then(res => { if (this.userinform.testerStatus == 2) {
this.$message.success('职位申请成功') shenqingJob(this.jonInfo.jobId, { userId: this.userId }).then((res) => {
}) this.$message.success('职位申请成功')
})
} else {
this.$message.warning('请先入驻成为云员工')
// this.$router.push('/ability/apply')
}
} }
}, },
}, },

@ -212,7 +212,7 @@
> >
<div <div
class="zhuanjiaboxitem zhuanjiaboxitem1" class="zhuanjiaboxitem zhuanjiaboxitem1"
v-for="(it,index) in teacherList" v-for="(it, index) in teacherList"
:key="index" :key="index"
@click="zhuanjiclickfn(it)" @click="zhuanjiclickfn(it)"
> >
@ -918,9 +918,8 @@ export default {
'1.安全测试基本理论、安全测试方法、安全测试工具使用介绍。&2.GJB9433-2018标准下可编程逻辑器件软件测试级别、测试过程、测试类型、测试方法讲解,以及在工程项目中的应用。', '1.安全测试基本理论、安全测试方法、安全测试工具使用介绍。&2.GJB9433-2018标准下可编程逻辑器件软件测试级别、测试过程、测试类型、测试方法讲解,以及在工程项目中的应用。',
}, },
], ],
activeZj: { }, activeZj: {},
baseu: process.env.VUE_APP_BASE_API baseu: process.env.VUE_APP_BASE_API,
} }
}, },
computed: { computed: {
@ -948,7 +947,7 @@ export default {
this.teacherList = res.concat(res.slice(0, 3)) this.teacherList = res.concat(res.slice(0, 3))
this.activeZj = this.teacherList[0] this.activeZj = this.teacherList[0]
this.$refs.zhuanjiaRboxCon.style.width = 230 * this.teacherList.length + 'px' 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-weight: 500;
font-size: 15px; font-size: 15px;
color: #666666; color: #666666;
-webkit-line-clamp: 8;
display: -webkit-box;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
} }
.unlineCon1 { .unlineCon1 {

Loading…
Cancel
Save