zm/nuttyreading-master-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-master-html

Browse Source
This commit is contained in:
始于初见
2024-08-29 09:13:57 +08:00
parent ab324f7ddd 0fb1ec16b5
commit 0cf0bdc2a3
4 changed files with 55 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/views/modules/course/chapter-add-or-update.vue
View File

@@ -90,6 +90,17 @@
> >
</quill-editor> </quill-editor>
</el-form-item> </el-form-item>
<el-form-item label="思考题" prop="questions" class="custom-chapter-height">
<!-- <el-input v-model="dataForm.content" placeholder="内容"></el-input> -->
<quill-editor
v-model="dataForm.questions"
ref="myQuillEditor1"
:options="editorOption1"
class="chapter_editor"
>
</quill-editor>
</el-form-item>
<!-- <el-form-item prop="sort" label-width="0"> --> <!-- <el-form-item prop="sort" label-width="0"> -->
<!-- <div v-if="this.dataForm.id"> --> <!-- <div v-if="this.dataForm.id"> -->
<div> <div>
@@ -212,6 +223,17 @@ export default {
}, },
placeholder: "请输入正文" placeholder: "请输入正文"
}, },
editorOption1: {
modules: {
history: {
delay: 1000,
maxStack: 50,
userOnly: false
},
toolbar: false
},
placeholder: "请输入思考题"
},
visible: false, visible: false,
props: { props: {
dictType: "", dictType: "",
@@ -249,6 +271,7 @@ export default {
imgUrl: "", imgUrl: "",
content: "", content: "",
sort: 1, sort: 1,
questions:''
// video_audio_url: [ // video_audio_url: [
// {url:'454545',type:0} // {url:'454545',type:0}
// ] // ]
@@ -354,6 +377,7 @@ export default {
sort: this.dataForm.sort, sort: this.dataForm.sort,
isAudition: this.dataForm.isAudition, isAudition: this.dataForm.isAudition,
videoList:this.video_audio_url, videoList:this.video_audio_url,
questions: this.dataForm.questions
}) })
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {

17
src/views/modules/miniClass/classAddType.vue
View File

@@ -41,7 +41,7 @@
教学时长:<span style="color:red">*</span> 教学时长:<span style="color:red">*</span>
</div> </div>
<el-form-item label="" prop="days" label-width="0"> <el-form-item label="" prop="days" label-width="0">
<el-input type="number" v-model="ClassModelForm.days"><template slot="append">天</template></el-input> <el-input type="number" v-model="ClassModelForm.days" :disabled="classModel && classModel.id"><template slot="append">天</template></el-input>
</el-form-item> </el-form-item>
<div style="margin:15px 0; font-size:14px; color:#606266"> <div style="margin:15px 0; font-size:14px; color:#606266">
课程设置: <span style="color:red">*</span> 课程设置: <span style="color:red">*</span>
@@ -77,9 +77,9 @@
教研室成员 教研室成员
</div> </div>
<div style="border:1px solid #eee; padding:10px; margin-bottom:15px"> <div style="border:1px solid #eee; padding:10px; margin-bottom:15px">
<el-form-item label="主任" prop="directorId"> <el-form-item label="主任" prop="directorId">
<!-- <el-input v-model="ClassModelForm.member.directorId"></el-input> --> <!-- <el-input v-model="ClassModelForm.member.directorId"></el-input> -->
<el-select <el-select
v-model="ClassModelForm.directorId" v-model="ClassModelForm.directorId"
filterable filterable
remote remote
@@ -97,7 +97,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="副主任" prop="ddirectorId"> <el-form-item label="副主任" prop="ddirectorId">
<el-select <el-select
v-model="ClassModelForm.ddirectorId" v-model="ClassModelForm.ddirectorId"
@@ -117,7 +117,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
<div style="text-align:center; margin-top:15px"> <div style="text-align:center; margin-top:15px">
@@ -228,7 +228,7 @@ export default {
}; };
}, },
mounted() { mounted() {
// console.log('激活了') console.log('激活了',this.classModel)
if (this.classModel) { if (this.classModel) {
console.log("编辑", this.classModel); console.log("编辑", this.classModel);
this.$nextTick(() => { this.$nextTick(() => {
@@ -255,7 +255,8 @@ export default {
} }
}); });
} else { } else {
console.log("添加"); console.log("添加",this.ClassModelForm);
} }
// this.getCourseList(); // this.getCourseList();
}, },
@@ -317,7 +318,7 @@ export default {
data: this.$http.adornData({ data: this.$http.adornData({
page: 1, page: 1,
limit: 10, limit: 10,
coursetitle: query, //关键字 courseName: query, //关键字
type: 1, type: 1,
medicalId: "", medicalId: "",
sociologyId: "" sociologyId: ""

36
src/views/modules/miniClass/miniClass.vue
View File

@@ -111,8 +111,8 @@
>创建班级</el-button >创建班级</el-button
> >
<el-button type="primary" @click="saveAdd" v-else>保 存</el-button <el-button type="primary" @click="saveAdd" v-else>保 存</el-button
><el-button type="success" @click="kaiban" v-if="miniClassForm.state == '0'">开班</el-button ><el-button type="success" @click="kaiban" v-if="miniClassForm.state == '0' && miniClassForm.id">开班</el-button
><el-button type="warning" @click="jieban" v-if="miniClassForm.state == '1'">结班</el-button> ><el-button type="warning" @click="jieban" v-if="miniClassForm.state == '1' && miniClassForm.id">结班</el-button>
</div> </div>
</div> </div>
<div v-show="!mainSet"> <div v-show="!mainSet">
@@ -210,7 +210,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="记分员" prop="counter"> <!-- <el-form-item label="记分员" prop="counter">
<el-select <el-select
class="userSelect" class="userSelect"
v-model="member.counter" v-model="member.counter"
@@ -231,7 +231,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div style="text-align:center"> <div style="text-align:center">
<el-button type="primary" @click="saveMember">保 存</el-button> <el-button type="primary" @click="saveMember">保 存</el-button>
@@ -397,16 +397,11 @@ export default {
return return
} }
this.$http({ this.$http({
url: this.$http.adornUrl('/common/class/editClass'), url: this.$http.adornUrl('/common/class/updateClassState'),
method: "post", method: "post",
data: this.$http.adornData({ data: this.$http.adornData({
id: this.miniClassForm.id, classId:this.miniClassForm.id,
modelId: this.miniClassForm.modelId, state: '1'
title: this.miniClassForm.title,
icon: this.miniClassForm.icon,
state: '1',
content: this.miniClassForm.content
// createUserid: "10185"
}) })
}) })
.then(({ data }) => { .then(({ data }) => {
@@ -414,23 +409,18 @@ export default {
this.$message.success("操作成功"); this.$message.success("操作成功");
this.handleClose(); this.handleClose();
}else{ }else{
this.$message.error("操作失败"); this.$message.error(data.msg);
} }
}) })
}, },
// 结班 // 结班
jieban(){ jieban(){
this.$http({ this.$http({
url: this.$http.adornUrl('/common/class/editClass'), url: this.$http.adornUrl('/common/class/updateClassState'),
method: "post", method: "post",
data: this.$http.adornData({ data: this.$http.adornData({
id: this.miniClassForm.id, classId:this.miniClassForm.id,
modelId: this.miniClassForm.modelId, state: '2'
title: this.miniClassForm.title,
icon: this.miniClassForm.icon,
state: '2',
content: this.miniClassForm.content
// createUserid: "10185"
}) })
}) })
.then(({ data }) => { .then(({ data }) => {
@@ -438,7 +428,7 @@ export default {
this.$message.success("操作成功"); this.$message.success("操作成功");
this.handleClose(); this.handleClose();
}else{ }else{
this.$message.error("操作失败"); this.$message.error(data.msg);
} }
}) })
}, },

