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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yujicun
2023-01-12 17:45:42 +08:00
parent 35ca05182b f92b01223a
commit ba7151e442
37 changed files with 1247 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Course/chooseCourseFile.vue
View File

@@ -184,6 +184,8 @@
// this.cware.content.contentRefId=rs.result.id;
// this.cware.content.contentName=result.displayName;
// this.cware.content.content=result.filePath;
}else{
this.$message.error(rs.message);
}
});
}else{

94
src/components/Course/courseForm.vue
View File

@@ -397,6 +397,7 @@ import apiTag from '../../api/modules/tag.js';
import apiHRBP from '../../api/boe/HRBP.js';
import apiUserBasic from '../../api/boe/userbasic.js';
import apiCourse from '../../api/modules/course.js';
import apiCourseAudit from '../../api/modules/courseAudit.js';
import apiOrg from '../../api/system/organiza.js';
import apiUser from '../../api/system/user.js';
import WxEditor from '@/components/Editor/index.vue';
@@ -1300,7 +1301,6 @@ export default {
return true;
},
submitCourse() {
if(this.biaoke.dlgShow && !this.unsavedContent()){
this.$message.error('您有未保存的内容，请先保存');
return;
@@ -1420,60 +1420,64 @@ export default {
};
this.btnLoading = true;
let $this = this;
//console.log(this.courseInfo.orgId,'this.courseInfo.orgId')
//先获取HRBP审核 人员信息，姓名，机构路径，工号，用于邮件中的信息
apiUserBasic.getOrgHrbpInfo(this.courseInfo.orgId).then(rs=>{
if(rs.status==200 && rs.result){
postData.auditUser={
email:rs.result.email,
code:rs.result.userNo,
name:rs.result.name,
aid:rs.result.id,
orgId:rs.result.orgId
}
postData.course.orgName=rs.result.orgNamePath+'/'+rs.result.orgName;
// apiHRBP.getHRBP(this.orgKid).then(rs=>{
// if(rs.status==200 && rs.result.length>0){
// let hrbpUser=rs.result[0];
// postData.auditUser={
// email:hrbpUser.email,
// code:hrbpUser.user_no,
// name:hrbpUser.real_name,
// kid:hrbpUser.user_id,
// orgId:hrbpUser.orgnization_id
// }
// postData.course.orgName=hrbpUser.orgnization_name_path+'/'+$this.orgName;
apiCourse.submitCourse(postData).then(res => {
//this.btnLoading=false;
//2023-1-5 对于默认管理员，不需要提交hrbp。直接提交并发布
let adminType=this.userInfo.adminType;
if(adminType==1){ //默认管理员,直接审核通过
apiCourseAudit.submitAndPublish(postData).then(res=>{
setTimeout(function() {
$this.btnLoading = false;
}, 1000);
if (res.status === 200) {
//提交成功，直接关闭当前窗口
this.$message.success('提交成功！！！');
this.biaoke.dlgShow = false;
this.weike.dlgShow = false;
//提交成功回调处理
this.$emit('submitSuccess');
} else {
this.$message.error(res.message);
this.biaoke.dlgShow = false;
this.weike.dlgShow = false;
this.$emit('submitSuccess');
}
this.biaoke.dlgShow = false;
this.weike.dlgShow = false;
this.$emit('submitSuccess');
});
}else{
$this.btnLoading = false;
this.$message.error('获取审核HRBP失败:'+rs.message);
}
}).catch(err=>{
//this.$message.error('获取审核HRBP失败:'+err);
this.$message.error('获取审核HRBP失败，请检查资源归属下是否有HRBP审核人员');
$this.btnLoading = false;
})
}else{
//先获取HRBP审核 人员信息，姓名，机构路径，工号，用于邮件中的信息
apiUserBasic.getOrgHrbpInfo(this.courseInfo.orgId).then(rs=>{
if(rs.status==200 && rs.result){
postData.auditUser={
email:rs.result.email,
code:rs.result.userNo,
name:rs.result.name,
aid:rs.result.id,
orgId:rs.result.orgId
}
postData.course.orgName=rs.result.orgNamePath+'/'+rs.result.orgName;
apiCourse.submitCourse(postData).then(res => {
//this.btnLoading=false;
setTimeout(function() {
$this.btnLoading = false;
}, 1000);
if (res.status === 200) {
//提交成功，直接关闭当前窗口
this.$message.success('提交成功！！！');
this.biaoke.dlgShow = false;
this.weike.dlgShow = false;
//提交成功回调处理
this.$emit('submitSuccess');
} else {
this.$message.error(res.message);
this.biaoke.dlgShow = false;
this.weike.dlgShow = false;
this.$emit('submitSuccess');
}
});
}else{
$this.btnLoading = false;
this.$message.error('获取审核HRBP失败:'+rs.message);
}
}).catch(err=>{
//this.$message.error('获取审核HRBP失败:'+err);
this.$message.error('获取审核HRBP失败，请检查资源归属下是否有HRBP审核人员');
$this.btnLoading = false;
})
}
},
// 教师列标，远程查询
async remoteFindTeacher(query) {

9
src/components/Course/courseImage.vue
View File

@@ -11,9 +11,8 @@
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
<div v-if="isShow">
<p v-if="imageTextSize == 4" class="te-max text effect06" v-html="name">
</p>
<div v-if="isShow && text">
<p v-if="imageTextSize == 4" class="te-max text effect06" v-html="name"></p>
<p v-if="imageTextSize == 3" class="max text effect06" v-html="name">
<!-- {{ course.name || course.courseName || course.title}} -->
</p>
@@ -39,6 +38,10 @@ export default {
type: String,
default: "100%",
},
text:{
type: Boolean,
default:true,
},
width: {
type: String,
default: "100%",

50
src/components/Exam/EditPaper.vue
View File

@@ -240,6 +240,56 @@
})
},
save(){
let qidMap=new Map();
let hasItem=null;
let allScore=true;
let allAnswer=true;
this.qitems.some(qitem=>{
//console.log(qitem,'qitem');
if(qitem.type==3){
if(!qitem.answer){
allAnswer=false;
return true;
}
}else{
var optHasAnswer=qitem.optionList.some(opt=>{
return opt.isAnswer;
})
if(!optHasAnswer){
allAnswer=false;
return true;
}
}
if(!qitem.defaultScore || qitem.defaultScore=='0'){
allScore=false;
return true;
}
if(qidMap.has(qitem.id)){
hasItem=qitem;
return true;
}else{
qidMap.set(qitem.id,qitem.id);
return false;
}
});
if(!allAnswer){
this.$message.error('还有试题未设置答案，请设置完整再保存');
return;
}
if(!allScore){
this.$message.error('有试题未设置分数');
return;
}
if(hasItem!=null){
console.log(hasItem);
this.$message.error('选择的试题重复：'+hasItem.title)
return
}
this.loading=true;
this.paper.paperContent=JSON.stringify(this.qitems);
apiPaper.update(this.paper).then((res)=>{

2
src/components/HomePage/courseList.vue
View File

@@ -66,7 +66,7 @@
},
components: {
courseImage,
},
},
props:{
list:{
type:Array,

2
src/components/PortalHeader.vue
View File

@@ -156,7 +156,7 @@ export default {
components:{popup,yearMedal},
computed: {
...mapGetters(['userInfo', 'userMsg','identity','studyTaskCount']),
...mapGetters(['userInfo','curIdentity', 'userMsg','identity','studyTaskCount']),
avatarText(){
return userAvatarText(this.userInfo.name);

12
src/components/Study/manager.vue
View File

@@ -180,19 +180,19 @@
{{scope.row.chapterName}}{{scope.row.chapterName? '--': ''}}{{scope.row.contentName}}
</template>
</el-table-column>
<el-table-column prop="status" label="状态">
<!-- <el-table-column prop="status" label="状态">
<template slot-scope="scope">
<span>{{scope.row.status == 9? '已完成':'未开始'}}</span>
</template>
</el-table-column>
<!-- <el-table-column prop="duration" label="时长(分)">
<el-table-column prop="duration" label="时长(分)">
<template slot-scope="scope">
{{scope.row.duration == 0?'0':scope.row.duration/60}}
{{scope.row.duration == 0?'0':(scope.row.duration/60).toFixed(2)}}
</template>
</el-table-column> -->
<el-table-column label="操作" width="100">
</el-table-column>-->
<el-table-column label="学习人员" width="110">
<template slot-scope="scope">
<el-button type="info" @click="getCatalogue(scope.row)" >详情</el-button>
<el-button size="mini" type="info" @click="getCatalogue(scope.row)" >学习人员</el-button>
</template>
</el-table-column>
</el-table>

5
src/components/UserCenter/menu.vue
View File

@@ -27,9 +27,10 @@
<el-menu-item index="/examine/notapproved">
<span class="textl"><el-badge :value="messagesBeReviewed" class="item" :hidden="messagesBeReviewed == 0">待审核的课程</el-badge></span>
</el-menu-item>
<!-- <el-menu-item index="/course/opencourse/audit">
<!-- 毛继禹 110858,只有这个人才可以看到这个菜单，如果是本地开发测试，把这个先去掉-->
<el-menu-item v-if="userInfo.userNo=='110858'" index="/course/opencourse/audit">
<span class="textl">公开课审核</span>
</el-menu-item> -->
</el-menu-item>
</el-submenu>
<el-submenu index="manageFinish" v-show="curIdentity == 3">
<template slot="title">