hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-21 16:56:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '20251117-new-employee' of http://10.251.129.121/boeu/learning-system-portal into master-20251210

Browse Source
This commit is contained in:
joshen
2025-12-17 21:41:35 +08:00
parent c661849140 1d5b43b0f0
commit a9245b461e
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/PortalHeader.vue
View File

@@ -426,11 +426,21 @@ export default {
};
window.open(obj[val]);
},
handleCommand(val) {
async handleCommand(val) {
if (val === "four") {
window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130");
// this.$emit('showClass',true)
} else {
if (val === "five") {
// 从后端获取用户信息和报名状态
const res = await getWelcomeData();
if (res.status === 200 && res.data) {
if (res.data?.approvalResults && res.data?.approvalResults != 1) {
this.$router.push("/new-employee/study");
return;
}
}
}
let urlPre = window.location.protocol + "//" + window.location.host;
// process.env.VUE_APP_BOE_WEB_URL
let obj = {

21
src/layout/components/TopNav/Index.vue
View File

@@ -422,19 +422,20 @@ export default {
// four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
// five: process.env.VUE_APP_BOE_WEB_URL+'/boe/new-employee/index.html'
// };
if (val === "five") {
// 从后端获取用户信息和报名状态
const res = await getWelcomeData();
if (res.status === 200 && res.data) {
if (res.data?.approvalResults && res.data?.approvalResults != 1) {
this.$router.push("/new-employee/study");
return;
}
}
}
if (val === "for") {
this.uClassShow = true;
} else {
if (val === "five") {
// 从后端获取用户信息和报名状态
const res = await getWelcomeData();
if (res.status === 200 && res.data) {
if (res.data?.approvalResults && res.data?.approvalResults != 1) {
this.$router.push("/new-employee/study");
return;
}
}
}
let urlPre = window.location.protocol + "//" + window.location.host;
// process.env.VUE_APP_BOE_WEB_URL
let obj = {

6
src/views/new-employee/StudyPage.vue
View File

@@ -128,7 +128,7 @@
>转正攻略</el-button
>
</div>
<div>
<div v-if="bpmApprovalRequired">
<div v-if="approvalResults == 2">
<el-alert type="warning" center show-icon :closable="false">
<template slot="title">
@@ -160,7 +160,7 @@
</el-alert>
</div>
</div>
<div style="text-align: center">
<div style="text-align: center" v-if="bpmApprovalRequired">
<el-button type="text" @click="chartVisible = true"
>转正流程示意图 ></el-button
>
@@ -293,6 +293,7 @@ export default {
4: "审核失败",
},
approvalResults: 1,
bpmApprovalRequired: 1,
};
},
computed: {
@@ -413,6 +414,7 @@ export default {
this.guideDialogVisible = this.$route.query?.fromWelcome == 1;
// 1报名失败、2审核中、3审核通过、4审核失败
this.approvalResults = res.data.approvalResults;
this.bpmApprovalRequired = res.data.bpmApprovalRequired;
await this.initIds();
if (!this.projectId || !this.studentId) {
this.$message.warning("未获得项目或学员信息，列表可能无法加载");