18
src/views/modules/miniClass/miniClassList.vue
View File

@@ -164,24 +164,24 @@
width="800px" width="800px"
:close="setStudentClose" :close="setStudentClose"
> >
<div> <div>
<el-table :data="studentList"> <el-table :data="studentList">
<el-table-column <el-table-column
property="id" property="student.id"
label="学员id" label="学员id"
width="150" width="150"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
property="nickname" property="student.nickname"
label="学员名称" label="学员名称"
width="150" width="150"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
property="vip" property="student.vip"
label="学员身份" label="学员身份"
width="200" width="200"
></el-table-column> ></el-table-column>
<el-table-column property="tel" label="手机号"></el-table-column> <el-table-column property="student.tel" label="手机号"></el-table-column>
<el-table-column property="" label="操作"> <el-table-column property="" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="warning" @click="outClass(scope.row)" <el-button type="warning" @click="outClass(scope.row)"
@@ -209,8 +209,8 @@ export default {
studentList: [], // 学员列表 studentList: [], // 学员列表
dataForm: { dataForm: {
title: "", title: "",
type: "0", type: "",
state: "0" state: ""
}, },
// courseId: {}, // courseId: {},
course: null, course: null,
@@ -332,7 +332,7 @@ export default {
// 踢出班级 // 踢出班级
async outClass(row) { async outClass(row) {
let that = this; let that = this;
this.$confirm(`确定将学员电话为：${row.tel}踢出班级？`, "提示", { this.$confirm(`确定将学员电话为：${row.student.tel}踢出班级？`, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
@@ -344,7 +344,7 @@ export default {
method: "post", method: "post",
data: this.$http.adornData({ data: this.$http.adornData({
classId: that.miniClass.id, classId: that.miniClass.id,
userId: row.id userId: row.student.id
}) })
}).then(async ({ data }) => { }).then(async ({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {