ancong
/
student-dx-intelligence-main
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

This commit is contained in:
gjz 2025-04-23 16:31:47 +08:00
parent 6d4deca501
commit 1218214a4c
2 changed files with 342 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/courseStatistics/sectionInfo.vue
View File

@ -4,12 +4,18 @@
<el-col :span="24">
<el-row class="page_p">
<!-- <el-col :span="6"><span class="page_p_txt">学期：{{ termname }}</span></el-col> -->
<el-col :span="8">
<el-col :span="12">
<span class="page_p_txt">节次： {{ WeekDay }} ({{ Schedulename }})</span>
</el-col>
<el-col :span="5"><span class="page_p_txt">教室：{{ ClassroomName }}</span></el-col>
<el-col :span="6"><span class="page_p_txt">课程：{{ CourceName }}</span></el-col>
<el-col :span="5"> <span class="page_p_txt">教师：{{ TeacherName }}</span></el-col>
<el-col :span="12"><span class="page_p_txt">教室：{{ ClassroomName }}</span></el-col>
</el-row>
</el-col>
</el-row>
<el-row style="line-height: 62px; padding: 0 30px">
<el-col :span="24">
<el-row class="page_p">
<el-col :span="12"><span class="page_p_txt">课程：{{ CourceName }}</span></el-col>
<el-col :span="12"> <span class="page_p_txt">教师：{{ TeacherName }}</span></el-col>
</el-row>
<!-- <el-row class="page_p">
<el-col :span="6"><span class="page_p_txt">上课日期：{{ shkDate }}</span></el-col>

182
src/views/teach-log/teach-log.vue
View File

