From 0c272400303ba7fa573d950e1f1eb9b854a18b44 Mon Sep 17 00:00:00 2001 From: "@fawn-nine" <1271023382@qq.com> Date: Wed, 11 Sep 2024 16:00:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=98=E7=9B=AE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/miniClass/classAddType.vue | 115 ++++++++++++++++-- src/views/modules/miniClass/miniClassList.vue | 3 +- 2 files changed, 103 insertions(+), 15 deletions(-) diff --git a/src/views/modules/miniClass/classAddType.vue b/src/views/modules/miniClass/classAddType.vue index fd268c3..73e38cb 100644 --- a/src/views/modules/miniClass/classAddType.vue +++ b/src/views/modules/miniClass/classAddType.vue @@ -121,24 +121,29 @@ 包含 不包含 +
+ +
-
+
+ +
- +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+ +
+
课程设置: * @@ -286,7 +333,13 @@ export default { ClassModelRules: { title: [{ required: true, message: "必填项", trigger: "blur" }], courseIds: [{ required: true, message: "必填项", trigger: "blur" }], - days: [{ required: true, message: "必填项", trigger: "blur" }] + days: [{ required: true, message: "必填项", trigger: "blur" }], + isExam: [{ required: true, message: "必填项", trigger: "blur" }], + examScore: [{ required: true, message: "必填项", trigger: "blur" }], + examDays: [{ required: true, message: "必填项", trigger: "blur" }], + singleChoice: [{ required: true, message: "必填项", trigger: "blur" }], + multipleChoice: [{ required: true, message: "必填项", trigger: "blur" }], + examTime: [{ required: true, message: "必填项", trigger: "blur" }], }, remoteMethodLoading: false, ClassModelForm: { @@ -308,7 +361,11 @@ export default { experienceScore: 10, examScore: 60, isExam: 1, - examDays: undefined // 考试天数 + examDays: undefined, // 考试天数 + singleChoice:60, + multipleChoice:40, + examTime:45 , // 考试时长 + }, courseList: [], typeOptions: [ @@ -325,6 +382,8 @@ export default { label: "精英班" } ], + flag: false, + userList: [], // 富文本编辑器配置 editorOption: { @@ -378,6 +437,14 @@ export default { if (this.classModel.ddirectorId == 0) { this.ClassModelForm.ddirectorId = null; } + if (this.classModel.examProportion != '') { + var ss = this.classModel.examProportion.split(":"); + this.ClassModelForm.singleChoice = parseInt(ss[0]); + this.ClassModelForm.multipleChoice = parseInt(ss[1]); + + } + + }); } else { console.log("添加", this.ClassModelForm); @@ -391,14 +458,25 @@ export default { this.ClassModelForm.ddirectorId ); if (this.ClassModelForm.isExam == 1) { - if(!this.ClassModelForm.examDays || this.ClassModelForm.examDays == 0) { - this.$message.error("请设置考试周期需要的天数"); - this.showExameDays = true; - return; - } + // if(!this.ClassModelForm.examDays || this.ClassModelForm.examDays == 0) { + // this.$message.error("请设置考试周期需要的天数"); + // this.showExameDays = true; + // return; + // } } else { this.ClassModelForm.examDays = 0; } + if(this.ClassModelForm.isExam == 1){ + if(this.ClassModelForm.multipleChoice == this.ClassModelForm.singleChoice && this.ClassModelForm.singleChoice == 0 ){ + this.$message.error("题目的总数至少大于0"); + return; + } + } + if(this.ClassModelForm.examTime == 0){ + this.$message.error("考试时长至少大于0"); + return; + + } if (this.ClassModelForm.days <= 0) { this.$message.error("学习时长不可为0"); return; @@ -412,8 +490,12 @@ export default { return; } - this.$refs["ClassModelForm"].validate(valid => { + this.$refs["ClassModelForm"].validate(valid => { if (valid) { + if(this.flag){ + return + } + this.flag = true; if ( this.ClassModelForm.type == "0" && this.ClassModelForm.courseIds.length > 1 @@ -446,9 +528,12 @@ export default { experienceScore: parseInt(this.ClassModelForm.experienceScore), isExam: this.ClassModelForm.isExam, examScore: parseInt(this.ClassModelForm.examScore), - examDays:parseInt(this.ClassModelForm.examDays), // 考试周期天数 + examDays:parseInt(this.ClassModelForm.examDays), // 考试周期天数--------- + examProportion: this.ClassModelForm.singleChoice + ":" + this.ClassModelForm.multipleChoice, // 单选:多选 + examTime:parseInt(this.ClassModelForm.examTime), // 考试时长 }) }).then(({ data }) => { + this.flag = false; if (data && data.code == 0) { this.$message.success("操作成功"); this.$nextTick(() => { @@ -457,6 +542,9 @@ export default { } else { this.$message.error(data.msg); } + }).catch(e =>{ + this.flag = false; + this.$message.error(e.msg); }); } }); @@ -588,5 +676,6 @@ export default { .courseSelect { width: 100% !important; } +.mt15{margin-top: 20px;} // .line{border-bottom: 1px solid #ddd;} diff --git a/src/views/modules/miniClass/miniClassList.vue b/src/views/modules/miniClass/miniClassList.vue index 262ca20..4257475 100644 --- a/src/views/modules/miniClass/miniClassList.vue +++ b/src/views/modules/miniClass/miniClassList.vue @@ -66,8 +66,7 @@ label="小班名称" > - Date: Wed, 11 Sep 2024 16:27:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=B7=E5=BC=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/miniClass/classAddType.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/modules/miniClass/classAddType.vue b/src/views/modules/miniClass/classAddType.vue index 73e38cb..732e789 100644 --- a/src/views/modules/miniClass/classAddType.vue +++ b/src/views/modules/miniClass/classAddType.vue @@ -122,7 +122,7 @@ 不包含 -
+
-
+
-
+
-
+
-
+