-
+
从指定科目类型中选择
从全部题库中选择
-
+
单选题:
-
+
-
+
道 当前题库单选题{{radioDataList.length}}道
多选题:
-
+
-
+
道 当前题库多选题{{checkDataList.length}}道
@@ -252,6 +250,7 @@
+
@@ -508,22 +507,9 @@ export default {
showBigImg: false,
examSubjectList: [], // 科目类别列表
- laborPersonList: [], // 劳务人员列表
- adminPersonList: [], // 管理人员列表
- tempPersonList: [], // 临时人员列表
- checkedPersonList: [], // 源列表已选人员列表
- personTotal: 0, // 源列表总条数
- personCheckedTotal: 0, // 源列表已选总条数
-
- compulsoryList: [], // 必修列表
- compulsoryList: [], // 必修人员列表
- cpsCheckedList:[], // 必修已选列表
- cpsFormList: [], // 必修表单列表
- cpsTotal: [], // 必修列表总条数
- cpsCheckedTotal: [], // 必修列表已选总条数
+ compulsoryList: [],
addCourseForm: {}, // 新增课程表单
- studyCycle: [], // 表单日期时间范围
personType: 0, // 人员类型
personnelName:"", // 人员名称
@@ -610,11 +596,11 @@ export default {
},
methods: {
cancel2(){
- this.examForm.checkQuestionType = null
+ // this.examForm.checkQuestionType = null
this.dialogVisible2 = false
},
cancel3(){
- this.examForm.checkQuestionType = null
+ // this.examForm.checkQuestionType = null
this.dialogVisible3 = false
},
singleChange(){
@@ -772,42 +758,26 @@ export default {
},
openDoor(){
// this.examForm.questions = this.examForm.questions.split(',')
- let tempStr = this.examForm.questions.split(',')
- console.log(tempStr,789)
- console.log(this.questionList,789)
- // this.examForm.questions = String.prototype.split(this.examForm.questions,',')
- // this.$nextTick(()=>{
-
- // this.examForm.questions = tempStr
- // this.questionList.map((item,index) => {
- // console.log("33333333333333333333")
- // tempStr.map((item2,index2) => {
- // if(item.id = item2){
- // that.$refs.questionListTable.toggleRowSelection(taht.questionList[index],true)
- // console.log("=======================")
- // console.log(this.questionList[index])
- // }
- // })
- // })
- // })
- this.dialogVisible2 = true
- this.$nextTick(() => {
- for(let i=0;i
{
+ for(let i=0;i
-
+
-
+
-
+
单个文件不超过100M,最多可上传1个附件
将文件拖到此处，或点击上传
-
+
0){
- console.log('==========studyCycle-submitBtn==========',this.studyCycle)
- this.addCourseForm.beginTime = this.studyCycle[0]
- this.addCourseForm.endTime = this.studyCycle[1]
- }
- this.addCourseForm.projectSn = this.$store.state.projectSn;
- // this.addCourseForm.coverImg = this.coverFileList
- // this.addCourseForm.fileList = this.materialFileList
- if(!this.addCourseForm.subjectId){
- this.$message.error('请选择科目类型')
- return
- }
- if(!this.addCourseForm.courseName){
- this.$message.error('请输入课程名称')
- return
- }
- if(!this.addCourseForm.fileUrl){
- this.$message.error('请上传视频文件')
- return
- }
- if(!this.addCourseForm.coverImg){
- this.$message.error('请上传课程封面')
- return
- }
- if(this.title === '新增课程'){
- addCourseApi(this.addCourseForm).then((res)=>{
- if (res.code == 200) {
- this.handleClose()
- this.$message.success(res.result);
- this.getPageCourseApi();
+ submitBtn(addCourseForm) { // 提交按钮
+ this.$refs[addCourseForm].validate((valid) =>{
+ if(valid){
+ if(this.studyCycle.length > 0){
+ console.log('==========studyCycle-submitBtn==========',this.studyCycle)
+ this.addCourseForm.beginTime = this.studyCycle[0]
+ this.addCourseForm.endTime = this.studyCycle[1]
}
- })
- }else{
- editCourseApi(this.addCourseForm).then((res)=>{
- if (res.code == 200) {
- this.handleClose()
- this.$message.success('编辑成功');
- this.getPageCourseApi();
+ this.addCourseForm.projectSn = this.$store.state.projectSn;
+ // this.addCourseForm.coverImg = this.coverFileList
+ // this.addCourseForm.fileList = this.materialFileList
+ if(!this.addCourseForm.subjectId){
+ this.$message.error('请选择科目类型')
+ return
}
- })
- }
- console.log('==========addCourseForm-submitBtn==========',this.addCourseForm)
+ if(!this.addCourseForm.courseName){
+ this.$message.error('请输入课程名称')
+ return
+ }
+ if(!this.addCourseForm.fileUrl){
+ this.$message.error('请上传视频文件')
+ return
+ }
+ if(!this.addCourseForm.coverImg){
+ this.$message.error('请上传课程封面')
+ return
+ }
+ if(this.title === '新增课程'){
+ addCourseApi(this.addCourseForm).then((res)=>{
+ if (res.code == 200) {
+ this.handleClose()
+ this.$message.success(res.result);
+ this.getPageCourseApi();
+ }
+ })
+ }else{
+ editCourseApi(this.addCourseForm).then((res)=>{
+ if (res.code == 200) {
+ this.handleClose()
+ this.$message.success('编辑成功');
+ this.getPageCourseApi();
+ }
+ })
+ }
+ console.log('==========addCourseForm-submitBtn==========',this.addCourseForm)
+ }
+ })
+
+
},
sizeChange(val) { // pageSize的处理
this.pagInfo.pageSize = val
diff --git a/src/views/projectFront/examSystem2/subjectManagement/subjectManagement.vue b/src/views/projectFront/examSystem2/subjectManagement/subjectManagement.vue
index 5cd5f10f..18c7bad4 100644
--- a/src/views/projectFront/examSystem2/subjectManagement/subjectManagement.vue
+++ b/src/views/projectFront/examSystem2/subjectManagement/subjectManagement.vue
@@ -99,8 +99,7 @@ export default {
},
watch:{
dialogVisible(newVal,oldVal){
- // this.getExamSubjectList()
- // if(newVal === false) this.subjectInfo = {}
+
}
},
computed: {
diff --git a/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue b/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue
index 265e002b..09cc4c1d 100644
--- a/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue
+++ b/src/views/projectFront/examSystem2/trainRecord/trainPlan.vue
@@ -94,7 +94,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
@@ -478,7 +478,7 @@ export default {
pageNo: this.worker.pageNo,
// pageSize: this.worker.pageSize,
pageSize: 999999,
- // presence: 1,
+ presence: 1,
departmentId:'',
teamId:'',
}
@@ -528,7 +528,10 @@ export default {
// return
// };
// this.active++;
-
+ if(!this.addCourseForm.courseId && !this.addCourseForm.examPaperId){
+ this.$message.error('试卷和课件至少选择一项')
+ return
+ }
this.$refs[examForm].validate((valid) => {
if(valid){
if(this.active == 1) {
@@ -565,13 +568,6 @@ export default {
// this.$message.error('请选择培训结束时间')
// return
// }
-
- if(!this.addCourseForm.courseId && !this.addCourseForm.examPaperId){
- this.$message.error('试卷和课件至少选择一项')
- return
- }
-
-
},
last() {
if(this.active == 2) {
@@ -702,8 +698,8 @@ export default {
pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize,
subjectId: this.subjectId,
- trainBeginTime: this.starEndTime?this.starEndTime[0]:'',
- trainEndTime: this.starEndTime?this.starEndTime[1]:'',
+ trainBeginTime_begin: this.starEndTime?this.starEndTime[0]:'',
+ trainEndTime_end: this.starEndTime?this.starEndTime[1]:'',
projectSn: this.$store.state.projectSn,
}).then((result) => {
if (result.success) {