mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-10 11:26:43 +08:00
Compare commits
4 Commits
20260918-s
...
master-072
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f91e2f12dd | ||
|
|
b8858348c0 | ||
|
|
6208caf4ca | ||
|
|
18324458f3 |
@@ -34,48 +34,9 @@ const userRsSginupCourse = function(data){
|
|||||||
return ajax.postJson(baseURL,'/stu/project/stuCancelEnrollment',data);
|
return ajax.postJson(baseURL,'/stu/project/stuCancelEnrollment',data);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取学员指定新员工转正项目的bpm审批状况
|
|
||||||
* {studentId,pid}
|
|
||||||
* add by zhengsongbo on 2025-07-12
|
|
||||||
*/
|
|
||||||
const getStudntProjectInfo = function(pid){
|
|
||||||
return ajax.get(baseURL,`/stu/project/queryStudentInfo?pid=${pid}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* BPM项目:立即报名
|
|
||||||
* pid
|
|
||||||
* add by zhengsongbo on 2025-07-13
|
|
||||||
*/
|
|
||||||
const signUpBpmProjectNow = function(pid){
|
|
||||||
return ajax.get(baseURL,`/stu/project/signUpBpmProjectNow?pid=${pid}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* BPM项目:重新报名
|
|
||||||
* pid
|
|
||||||
* add by zhengsongbo on 2025-07-13
|
|
||||||
*/
|
|
||||||
const signUpBpmProjectAgain = function(pid){
|
|
||||||
return ajax.get(baseURL,`/stu/project/signUpBpmProjectAgain?pid=${pid}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 社招新员工
|
|
||||||
* add by zhengsongbo on 2025-07-14
|
|
||||||
*/
|
|
||||||
const getNewSocialHireProject = function(){
|
|
||||||
return ajax.get(baseURL,'/stu/project/getNewSocialHireProject');
|
|
||||||
}
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
getTaskNum,
|
getTaskNum,
|
||||||
userTaskList,
|
userTaskList,
|
||||||
userDeleteStudy,
|
userDeleteStudy,
|
||||||
userRsSginupCourse,
|
userRsSginupCourse
|
||||||
getStudntProjectInfo,
|
|
||||||
signUpBpmProjectNow,
|
|
||||||
signUpBpmProjectAgain,
|
|
||||||
getNewSocialHireProject
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -170,9 +170,7 @@ const updateContentOrders = function(cid,items) {
|
|||||||
const detail = function(id) {
|
const detail = function(id) {
|
||||||
return ajax.get('/xboe/m/course/manage/detail?id=' + id);
|
return ajax.get('/xboe/m/course/manage/detail?id=' + id);
|
||||||
}
|
}
|
||||||
const getDictIds = function(pid,type) {
|
|
||||||
return ajax.get(`/xboe/m/course/manage/getDictIds?pid=${pid}&type=${type}`);
|
|
||||||
}
|
|
||||||
/**
|
/**
|
||||||
* 更新内容的名称
|
* 更新内容的名称
|
||||||
* @param {Object} data
|
* @param {Object} data
|
||||||
@@ -448,7 +446,6 @@ export default {
|
|||||||
findUpdateLogs,
|
findUpdateLogs,
|
||||||
getUpdateLog,
|
getUpdateLog,
|
||||||
detail,
|
detail,
|
||||||
getDictIds,
|
|
||||||
saveContent,
|
saveContent,
|
||||||
pageList,
|
pageList,
|
||||||
setEnabled,
|
setEnabled,
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 48 KiB |
@@ -565,13 +565,15 @@ export default {
|
|||||||
this.requireSaveCourse = true;
|
this.requireSaveCourse = true;
|
||||||
|
|
||||||
console.log("--- watch比较 = ", oldVal.orgId, newVal.orgId);
|
console.log("--- watch比较 = ", oldVal.orgId, newVal.orgId);
|
||||||
|
if (newVal.orgId !== oldVal.orgId) {
|
||||||
|
console.log("--- watch newVal.orgId = ", newVal.orgId);
|
||||||
this.checkOrgPermission(newVal.orgId);
|
this.checkOrgPermission(newVal.orgId);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
deep: true
|
deep: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.getDictIds();
|
|
||||||
let extendFlag=this.$route.query.f; //是否是管理端过来的
|
let extendFlag=this.$route.query.f; //是否是管理端过来的
|
||||||
this.extendRefId=this.$route.query.refId;
|
this.extendRefId=this.$route.query.refId;
|
||||||
this.extendRefType=this.$route.query.refType;
|
this.extendRefType=this.$route.query.refType;
|
||||||
@@ -602,8 +604,11 @@ export default {
|
|||||||
this.isPermission = false;
|
this.isPermission = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
console.log("--- this.dicts = ",this.dicts)
|
|
||||||
this.isPermission = this.dicts.includes(orgId);
|
this.isPermission = this.dicts.includes(orgId);
|
||||||
|
this.courseInfo.device = 3;
|
||||||
|
if(this.isPermission){
|
||||||
|
this.courseInfo.device = 4;
|
||||||
|
}
|
||||||
console.log("--- 监听结束 this.isPermission = ",this.isPermission)
|
console.log("--- 监听结束 this.isPermission = ",this.isPermission)
|
||||||
},
|
},
|
||||||
// 关键字的更改
|
// 关键字的更改
|
||||||
@@ -910,21 +915,6 @@ export default {
|
|||||||
this.courseCoverurl = '';
|
this.courseCoverurl = '';
|
||||||
this.courseInfo.coverImg = '';
|
this.courseInfo.coverImg = '';
|
||||||
},
|
},
|
||||||
//获取字典信息
|
|
||||||
async getDictIds() {
|
|
||||||
console.log("--- 获取字典信息 1 = ", this.dicts);
|
|
||||||
try {
|
|
||||||
const response = await apiCourse.getDictIds(637, 1); // 确保返回 Promise
|
|
||||||
console.log("--- 获取字典信息 2 result= ", response);
|
|
||||||
|
|
||||||
if (response.status === 200) {
|
|
||||||
this.dicts = response.result.dicts; // 正确提取 dicts
|
|
||||||
console.log("--- 获取字典信息 3 = ", this.dicts);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error("获取字典信息失败:", error);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
//获取课程信息
|
//获取课程信息
|
||||||
async getDetail(id) {
|
async getDetail(id) {
|
||||||
this.curCourseId = id;
|
this.curCourseId = id;
|
||||||
|
|||||||
@@ -137,30 +137,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- "社招新员工转正培训项目简介"弹框 -->
|
|
||||||
<el-dialog width="733px"
|
|
||||||
:visible.sync="projectDialogVisible"
|
|
||||||
:append-to-body="true"
|
|
||||||
>
|
|
||||||
<div class="el-dialog__header">
|
|
||||||
<span style="font-size: 35px; font-weight: bold; color: white; margin: 60px;line-height: 100px;">项目简介</span>
|
|
||||||
</div>
|
|
||||||
<div style="height: 280px;margin: 0px 40px 0px 40px;">
|
|
||||||
<span v-html="studentInfo.introduction"></span>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<span style="font-size: 14px; margin: 40px;" v-if="studentInfo.bpmStatus!=0">审批编号:<span style="font-weight: bold;">{{studentInfo.bpmNumber}}</span></span>
|
|
||||||
<br/>
|
|
||||||
<span style="font-size: 14px; margin: 40px;">审批状态:<span style="font-weight: bold; color: #efbf82">{{studentInfo.bpmStatusName}}</span></span>
|
|
||||||
</div>
|
|
||||||
<template #footer>
|
|
||||||
<span class="dialog-footer">
|
|
||||||
<el-button type="primary" @click="signUpNow" v-if="studentInfo.bpmStatus==0">立即报名</el-button>
|
|
||||||
<el-button v-if="studentInfo.bpmStatus==1" disabled>审批中</el-button>
|
|
||||||
<el-button type="primary" @click="signUpAgain" v-if="studentInfo.bpmStatus==3">重新报名</el-button>
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
</el-dialog>
|
|
||||||
</div>
|
</div>
|
||||||
<popup></popup><yearMedal></yearMedal>
|
<popup></popup><yearMedal></yearMedal>
|
||||||
</div>
|
</div>
|
||||||
@@ -168,7 +144,6 @@
|
|||||||
<script>
|
<script>
|
||||||
import { mapGetters, mapActions } from 'vuex';
|
import { mapGetters, mapActions } from 'vuex';
|
||||||
import apiMessage from '@/api/system/message.js';
|
import apiMessage from '@/api/system/message.js';
|
||||||
import apiManage from '@/api/manage/manage.js';
|
|
||||||
import popup from '@/components/AlertPopup.vue';
|
import popup from '@/components/AlertPopup.vue';
|
||||||
import yearMedal from '@/components/Popup/China2023.vue';
|
import yearMedal from '@/components/Popup/China2023.vue';
|
||||||
import apiBoeCourse from '@/api/boe/course.js';
|
import apiBoeCourse from '@/api/boe/course.js';
|
||||||
@@ -229,8 +204,6 @@ export default {
|
|||||||
keyword: '',
|
keyword: '',
|
||||||
isTiao: false,
|
isTiao: false,
|
||||||
sex:'',
|
sex:'',
|
||||||
projectDialogVisible: false,
|
|
||||||
studentInfo: {},
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
@@ -241,26 +214,7 @@ export default {
|
|||||||
//this.loadPopupConfig();
|
//this.loadPopupConfig();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
//BPM项目:立即报名
|
|
||||||
signUpNow(){
|
|
||||||
const pid = this.studentInfo.projectId;
|
|
||||||
apiManage.signUpBpmProjectNow(pid).then(res=>{
|
|
||||||
if (res.status == 200){
|
|
||||||
this.projectDialogVisible = false;
|
|
||||||
this.$message.success('报名成功')
|
|
||||||
}else {
|
|
||||||
this.projectDialogVisible = false;
|
|
||||||
this.$message.error('报名失败')
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
|
||||||
//BPM项目:重新报名
|
|
||||||
signUpAgain(){
|
|
||||||
const pid = this.studentInfo.projectId;
|
|
||||||
apiManage.signUpBpmProjectAgain(pid).then(res=>{
|
|
||||||
this.projectDialogVisible = false;
|
|
||||||
})
|
|
||||||
},
|
|
||||||
setCurIdentity(iden){
|
setCurIdentity(iden){
|
||||||
this.$store.dispatch('SetCurIdentity',iden);
|
this.$store.dispatch('SetCurIdentity',iden);
|
||||||
},
|
},
|
||||||
@@ -301,28 +255,6 @@ export default {
|
|||||||
if (val === "four") {
|
if (val === "four") {
|
||||||
window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130")
|
window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130")
|
||||||
// this.$emit('showClass',true)
|
// this.$emit('showClass',true)
|
||||||
} else if(val === "five"){//new社招新员工项目(需BPM审批报名--唯一,如果不唯一,取发布时间最新的)
|
|
||||||
let studentPath = process.env.VUE_APP_STUDENT_PATH;
|
|
||||||
apiManage.getNewSocialHireProject().then(res=>{
|
|
||||||
this.studentInfo = res.data;
|
|
||||||
const bpmStatus = this.studentInfo.bpmStatus;
|
|
||||||
if (bpmStatus == 0){//未报名--则弹窗含“立即报名”
|
|
||||||
this.studentInfo.bpmStatusName="未报名";
|
|
||||||
this.projectDialogVisible=true;
|
|
||||||
|
|
||||||
}else if (bpmStatus == 1){//已报名待审核(审批中)--仅弹窗展示
|
|
||||||
this.studentInfo.bpmStatusName="审批中";
|
|
||||||
this.projectDialogVisible=true;
|
|
||||||
|
|
||||||
}else if (bpmStatus == 2){//bpm报名审核通过,则直接进入项目进行学习
|
|
||||||
let params = encodeURIComponent('projectId=' + this.studentInfo.projectId);
|
|
||||||
this.$router.push('/forward?to=' + studentPath + '/projectdetails¶ms=' + params);
|
|
||||||
}else if(bpmStatus == 3){//已拒绝--则弹窗含“重新报名”
|
|
||||||
this.studentInfo.bpmStatusName="已拒绝(含个人撤回)";
|
|
||||||
this.projectDialogVisible=true;
|
|
||||||
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} else {
|
} else {
|
||||||
let urlPre = window.location.protocol + "//" + window.location.host;
|
let urlPre = window.location.protocol + "//" + window.location.host;
|
||||||
// process.env.VUE_APP_BOE_WEB_URL
|
// process.env.VUE_APP_BOE_WEB_URL
|
||||||
@@ -332,7 +264,7 @@ export default {
|
|||||||
two: urlPre + "/grow180/login",
|
two: urlPre + "/grow180/login",
|
||||||
three: this.webBaseUrl + "/study/index?study=1",
|
three: this.webBaseUrl + "/study/index?study=1",
|
||||||
// four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
|
// four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
|
||||||
// five: urlPre + "/boe/new-employee/index.html", //old社招新员工 zhengsongbo 注释掉 2025-07-14
|
five: urlPre + "/boe/new-employee/index.html",
|
||||||
six: urlPre + "/web/contributor/index",
|
six: urlPre + "/web/contributor/index",
|
||||||
seven: this.webBaseUrl + '/grateful/index'
|
seven: this.webBaseUrl + '/grateful/index'
|
||||||
};
|
};
|
||||||
@@ -666,27 +598,4 @@ text-align: center;
|
|||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
}
|
}
|
||||||
/* 项目简介 弹窗 ---start--- */
|
|
||||||
::v-deep .el-dialog__header {
|
|
||||||
padding: 0 !important;
|
|
||||||
}
|
|
||||||
::v-deep .el-dialog {
|
|
||||||
border-radius: 3% 3% 1% 1%;
|
|
||||||
}
|
|
||||||
.el-dialog__header {
|
|
||||||
height: 100px;
|
|
||||||
margin: 0 !important;
|
|
||||||
background-image: url('../assets/images/project/title-bg.png');
|
|
||||||
background-size: 100% 100%; /* 完全填充 */
|
|
||||||
display: block; /* 避免行内元素空隙 */
|
|
||||||
}
|
|
||||||
::v-deep .el-dialog__title {
|
|
||||||
margin: 0 !important;
|
|
||||||
padding: 0 !important;
|
|
||||||
}
|
|
||||||
::v-deep .el-dialog__body {
|
|
||||||
margin: 0 !important;
|
|
||||||
padding: 0 !important;
|
|
||||||
}
|
|
||||||
/* 项目简介 弹窗 ---end--- */
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ export default {
|
|||||||
},
|
},
|
||||||
isDrag:{
|
isDrag:{
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
},
|
},
|
||||||
blobId:{
|
blobId:{
|
||||||
type: String,
|
type: String,
|
||||||
@@ -85,10 +86,9 @@ export default {
|
|||||||
if(current<0) current = 0;
|
if(current<0) current = 0;
|
||||||
var time = localStorage.getItem('videoProgressData');
|
var time = localStorage.getItem('videoProgressData');
|
||||||
var arr = time&&JSON.parse(time) || {}
|
var arr = time&&JSON.parse(time) || {}
|
||||||
//console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
|
console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
|
||||||
// 禁止拖动
|
// 禁止拖动 true:禁止拖动,false:允许拖动
|
||||||
if(!this.isDrag && time && arr[this.blobId] < current) return;
|
if(!this.isDrag && time && arr[this.blobId] < current) return;
|
||||||
|
|
||||||
this.$emit("updateProgress", current);
|
this.$emit("updateProgress", current);
|
||||||
// }
|
// }
|
||||||
|
|
||||||
@@ -102,7 +102,7 @@ export default {
|
|||||||
if(current<0) current = 0;
|
if(current<0) current = 0;
|
||||||
var time = localStorage.getItem('videoProgressData');
|
var time = localStorage.getItem('videoProgressData');
|
||||||
var arr = time&&JSON.parse(time) || {}
|
var arr = time&&JSON.parse(time) || {}
|
||||||
//console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
|
console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
|
||||||
// 禁止拖动
|
// 禁止拖动
|
||||||
if(!this.isDrag && time && arr[this.blobId] < current) return;
|
if(!this.isDrag && time && arr[this.blobId] < current) return;
|
||||||
this.$emit("updateProgress", current);
|
this.$emit("updateProgress", current);
|
||||||
@@ -118,12 +118,12 @@ export default {
|
|||||||
if(current<0) current = 0;
|
if(current<0) current = 0;
|
||||||
var time = localStorage.getItem('videoProgressData');
|
var time = localStorage.getItem('videoProgressData');
|
||||||
var arr = time&&JSON.parse(time) || {}
|
var arr = time&&JSON.parse(time) || {}
|
||||||
//console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
|
console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
|
||||||
this.$emit("getMouseDownStatus", false);
|
this.$emit("getMouseDownStatus", false);
|
||||||
// 禁止拖动
|
// 禁止拖动
|
||||||
if(!this.isDrag && time && arr[this.blobId] < current) return;
|
if(!this.isDrag && time && arr[this.blobId] < current) return;
|
||||||
this.$emit("updateProgress", current);
|
this.$emit("updateProgress", current);
|
||||||
|
this.$emit("getMouseDownStatus", false);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<swiper :options="swiperOptiontwo">
|
<swiper :options="swiperOptiontwo">
|
||||||
<swiper-slide style="margin: 0 auto" v-for="(item, idx) in resonimg" :key="'a' + idx"
|
<swiper-slide style="margin: 0 auto" v-for="(item, idx) in resonimg" :key="'a' + idx"
|
||||||
class="swiper-slide games pointer">
|
class="swiper-slide games pointer">
|
||||||
<div class="bannbox" @click="handleCarouselClick(item)" :style="{
|
<div class="bannbox" :style="{
|
||||||
background: `url(${fileBaseUrl + item.image
|
background: `url(${fileBaseUrl + item.image
|
||||||
}) center center no-repeat`,
|
}) center center no-repeat`,
|
||||||
}"></div>
|
}"></div>
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
<swiper :options="swiperOption" ref="mySwiper" v-if="resonimg.length > 1">
|
<swiper :options="swiperOption" ref="mySwiper" v-if="resonimg.length > 1">
|
||||||
<swiper-slide style="margin: 0 auto" v-for="(item, idx) in resonimg" :key="'b' + idx"
|
<swiper-slide style="margin: 0 auto" v-for="(item, idx) in resonimg" :key="'b' + idx"
|
||||||
class="swiper-slide games pointer">
|
class="swiper-slide games pointer">
|
||||||
<div class="bannbox" @click="handleCarouselClick(item)" :style="{
|
<div class="bannbox" :style="{
|
||||||
background: `url(${fileBaseUrl + item.image
|
background: `url(${fileBaseUrl + item.image
|
||||||
}) center center no-repeat`,
|
}) center center no-repeat`,
|
||||||
}"></div>
|
}"></div>
|
||||||
@@ -220,7 +220,7 @@ export default {
|
|||||||
autoplay: false,
|
autoplay: false,
|
||||||
// noSwiping: true,
|
// noSwiping: true,
|
||||||
},
|
},
|
||||||
// resonimg: [],
|
resonimg: [],
|
||||||
swiperOption: {
|
swiperOption: {
|
||||||
autoplay: {
|
autoplay: {
|
||||||
delay: 2000,
|
delay: 2000,
|
||||||
@@ -249,13 +249,6 @@ export default {
|
|||||||
this.getToolData()
|
this.getToolData()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 添加点击轮播图跳转的方法
|
|
||||||
handleCarouselClick(item) {
|
|
||||||
if (item.url) {
|
|
||||||
window.open(item.url, '_blank');
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
downTool(toolInfo) {
|
downTool(toolInfo) {
|
||||||
console.log(toolInfo);
|
console.log(toolInfo);
|
||||||
window.open(`/activityApi/xboe/m/boe/tools/url/download?urlStr=${process.env.VUE_APP_BOE_WEB_URL}/upload${toolInfo.filePath}&fileName=${toolInfo.name}`)
|
window.open(`/activityApi/xboe/m/boe/tools/url/download?urlStr=${process.env.VUE_APP_BOE_WEB_URL}/upload${toolInfo.filePath}&fileName=${toolInfo.name}`)
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<div class="navTop">
|
<div class="navTop">
|
||||||
<div>
|
<div>
|
||||||
<router-link to="/grateful" class="nav">首页</router-link> >
|
<router-link to="/grateful" class="nav">首页</router-link> >
|
||||||
<span style="cursor: pointer;" class="nav">认证讲师库</span>
|
<span style="cursor: pointer;" class="nav">认证讲师库(2023)</span>
|
||||||
</div>
|
</div>
|
||||||
<div style="position: relative;">
|
<div style="position: relative;">
|
||||||
<el-input class="portal-input" placeholder="请输入课程名称" style="border-radius: 20px !important; "
|
<el-input class="portal-input" placeholder="请输入课程名称" style="border-radius: 20px !important; "
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="label">
|
<div class="label">
|
||||||
<author :aid="caseDetail.sysCreateAid" :onlyAvatar="true" :avatar="authorInfo.avatar"
|
<author :aid="caseDetail.sysCreateAid" :onlyAvatar="true" :avatar="authorInfo.avatar"
|
||||||
:sex="authorInfo.sex" :name="authorInfo.name"></author>
|
:sex="authorInfo.sex"></author>
|
||||||
<span>案主:{{ authorInfo.name }} ({{ authorInfo.orgInfo }})</span>
|
<span>案主:{{ authorInfo.name }} ({{ authorInfo.orgInfo }})</span>
|
||||||
<!-- <span>案主:{{ authorInfo.name }}</span>
|
<!-- <span>案主:{{ authorInfo.name }}</span>
|
||||||
<span>工号:{{ authorInfo.code }}</span>
|
<span>工号:{{ authorInfo.code }}</span>
|
||||||
|
|||||||
@@ -1609,7 +1609,7 @@ export default {
|
|||||||
})
|
})
|
||||||
console.log(res?.result?.list ,'有没有数据2');
|
console.log(res?.result?.list ,'有没有数据2');
|
||||||
this.caseList.list = res.result.list
|
this.caseList.list = res.result.list
|
||||||
this.getCaseUserData(res.result.list);
|
// this.getCaseUserData(res.result.list);
|
||||||
// 给所有的赋值
|
// 给所有的赋值
|
||||||
this.caseList.count = res.result.count;
|
this.caseList.count = res.result.count;
|
||||||
this.caseList.showPagCount = res.result.count;
|
this.caseList.showPagCount = res.result.count;
|
||||||
|
|||||||
@@ -486,32 +486,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<!-- "新员工项目简介""弹框 -->
|
|
||||||
<el-dialog width="733px" title="项目简介" top="80px"
|
|
||||||
:visible.sync="projectDialogVisible"
|
|
||||||
class="custom-class">
|
|
||||||
<div slot="header" class="el-dialog__header">
|
|
||||||
</div>
|
|
||||||
<div style="height: 300px;margin: 20px 40px 0px 40px;">
|
|
||||||
<span v-html="studentInfo.introduction"></span>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<span style="margin: 40px; font-size: 14px" v-if="studentInfo.bpmStatus!=0">
|
|
||||||
审批编号:<span style="font-weight: bold;">{{studentInfo.bpmNumber}}</span>
|
|
||||||
</span>
|
|
||||||
<br/>
|
|
||||||
<span style="margin: 40px; font-size: 14px">
|
|
||||||
审批状态:<span v-html="studentInfo.bpmStatusName"></span>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<template #footer>
|
|
||||||
<span class="dialog-footer">
|
|
||||||
<el-button type="primary" @click="signUpNow" v-if="studentInfo.bpmStatus==0">立即报名</el-button>
|
|
||||||
<el-button v-if="studentInfo.bpmStatus==1" disabled>审批中</el-button>
|
|
||||||
<el-button type="primary" @click="signUpAgain" v-if="studentInfo.bpmStatus==3">重新报名</el-button>
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
</el-dialog>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -533,7 +507,6 @@ import apiTeacher from "@/api/modules/teacher.js";
|
|||||||
import apiUser from "@/api/system/user.js";
|
import apiUser from "@/api/system/user.js";
|
||||||
import scene from "@/api/modules/scene.js";
|
import scene from "@/api/modules/scene.js";
|
||||||
import apiUserbasic from "@/api/boe/userbasic.js";
|
import apiUserbasic from "@/api/boe/userbasic.js";
|
||||||
import apiManage from '@/api/manage/manage.js';
|
|
||||||
import interactBar from "@/components/Portal/interactBar.vue";
|
import interactBar from "@/components/Portal/interactBar.vue";
|
||||||
import courseImage from "@/components/Course/courseImage.vue";
|
import courseImage from "@/components/Course/courseImage.vue";
|
||||||
import { courseType, getType, toScore, formatDate, formatUserNumber, formatDateByFmt } from "@/utils/tools.js";
|
import { courseType, getType, toScore, formatDate, formatUserNumber, formatDateByFmt } from "@/utils/tools.js";
|
||||||
@@ -646,7 +619,6 @@ export default {
|
|||||||
twoId: '',
|
twoId: '',
|
||||||
count: 0,//分页总条条数
|
count: 0,//分页总条条数
|
||||||
showUClass: false,
|
showUClass: false,
|
||||||
projectDialogVisible: false,
|
|
||||||
ctypeList: [
|
ctypeList: [
|
||||||
{ type: 1, id: 20, name: '录播课', checked: false },
|
{ type: 1, id: 20, name: '录播课', checked: false },
|
||||||
{ type: 1, id: 30, name: '线下课', checked: false },
|
{ type: 1, id: 30, name: '线下课', checked: false },
|
||||||
@@ -657,7 +629,7 @@ export default {
|
|||||||
twoList: [], //二级分类{type:12}
|
twoList: [], //二级分类{type:12}
|
||||||
threeList: [],//三级分类{type:13}
|
threeList: [],//三级分类{type:13}
|
||||||
searching: false,//是否正在搜索中
|
searching: false,//是否正在搜索中
|
||||||
studentInfo: {},
|
|
||||||
resonimg: {},
|
resonimg: {},
|
||||||
formatDate,
|
formatDate,
|
||||||
formatNum: formatUserNumber,
|
formatNum: formatUserNumber,
|
||||||
@@ -797,24 +769,6 @@ export default {
|
|||||||
// window.removeEventListener("scroll", this.handleScroll);
|
// window.removeEventListener("scroll", this.handleScroll);
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
//BPM项目:立即报名
|
|
||||||
signUpNow(){
|
|
||||||
const pid = this.studentInfo.projectId;
|
|
||||||
apiManage.signUpBpmProjectNow(pid).then(res=>{
|
|
||||||
this.projectDialogVisible = false;
|
|
||||||
})
|
|
||||||
},
|
|
||||||
|
|
||||||
//BPM项目:重新报名
|
|
||||||
signUpAgain(){
|
|
||||||
const pid = this.studentInfo.projectId;
|
|
||||||
const studentId=this.studentInfo.studentId;
|
|
||||||
const data = {"pid":pid,"studentId":studentId};
|
|
||||||
apiManage.signUpBpmProjectAgain(data).then(res=>{
|
|
||||||
this.projectDialogVisible = false;
|
|
||||||
})
|
|
||||||
},
|
|
||||||
|
|
||||||
// 改变分页
|
// 改变分页
|
||||||
currentChange(val) {
|
currentChange(val) {
|
||||||
this.course.pageIndex = val
|
this.course.pageIndex = val
|
||||||
@@ -1262,34 +1216,10 @@ export default {
|
|||||||
let params = encodeURIComponent('courseId=' + courseId);
|
let params = encodeURIComponent('courseId=' + courseId);
|
||||||
this.$router.push('/forward?to=' + manageApi + '/stu/project/redirectDetail¶ms=' + params);
|
this.$router.push('/forward?to=' + manageApi + '/stu/project/redirectDetail¶ms=' + params);
|
||||||
} else if (item.type == 40) { //学习项目
|
} else if (item.type == 40) { //学习项目
|
||||||
if (item.bpmFlag == 1) { //是否是需要BPM审批的项目(新员工转正项目)
|
|
||||||
//检查当前用户是否已经报名该项目(“未报名”、“审批中”和“审核拒绝”--则弹窗!--“立即报名”和“重新报名"调BPM接口)
|
|
||||||
apiManage.getStudntProjectInfo(courseId).then(res=>{
|
|
||||||
this.studentInfo = res.data;
|
|
||||||
const bpmStatus = this.studentInfo.bpmStatus;
|
|
||||||
if (bpmStatus == 0){//未报名--则弹窗含“立即报名”
|
|
||||||
this.projectDialogVisible=true;
|
|
||||||
this.studentInfo.bpmStatusName="<span style='color: #ddc507;font-weight: bold;'>未报名</span>";
|
|
||||||
|
|
||||||
}else if (bpmStatus == 1){//已报名待审核(审批中)--仅弹窗展示
|
|
||||||
this.projectDialogVisible=true;
|
|
||||||
this.studentInfo.bpmStatusName="<span style='color: #ddc507;font-weight: bold;'>审批中</span>";
|
|
||||||
|
|
||||||
}else if (bpmStatus == 2){//bpm报名审核通过,则直接进入项目进行学习
|
|
||||||
let params = encodeURIComponent('projectId=' + courseId);
|
|
||||||
this.$router.push('/forward?to=' + studentPath + '/projectdetails¶ms=' + params);
|
|
||||||
}else if(bpmStatus == 3){//已拒绝--则弹窗含“重新报名”
|
|
||||||
this.projectDialogVisible=true;
|
|
||||||
this.studentInfo.bpmStatusName="<span style='color: red;font-weight: bold;'>已拒绝(含个人撤回)</span>";
|
|
||||||
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}else {
|
|
||||||
let params = encodeURIComponent('projectId=' + courseId);
|
let params = encodeURIComponent('projectId=' + courseId);
|
||||||
this.$router.push('/forward?to=' + studentPath + '/projectdetails¶ms=' + params);
|
this.$router.push('/forward?to=' + studentPath + '/projectdetails¶ms=' + params);
|
||||||
//this.$router.push('/forward?to='+manageApi+'/stu/project/redirectDetail¶ms='+params);
|
//this.$router.push('/forward?to='+manageApi+'/stu/project/redirectDetail¶ms='+params);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if (item.type == 10) {
|
if (item.type == 10) {
|
||||||
//return this.webBaseUrl + "/course/studyindex?id=" + item.id;
|
//return this.webBaseUrl + "/course/studyindex?id=" + item.id;
|
||||||
@@ -2491,31 +2421,4 @@ console.log(res.result.list,'data')
|
|||||||
|
|
||||||
.option-active {
|
.option-active {
|
||||||
color: #387DF7;
|
color: #387DF7;
|
||||||
}
|
}</style>
|
||||||
/* 项目简介 方法一:外部 CSS 类 */
|
|
||||||
::v-deep.el-dialog {
|
|
||||||
border-radius: 3% 3% 1% 1%;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
::v-deep.custom-class .el-dialog__header {
|
|
||||||
height: 100px;
|
|
||||||
margin: 0 !important;
|
|
||||||
padding: 0 !important;
|
|
||||||
background-image: url('../../../assets/images/project/title-bg.png');
|
|
||||||
background-size: 100% 100%; /* 完全填充 */
|
|
||||||
display: block; /* 避免行内元素空隙 */
|
|
||||||
}
|
|
||||||
::v-deep.custom-class .el-dialog__header .el-dialog__title {
|
|
||||||
padding: 0 !important;
|
|
||||||
font-size: 35px;
|
|
||||||
font-weight: bold;
|
|
||||||
color: white;
|
|
||||||
margin: 60px;
|
|
||||||
line-height: 100px;
|
|
||||||
}
|
|
||||||
::v-deep.custom-class .el-dialog__body {
|
|
||||||
margin: 0 !important;
|
|
||||||
padding: 0 !important;
|
|
||||||
}
|
|
||||||
/* ---end--- */
|
|
||||||
</style>
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
<div class="course-playbox" ref="coursePlayerBox" id="id_course_player_box">
|
<div class="course-playbox" ref="coursePlayerBox" id="id_course_player_box">
|
||||||
<div class="course-player" ref="coursePlayer" id="id_course_player">
|
<div class="course-player" ref="coursePlayer" id="id_course_player">
|
||||||
<div>
|
<div>
|
||||||
<div v-if="renderCourse">
|
<div v-if="false">
|
||||||
<div v-if="resType == null || resType == 0">
|
<div v-if="resType == null || resType == 0">
|
||||||
<!--先显示视频图片-->
|
<!--先显示视频图片-->
|
||||||
<course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
|
<course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
|
||||||
@@ -110,11 +110,11 @@
|
|||||||
</assess>
|
</assess>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="!renderCourse && Internet ==2" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
|
<div v-if="true" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
|
||||||
<div style="margin-top:40px;font-weight:700;font-size: 22px;color: #ccc">
|
<div style="margin-top:40px;font-weight:700;font-size: 22px;color: #ccc">
|
||||||
<span>十分抱歉,您当前的网络环境不符合观看要求。为了保障课程信息的安全,您需要接入公司内网才能观看。</span>
|
<span>十分抱歉,您当前的网络环境不符合观看要求。为了保障案例信息的安全,您需要接入公司内网才能观看。</span>
|
||||||
</div>
|
</div>
|
||||||
<div style="margin-top:20px;text-align:center" @click="refreshPage">
|
<div style="margin-top:20px;text-align:center" @click="getInternet" >
|
||||||
<el-button type="primary">重新检测</el-button>
|
<el-button type="primary">重新检测</el-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -177,7 +177,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- 课程单元 -->
|
<!-- 课程单元 -->
|
||||||
<div class="course-units" v-if="tab == 1">
|
<div class="course-units" v-if="tab == 1">
|
||||||
<div style="min-height: 350px;max-height: 650px ;overflow-y: auto;">
|
<div :style="`height: ${controlHeight}px;overflow-y: auto;`">
|
||||||
<div class="catalog" v-if="courseInfo.type == 20">
|
<div class="catalog" v-if="courseInfo.type == 20">
|
||||||
<div v-for="(item, index) in catalogTree" :key="index" :name="index">
|
<div v-for="(item, index) in catalogTree" :key="index" :name="index">
|
||||||
<el-menu
|
<el-menu
|
||||||
@@ -454,7 +454,6 @@
|
|||||||
getType: getType,
|
getType: getType,
|
||||||
ctabName: 'catalog',
|
ctabName: 'catalog',
|
||||||
resType: null,
|
resType: null,
|
||||||
renderCourse: true,
|
|
||||||
activeNames: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
|
activeNames: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
|
||||||
scoreInfo: {
|
scoreInfo: {
|
||||||
dlgShow: false,
|
dlgShow: false,
|
||||||
@@ -483,7 +482,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.getInternet();
|
|
||||||
// 增加的用户受众id
|
// 增加的用户受众id
|
||||||
let localKey = "user_" + this.userInfo.sysId + "_gids";
|
let localKey = "user_" + this.userInfo.sysId + "_gids";
|
||||||
let hasIds = sessionStorage.getItem(localKey);
|
let hasIds = sessionStorage.getItem(localKey);
|
||||||
@@ -531,6 +529,10 @@
|
|||||||
return treeList;
|
return treeList;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
destroyed(){
|
||||||
|
this.cleanAppendTime();
|
||||||
|
this.stopStudyTime();
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
handleOpen(key,path){
|
handleOpen(key,path){
|
||||||
if(this.isFalse){
|
if(this.isFalse){
|
||||||
@@ -816,8 +818,7 @@
|
|||||||
}else if(h>500){
|
}else if(h>500){
|
||||||
h=h+60;
|
h=h+60;
|
||||||
}
|
}
|
||||||
// 移除高度控制 防止内容塌陷
|
$this.controlHeight=h-95;
|
||||||
// $this.controlHeight=h-95;
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
@@ -1323,17 +1324,6 @@
|
|||||||
audiences:this.audiences
|
audiences:this.audiences
|
||||||
}).then(rs => {
|
}).then(rs => {
|
||||||
if (rs.status == 200) {
|
if (rs.status == 200) {
|
||||||
if(rs.result.isPermission){
|
|
||||||
this.protocolDialogVisible=true
|
|
||||||
}
|
|
||||||
if (!rs.result.isPermission || (rs.result.isPermission && this.Internet==1)){
|
|
||||||
// this.getInternet()
|
|
||||||
this.renderCourse = true
|
|
||||||
}else{
|
|
||||||
// this.Internet=1;
|
|
||||||
this.renderCourse = false
|
|
||||||
this.protocolDialogVisible=true
|
|
||||||
}
|
|
||||||
if(rs.result.contents.length==0){
|
if(rs.result.contents.length==0){
|
||||||
$this.$message.error('课程内容已删除或课程已不再使用');
|
$this.$message.error('课程内容已删除或课程已不再使用');
|
||||||
return;
|
return;
|
||||||
@@ -1422,17 +1412,16 @@
|
|||||||
this.totalContent = rs.result.contents.length;
|
this.totalContent = rs.result.contents.length;
|
||||||
//加载学习的数据
|
//加载学习的数据
|
||||||
this.loadStudyData(rs.result);
|
this.loadStudyData(rs.result);
|
||||||
|
if (rs.result.isPermission){
|
||||||
|
// if (true){
|
||||||
|
this.getInternet()
|
||||||
|
console.log('需要内网环境')
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
this.$message.error(rs.message);
|
this.$message.error(rs.message);
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
refreshPage() {
|
|
||||||
location.reload();
|
|
||||||
// this.getInternet();
|
|
||||||
// this.loadData();
|
|
||||||
},
|
|
||||||
getXmlHttpRequest() {
|
getXmlHttpRequest() {
|
||||||
if (window.XMLHttpRequest) {
|
if (window.XMLHttpRequest) {
|
||||||
return new XMLHttpRequest();
|
return new XMLHttpRequest();
|
||||||
@@ -1450,7 +1439,7 @@
|
|||||||
let timer = setTimeout(function () {
|
let timer = setTimeout(function () {
|
||||||
timedOut = true;
|
timedOut = true;
|
||||||
xmlhttp.abort();
|
xmlhttp.abort();
|
||||||
}, 1000);
|
}, 5000);
|
||||||
xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
|
xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
|
||||||
xmlhttp.send();
|
xmlhttp.send();
|
||||||
xmlhttp.onreadystatechange = function () {
|
xmlhttp.onreadystatechange = function () {
|
||||||
@@ -1458,9 +1447,9 @@
|
|||||||
if (xmlhttp.status == 200) {
|
if (xmlhttp.status == 200) {
|
||||||
clearTimeout(timer);
|
clearTimeout(timer);
|
||||||
$this.Internet = 1;
|
$this.Internet = 1;
|
||||||
|
$this.protocolDialogVisible=true
|
||||||
} else {
|
} else {
|
||||||
clearTimeout(timer);
|
clearTimeout(timer);
|
||||||
// $this.protocolDialogVisible=true
|
|
||||||
$this.Internet = 2;
|
$this.Internet = 2;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -1761,10 +1750,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
destroyed(){
|
|
||||||
this.cleanAppendTime();
|
|
||||||
this.stopStudyTime();
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -1801,46 +1786,24 @@
|
|||||||
margin: 20px auto;
|
margin: 20px auto;
|
||||||
.course-playbox {
|
.course-playbox {
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
//min-height: 400px;
|
min-height: 400px;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
.course-player-container {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
.course-player{ //内容播放区域
|
.course-player{ //内容播放区域
|
||||||
flex: 4; // 80%高度
|
background-color: rgb(238, 238, 238);
|
||||||
|
flex:1;
|
||||||
min-width: 700px;
|
min-width: 700px;
|
||||||
// min-height: 400px;
|
min-height: 400px;
|
||||||
// max-height: 800px;
|
max-height: 800px;
|
||||||
height: 80%;
|
//height: 100%;
|
||||||
border: 1px solid #ffffff;
|
border: 1px solid #ffffff;
|
||||||
padding-right: 20px;
|
padding-right: 20px;
|
||||||
background-color: rgb(238, 238, 238);
|
|
||||||
// overflow: auto;
|
// overflow: auto;
|
||||||
}
|
}
|
||||||
.course-control{ //内容控制区域
|
.course-control{ //内容控制区域
|
||||||
width: 420px;
|
width: 420px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: 1200px) {
|
|
||||||
.course-playbox,
|
|
||||||
.course-infobox {
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
.course-player,
|
|
||||||
.course-info {
|
|
||||||
min-width: 100%;
|
|
||||||
padding-right: 0;
|
|
||||||
}
|
|
||||||
.course-control,
|
|
||||||
.course-teacher {
|
|
||||||
width: 100%;
|
|
||||||
margin-top: 20px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.course-infobox {
|
.course-infobox {
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -1960,10 +1923,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.player-box {
|
.player-box {
|
||||||
position: relative;
|
position: absolute;
|
||||||
width: 100%;
|
// top: 62px;
|
||||||
max-width: 300px;
|
// left: 184px;
|
||||||
margin: 20px auto;
|
width: 300px;
|
||||||
|
left: 50%;
|
||||||
|
top: 50%;
|
||||||
|
transform: translate(-50%, -50%);
|
||||||
height: 187px;
|
height: 187px;
|
||||||
background: rgba(74, 74, 74, .5);
|
background: rgba(74, 74, 74, .5);
|
||||||
border-radius: 33px;
|
border-radius: 33px;
|
||||||
@@ -2106,7 +2072,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.course-interact {
|
.course-interact {
|
||||||
flex: 1; // 20%高度
|
|
||||||
height: 54px;
|
height: 54px;
|
||||||
// padding-top: 10px;
|
// padding-top: 10px;
|
||||||
// padding-right: 10px;
|
// padding-right: 10px;
|
||||||
|
|||||||
Reference in New Issue
Block a user