@ -352,6 +352,7 @@
</template>
<script>
import { ElMessage, ElMessageBox } from 'element-plus'
import axios from "axios";
import {
getToken,
@ -515,18 +516,12 @@ export default {
ClassroomCode: [
{ required: true, message: '教室不能为空', trigger: 'change' },
],
ClassCode: [
{ required: true, message: '班级不能为空', trigger: 'change' },
],
Date: [
{ required: true, message: '日期不能为空', trigger: 'change' },
],
Time: [
{ required: true, message: '时间不能为空', trigger: 'change' },
],
TeacherNumber: [
{ required: true, message: '教师不能为空', trigger: 'change' },
],
Weeks: [
{ required: true, message: '周次不能为空', trigger: 'change' },
],
@ -708,7 +703,7 @@ export default {
this.kshfile = false;
this.classId = '';
this.SelectClassList1('','s')
//this.SelectClassList1('','s')
},
modelteacher() {
// debugger;
@ -1265,11 +1260,13 @@ export default {
getedit({ gtid: id }).then((res) => {
let data = res;
var ClassCodeNew = (data.ClassCode == ''||data.ClassCode==undefined||data.ClassCode==null) ? [] : data.ClassCode.replace(/"([^"]*)"/, '$1').split(',')
var TeacherNumberNew = (data.TeacherNumber == ''||data.TeacherNumber==undefined||data.TeacherNumber==null) ? [] : data.TeacherNumber.replace(/"([^"]*)"/, '$1').split(',')
// 时间
const countTime = this.convertToTimeRange(data.StartTime, data.EndTime);
console.log(data.ClassCode.replace(/"([^"]*)"/, '$1').split(','));
/* this.formItem = {
ClassCode: data.ClassCode.replace(/"([^"]*)"/, '$1').split(','),
} */
@ -1285,7 +1282,7 @@ export default {
SchoolAreaCode: data.SchoolAreaCode,
CollegeCode: data.CollegeCode,
MajorCode: data.MajorCode,
ClassCode: data.ClassCode.replace(/"([^"]*)"/, '$1').split(','),
ClassCode: ClassCodeNew,
BuildingCode: data.BuildingCode,
Date: data.Date,
falseDate: data.falseDate,
@ -1306,7 +1303,7 @@ export default {
CourceType: data.CourceType == "" ? "必修" : data.CourceType,
IsByDate:data.IsByDate==true?'1':'2',
TeacherNumber:data.TeacherNumber == undefined ? '' : data.TeacherNumber.replace(/"([^"]*)"/, '$1').split(',')
TeacherNumber:TeacherNumberNew
// SchoolArea: '', //校区
// Term: '', //学期
// College: '', //学院
@ -1413,7 +1410,6 @@ export default {
},
submitForm(formName) {
//新增提交
let vm = this;
// debugger
this.$refs[formName].validate((valid) => {
if (valid) {
@ -1426,7 +1422,69 @@ export default {
});
return false;
} */
if ((!this.formItem.TeacherNumber || this.formItem.TeacherNumber.length == 0) && (!this.formItem.ClassCode || this.formItem.ClassCode.length == 0)) {
ElMessageBox.confirm(
'未选择上课班级和授课教师. 确定提交?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
).then(() => {
this.submitFormFinally()
}).catch(() => {
ElMessage({
type: 'info',
message: '已取消提交，请继续选择',
})
})
} else if (!this.formItem.TeacherNumber || this.formItem.TeacherNumber.length == 0) {
ElMessageBox.confirm(
'未选择授课教师. 确定提交?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
).then(() => {
this.submitFormFinally()
}).catch(() => {
ElMessage({
type: 'info',
message: '已取消提交，请继续选择',
})
})
} else if (!this.formItem.ClassCode || this.formItem.ClassCode.length == 0) {
ElMessageBox.confirm(
'未选择上课班级. 确定提交?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
).then(() => {
this.submitFormFinally()
}).catch(() => {
ElMessage({
type: 'info',
message: '已取消提交，请继续选择',
})
})
} else{
this.submitFormFinally()
}
} else {
// debugger
// console.log('验证失败');
return false;
}
});
},
submitFormFinally() {
let vm = this;
this.classformItem.MajorCode = new Array(this.formItem.ClassCode.length).fill('e3649c').join(',')
console.log(this.formItem.Date);
console.log(this.formItem.Time);
@ -1434,13 +1492,17 @@ export default {
const arrT = this.formItem.TeacherNumber
const objT = this.NewClassList
const commonElements = arrT.map(number =>
var commonElements
var namesString
if(arrT.length!=0){
commonElements = arrT.map(number =>
objT.find(obj => obj.Number === number)
).filter(Boolean);
const namesString = commonElements.map(obj => obj.Name).join(', ');
namesString = commonElements.map(obj => obj.Name).join(', ');
this.formItem.TeacherTitle = commonElements[0].Title
}
let datas = {
AcademicNumber: '', //自动生成，不需填写
@ -1471,7 +1533,7 @@ export default {
IsByDate: this.formItem.IsByDate == '1' ? true : false,
TimeInterval: 0,
TeachingForm: 0,
TeacherNumber:this.formItem.TeacherNumber == undefined ? '' : this.formItem.TeacherNumber.join(','),
TeacherNumber: (!this.formItem.TeacherNumber || this.formItem.TeacherNumber.length == 0) ? '' : this.formItem.TeacherNumber.join(','),
TeacherName: namesString, //教师姓名
};
postaddinfo(datas).then((res) => {
@ -1618,14 +1680,7 @@ export default {
.catch((err) => {
// console.log(err);
});
} else {
// debugger
// console.log('验证失败');
return false;
}
});
},
editsubmitForm(formName) {
//修改提交
let vm = this;
@ -1642,21 +1697,85 @@ export default {
return false;
}
if ((!this.formItem.TeacherNumber || this.formItem.TeacherNumber.length == 0) && (!this.formItem.ClassCode || this.formItem.ClassCode.length == 0)) {
ElMessageBox.confirm(
'未选择上课班级和授课教师. 确定提交?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
).then(() => {
this.editsubmitFormFin()
}).catch(() => {
ElMessage({
type: 'info',
message: '已取消提交，请继续选择',
})
})
} else if (!this.formItem.TeacherNumber || this.formItem.TeacherNumber.length == 0) {
ElMessageBox.confirm(
'未选择授课教师. 确定提交?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
).then(() => {
this.editsubmitFormFin()
}).catch(() => {
ElMessage({
type: 'info',
message: '已取消提交，请继续选择',
})
})
} else if (!this.formItem.ClassCode || this.formItem.ClassCode.length == 0) {
ElMessageBox.confirm(
'未选择上课班级. 确定提交?',
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
).then(() => {
this.editsubmitFormFin()
}).catch(() => {
ElMessage({
type: 'info',
message: '已取消提交，请继续选择',
})
})
} else{
this.editsubmitFormFin()
}
} else {
// console.log('error submit!!');
return false;
}
});
},
editsubmitFormFin(){
let vm = this;
this.classformItem.MajorCode = new Array(this.formItem.ClassCode.length).fill('e3649c').join(',')
const arrT = this.formItem.TeacherNumber
const objT = this.NewClassList
const commonElements = arrT.map(number =>
var commonElements
var namesString
if(arrT.length!=0){
commonElements = arrT.map(number =>
objT.find(obj => obj.Number === number)
).filter(Boolean);
const namesString = commonElements.map(obj => obj.Name).join(', ');
namesString = commonElements.map(obj => obj.Name).join(', ');
this.formItem.TeacherTitle = commonElements[0].Title
}
let datas = {
AcademicNumber: vm.formItem.AcademicNumber, //自动生成，不需填写
YearTerm: vm.formItem.YearTerm, //学期，必填
@ -1691,6 +1810,7 @@ export default {
TeacherNumber:this.formItem.TeacherNumber == undefined ? '' : this.formItem.TeacherNumber.join(','),
TeacherName: namesString, //教师姓名
};
debugger
posteditinfo(datas).then((res) => {
let data = res;
if (data == 1) {
@ -1834,13 +1954,7 @@ export default {
.catch((err) => {
// console.log(err);
});
} else {
// console.log('error submit!!');
return false;
}
});
},
//新增重置
resetForm(formName) {
this.defaultValues();//默认值