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

班级管理管理成员设置

Browse Source
This commit is contained in:
始于初见
2025-08-25 11:14:22 +08:00
parent a8f17dde98
commit ce6f877d4a
2 changed files with 192 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/index.js
View File

@@ -23,7 +23,7 @@ module.exports = {
}, },
// Various Dev Server settings // Various Dev Server settings
host: '192.168.110.162', // can be overwritten by process.env.HOST host: '192.168.110.160', // can be overwritten by process.env.HOST
port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true, autoOpenBrowser: true,
errorOverlay: true, errorOverlay: true,

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

@@ -48,10 +48,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="名称" prop="title"> <el-form-item label="名称" prop="title">
<el-input v-model="miniClassForm.title" ></el-input> <el-input v-model="miniClassForm.title"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="目标学员数" prop="number"> <el-form-item label="目标学员数" prop="number">
<el-input v-model="miniClassForm.number" ></el-input> <el-input v-model="miniClassForm.number"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="封面图" prop="icon"> <el-form-item label="封面图" prop="icon">
<!-- <el-input v-model="miniClassForm.icon"></el-input> --> <!-- <el-input v-model="miniClassForm.icon"></el-input> -->
@@ -68,7 +68,6 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="微信群二维码" prop="qrcode"> <el-form-item label="微信群二维码" prop="qrcode">
<el-upload <el-upload
class="avatar-uploader icon-uploader" class="avatar-uploader icon-uploader"
:action="baseUrl + '/oss/fileoss'" :action="baseUrl + '/oss/fileoss'"
@@ -110,14 +109,18 @@
<el-button type="primary" @click="saveAdd" v-if="!miniClassForm.id" <el-button type="primary" @click="saveAdd" v-if="!miniClassForm.id"
>创建班级</el-button >创建班级</el-button
> >
<el-button type="primary" @click="saveAdd" v-else>保 存</el-button <el-button type="primary" @click="saveAdd" v-else>保 存</el-button>
>
<template v-if="miniClassForm.id">
<template v-if="miniClassForm.id"> <el-button
<el-button type="success" @click="kaiban" v-if="miniClassForm.state == '0' ">开 班</el-button type="success"
><el-button type="warning" @click="jieban" v-if="showOverbtn" @click="kaiban"
>结 班</el-button> v-if="miniClassForm.state == '0'"
</template> >开 班</el-button
><el-button type="warning" @click="jieban" v-if="showOverbtn"
>结 班</el-button
>
</template>
</div> </div>
</div> </div>
<div v-show="!mainSet"> <div v-show="!mainSet">
@@ -144,7 +147,7 @@
<el-option <el-option
v-for="item in userList" v-for="item in userList"
:key="item.tel" :key="item.tel"
:label="item.tel+'('+(item.name||item.nickname)+')'" :label="item.tel + '(' + (item.name || item.nickname) + ')'"
:value="item.id" :value="item.id"
> >
</el-option> </el-option>
@@ -165,12 +168,12 @@
<el-option <el-option
v-for="item in userList" v-for="item in userList"
:key="item.tel" :key="item.tel"
:label="item.tel+'('+(item.name||item.nickname)+')'" :label="item.tel + '(' + (item.name || item.nickname) + ')'"
:value="item.id" :value="item.id"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="学委" prop="learner"> <el-form-item label="学委" prop="learner">
<el-select <el-select
class="userSelect" class="userSelect"
@@ -186,12 +189,12 @@
<el-option <el-option
v-for="item in userList" v-for="item in userList"
:key="item.tel" :key="item.tel"
:label="item.tel+'('+(item.name||item.nickname)+')'" :label="item.tel + '(' + (item.name || item.nickname) + ')'"
:value="item.id" :value="item.id"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="评分员" prop="scorer"> <el-form-item label="评分员" prop="scorer">
<el-select <el-select
class="userSelect" class="userSelect"
@@ -208,7 +211,7 @@
<el-option <el-option
v-for="item in userList" v-for="item in userList"
:key="item.tel" :key="item.tel"
:label="item.tel+'('+(item.name||item.nickname)+')'" :label="item.tel + '(' + (item.name || item.nickname) + ')'"
:value="item.id" :value="item.id"
> >
</el-option> </el-option>
@@ -268,26 +271,28 @@ export default {
miniClassRules: { miniClassRules: {
modelId: [{ required: true, message: "必填项", trigger: "blur" }], modelId: [{ required: true, message: "必填项", trigger: "blur" }],
title: [{ required: true, message: "必填项", trigger: "blur" }], title: [{ required: true, message: "必填项", trigger: "blur" }],
number: [{ required: true, message: "请填入招收的学员人数", trigger: "blur" }], number: [
{ required: true, message: "请填入招收的学员人数", trigger: "blur" }
]
}, },
memberRules:{ memberRules: {
monitor: [{ required: true, message: "必填项", trigger: "blur" }], monitor: [{ required: true, message: "必填项", trigger: "blur" }],
dmonitor: [{ required: true, message: "必填项", trigger: "blur" }], dmonitor: [{ required: true, message: "必填项", trigger: "blur" }],
learner: [{ required: true, message: "必填项", trigger: "blur" }], learner: [{ required: true, message: "必填项", trigger: "blur" }],
scorer: [{ required: true, message: "必填项", trigger: "blur" }], scorer: [{ required: true, message: "必填项", trigger: "blur" }],
counter: [{ required: true, message: "必填项", trigger: "blur" }] counter: [{ required: true, message: "必填项", trigger: "blur" }]
}, },
remoteMethodLoading: false, remoteMethodLoading: false,
imageUrl: "", imageUrl: "",
qrcodeUrl:"", qrcodeUrl: "",
miniClassForm: { miniClassForm: {
title: "", title: "",
id: undefined, id: undefined,
number:30, number: 30,
content: "", content: "",
icon: "", icon: "",
state: "0", state: "0",
qrcode:'', qrcode: "",
modelId: undefined modelId: undefined
}, },
member: { member: {
@@ -324,15 +329,13 @@ export default {
}, },
placeholder: "请输入正文" placeholder: "请输入正文"
}, },
showOverbtn: false, // 是否显示结班按钮 showOverbtn: false // 是否显示结班按钮
}; };
}, },
mounted() { mounted() {
if (this.miniClass) { if (this.miniClass) {
console.log("编辑小班", this.miniClass); console.log("编辑小班", this.miniClass);
this.getClassInfo() this.getClassInfo();
if (this.miniClass.classModel.id) { if (this.miniClass.classModel.id) {
this.modelList.push(this.miniClass.classModel); this.modelList.push(this.miniClass.classModel);
} }
@@ -343,36 +346,40 @@ export default {
this.qrcodeUrl = this.miniClass.qrcode; this.qrcodeUrl = this.miniClass.qrcode;
} }
this.miniClassForm = this.miniClass; this.miniClassForm = this.miniClass;
if(this.miniClass.classUsers.length > 0){ if (this.miniClass.classUsers.length > 0) {
var list = [...this.miniClass.classUsers] var list = [...this.miniClass.classUsers];
// this.userList = [...this.miniClass.classUsers] // this.userList = [...this.miniClass.classUsers]
list.forEach( item => { list.forEach(item => {
let name = ''; let name = "";
if(item.name){ if (item.name) {
name = item.name name = item.name;
}else if(item.nickname){ } else if (item.nickname) {
name = item.nickname name = item.nickname;
} }
if(item.role == '1'){ if (item.role == "1") {
this.member.monitor = item.tel + '(' +name+')' this.member.monitor = item.userId;
} }
if(item.role == '2'){ if (item.role == "2") {
this.member.dmonitor = item.tel + '(' +name+')' this.member.dmonitor = item.userId ;
} }
if(item.role == '3'){ if (item.role == "3") {
this.member.learner = item.tel + '(' +name+')' this.member.learner = item.userId;
} }
if(item.role == '4'){ if (item.role == "4") {
this.member.scorer.push(item.tel + '(' +name+')') this.member.scorer.push(item.userId );
} }
if(item.role == '5'){ if (item.role == "5") {
this.member.counter.push(item.tel + '(' +name+')') this.member.counter.push(item.userId);
} }
item.id = item.userId item.id = item.userId;
this.userList.push(item) this.userList.push(item);
}) });
console.log("处理后的开班日期",this.miniClassForm.mstartseconds, this.miniClassForm.nowseconds); console.log(
"处理后的开班日期",
this.miniClassForm.mstartseconds,
this.miniClassForm.nowseconds
);
} }
} else { } else {
console.log("添加小班"); console.log("添加小班");
@@ -381,101 +388,116 @@ export default {
methods: { methods: {
// 获取小班详情 // 获取小班详情
async getClassInfo() { async getClassInfo() {
console.log('班级详情') console.log("班级详情");
this.$http({ this.$http({
url: this.$http.adornUrl("/common/class/getClassInfo"), url: this.$http.adornUrl("/common/class/getClassInfo"),
method: "post", method: "post",
data: this.$http.adornData({ data: this.$http.adornData({
classId: this.miniClass.id classId: this.miniClass.id
}) })
}) }).then(async ({ data }) => {
.then(async ({ data }) => { if (data && data.code === 0) {
this.miniClassForm.startTime = data.result.class.startTime;
if (data && data.code === 0) { var strStartTime = new Date(this.miniClassForm.startTime);
this.miniClassForm.startTime = data.result.class.startTime; var StartTime = strStartTime.getTime();
var strStartTime = new Date(this.miniClassForm.startTime) console.log(";shijia", StartTime, data.result.class.startTime);
var StartTime = strStartTime.getTime() var nowTime = await this.getServerTime(); // 服务器当前时间
console.log(';shijia',StartTime, data.result.class.startTime) console.log("服务器时间", nowTime);
var nowTime = await this.getServerTime() // 服务器当前时间 this.miniClassForm.mstartseconds = StartTime;
console.log('服务器时间',nowTime) this.miniClassForm.nowseconds = nowTime;
this.miniClassForm.mstartseconds = StartTime // if(this.miniClass.classModel.isExam == 0){ // 没有考试模块
this.miniClassForm.nowseconds = nowTime // var off70 = undefined // 时长过70%显示结班按钮天数
// if(this.miniClass.classModel.isExam == 0){ // 没有考试模块 // off70 = Math.ceil(parseInt(this.miniClass.classModel.days) * 0.7)
// var off70 = undefined // 时长过70%显示结班按钮天数 var endminiSecond =
// off70 = Math.ceil(parseInt(this.miniClass.classModel.days) * 0.7) this.miniClass.classModel.days * 1000 * 60 * 60 * 24;
var endminiSecond = this.miniClass.classModel.days * 1000 * 60 * 60 * 24 console.log("时间比较", endminiSecond + StartTime, nowTime);
console.log('时间比较', (endminiSecond + StartTime), nowTime) if (StartTime > 0 && endminiSecond + StartTime <= nowTime) {
if (StartTime > 0 && (endminiSecond + StartTime) <= nowTime) { console.log("显示结班按钮");
console.log('显示结班按钮'); this.showOverbtn = true;
this.showOverbtn = true } else {
} else { this.showOverbtn = false;
this.showOverbtn = false console.log("不显示");
console.log('不显示'); }
} } else {
}else{ this.showOverbtn = false;
this.showOverbtn = false }
} // }else{
// }else{ // this.miniClassForm.startTime = undefined
// this.miniClassForm.startTime = undefined // }
// } });
})
}, },
// 获取服务器时间 // 获取服务器时间
async getServerTime() { async getServerTime() {
var time = undefined var time = undefined;
await this.$http({ await this.$http({
url: this.$http.adornUrl("/common/classExam/getServerTime"), url: this.$http.adornUrl("/common/classExam/getServerTime"),
method: "post", method: "post",
data: this.$http.adornData({}) data: this.$http.adornData({})
}) }).then(async ({ data }) => {
.then( async ({ data }) => { if (data && data.code === 0) {
if (data && data.code === 0) { time = data.serverTime;
time = data.serverTime; }
}} });
) return time;
return time },
},
// 开班 // 开班
kaiban(){ kaiban() {
if(this.miniClass.classUsers.length == 0 || !this.miniClass.classUsers){ if (this.miniClass.classUsers.length == 0 || !this.miniClass.classUsers) {
this.$message.error('请先设置管理成员后再进行开班操作') this.$message.error("请先设置管理成员后再进行开班操作");
return return;
} }
this.$http({ this.$http({
url: this.$http.adornUrl('/common/class/updateClassState'), url: this.$http.adornUrl("/common/class/updateClassState"),
method: "post", method: "post",
data: this.$http.adornData({ data: this.$http.adornData({
classId:this.miniClassForm.id, classId: this.miniClassForm.id,
state: '1' state: "1"
}) })
}) }).then(({ data }) => {
.then(({ data }) => { if (data && data.code === 0) {
if (data && data.code === 0) { this.$message.success("操作成功");
this.$message.success("操作成功"); this.handleClose();
this.handleClose(); } else {
}else{ this.$message.error(data.msg);
this.$message.error(data.msg); }
} });
})
}, },
// 结班 // 结班
jieban(){ jieban() {
this.$http({ this.$http({
url: this.$http.adornUrl('/common/class/updateClassState'), url: this.$http.adornUrl("/common/class/updateClassState"),
method: "post", method: "post",
data: this.$http.adornData({ data: this.$http.adornData({
classId:this.miniClassForm.id, classId: this.miniClassForm.id,
state: '2' state: "2"
}) })
}) }).then(({ data }) => {
.then(({ data }) => { if (data && data.code === 0) {
if (data && data.code === 0) { this.$message.success("操作成功");
this.$message.success("操作成功"); this.handleClose();
this.handleClose(); } else {
}else{ this.$message.error(data.msg);
this.$message.error(data.msg); }
} });
}) },
safeProcessData(obj) {
const processed = {};
const pattern = /\([^)]*\)/g; // 匹配括号及内容的正则
for (const key in obj) {
if (obj.hasOwnProperty(key)) {
const value = obj[key];
// 只对字符串类型进行处理，其他类型保持原样
if (typeof value === "string") {
processed[key] = value.replace(pattern, "");
} else {
// 非字符串类型（数字、null、undefined等）直接保留
processed[key] = value;
}
}
}
return processed;
}, },
// 保存成员信息 // 保存成员信息
saveMember() { saveMember() {
@@ -486,29 +508,31 @@ export default {
// _myist = _Str.split(',') // _myist = _Str.split(',')
// _myist.push(...this.member.scorer) // _myist.push(...this.member.scorer)
// _myist.push(...this.member.counter) // _myist.push(...this.member.counter)
// console.log('_Str',_myist,this.member.scorer,this.member.counter) // console.log('_Str',_myist,this.member.scorer,this.member.counter)
var url = '' var url = "";
this.$http({ this.$http({
url: this.$http.adornUrl("/common/class/setUserRole"), url: this.$http.adornUrl("/common/class/setUserRole"),
method: "post", method: "post",
data: this.$http.adornData({ data: this.$http.adornData(
classId: this.miniClassForm.id, {
monitor: this.member.monitor+'', //班长 classId: this.miniClassForm.id,
dmonitor: this.member.dmonitor+'', //2班长 monitor: this.member.monitor + "", //班长
learner: this.member.learner+'', //学习委员 dmonitor: this.member.dmonitor + "", //2班长
scorer: this.member.scorer.join(','), //评分员 learner: this.member.learner + "", //学习委员
counter: this.member.counter.join(',') //记分员 scorer: this.member.scorer.join(","), //评分员
}) counter: this.member.counter.join(",") //记分员
}) }
.then(({ data }) => { )
if (data && data.code === 0) { }).then(({ data }) => {
this.$message.success("设置成功"); if (data && data.code === 0) {
this.handleClose(); this.$message.success("设置成功");
}else{ this.handleClose();
this.$message.error(data.msg); } else {
} this.$message.error(data.msg);
}) }
}}) });
}
});
}, },
// 创建/编辑班级 // 创建/编辑班级
saveAdd() { saveAdd() {
@@ -530,18 +554,17 @@ export default {
state: this.miniClassForm.state, state: this.miniClassForm.state,
content: this.miniClassForm.content, content: this.miniClassForm.content,
qrcode: this.miniClassForm.qrcode, qrcode: this.miniClassForm.qrcode,
number:Number(this.miniClassForm.number) number: Number(this.miniClassForm.number)
// createUserid: "10185" // createUserid: "10185"
}) })
}) }).then(({ data }) => {
.then(({ data }) => { if (data && data.code === 0) {
if (data && data.code === 0) { this.$message.success("操作成功");
this.$message.success("操作成功"); this.handleClose();
this.handleClose(); } else {
}else{ this.$message.error("提交失败");
this.$message.error("提交失败"); }
} });
})
} else { } else {
this.$message.error("请完成表单的填写"); this.$message.error("请完成表单的填写");
} }
@@ -558,7 +581,7 @@ export default {
page: 1, page: 1,
limit: 10, limit: 10,
title: query, title: query,
type:'' type: ""
}) })
}) })
.then(({ data }) => { .then(({ data }) => {
@@ -611,7 +634,7 @@ export default {
this.qrcodeUrl = URL.createObjectURL(file.raw); this.qrcodeUrl = URL.createObjectURL(file.raw);
// console.log("this.imageUrl", this.imageUrl, file, res); // console.log("this.imageUrl", this.imageUrl, file, res);
this.$message.success("上传成功"); this.$message.success("上传成功");
}, },
iconbeforeAvatarUpload(file) { iconbeforeAvatarUpload(file) {
this.$message.success("正在上传"); this.$message.success("正在上传");
}, },
@@ -652,9 +675,9 @@ export default {
}, },
handleClose() { handleClose() {
// this.$nextTick(() => {555 // this.$nextTick(() => {555
this.userList = [] this.userList = [];
this.imageUrl = '' this.imageUrl = "";
this.qrcodeUrl = '' this.qrcodeUrl = "";
this.$refs["miniClassForm"].resetFields(); this.$refs["miniClassForm"].resetFields();
// }); // });
this.$emit("handleClose"); this.$emit("handleClose");