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-02-25 14:41:40 +08:00
parent c05d82e32e
commit eb5374f7ff
1 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,7 +146,7 @@
<el-form label-position="right" ref="ruleForm" :rules="rules" label-width="150px" :model="formItem"> <el-form label-position="right" ref="ruleForm" :rules="rules" label-width="150px" :model="formItem">
<!-- 新增__教室 --> <!-- 新增__教室 -->
<el-form-item label="请选择教室" prop="ClassroomCode"> <el-form-item label="请选择教室" prop="ClassroomCode">
<el-select v-model="formItem.ClassroomCode" placeholder="教室" clearable size="small" <el-select v-model="formItem.ClassroomCode" placeholder="教室" clearable
class="ml-5 seachbox_input"> class="ml-5 seachbox_input">
<el-option v-for="item in AddClassroonList" :key="item.name" :label="item.name" <el-option v-for="item in AddClassroonList" :key="item.name" :label="item.name"
:value="item.value" /> :value="item.value" />
@ -157,7 +157,7 @@
<!-- <el-button type="primary" round @click="Newbox"><el-icon size="20"> <!-- <el-button type="primary" round @click="Newbox"><el-icon size="20">
<Plus /> <Plus />
</el-icon> 添加</el-button> --> </el-icon> 添加</el-button> -->
<el-select ref="itemSelectclass" filterable multiple v-model="classformItem.ClassCode" <el-select ref="itemSelectclass" filterable multiple v-model="formItem.ClassCode"
placeholder="班级" clearable @change="classSelectclasscode"> placeholder="班级" clearable @change="classSelectclasscode">
<el-option v-for="item in NewClassList" :key="item.name" :label="item.name" <el-option v-for="item in NewClassList" :key="item.name" :label="item.name"
:value="item.value"> :value="item.value">
@ -317,7 +317,7 @@
</el-form-item> --> </el-form-item> -->
<!-- 添加页面---班级 --> <!-- 添加页面---班级 -->
<el-form-item label="请选择班级" prop="Class"> <el-form-item label="请选择班级" prop="Class">
<el-select ref="itemSelectclass" filterable multiple v-model="classformItem.ClassCode" <el-select ref="itemSelectclass" filterable multiple v-model="formItem.ClassCode"
placeholder="班级" size="small" clearable @change="classSelectclasscode"> placeholder="班级" size="small" clearable @change="classSelectclasscode">
<el-option v-for="item in NewClassList" :key="item.name" :label="item.name" <el-option v-for="item in NewClassList" :key="item.name" :label="item.name"
:value="item.value"> :value="item.value">
@ -507,6 +507,15 @@ export default {
ClassroomCode: [ ClassroomCode: [
{ required: true, message: '教室不能为空', trigger: 'change' }, { required: true, message: '教室不能为空', trigger: 'change' },
], ],
ClassCode: [
{ required: true, message: '班级不能为空', trigger: 'change' },
],
Date: [
{ required: true, message: '日期不能为空', trigger: 'change' },
],
Time: [
{ required: true, message: '时间不能为空', trigger: 'change' },
],
TeacherName: [ TeacherName: [
{ required: true, message: '教师不能为空', trigger: 'change' }, { required: true, message: '教师不能为空', trigger: 'change' },
], ],
@ -624,6 +633,11 @@ export default {
message: '导入失败', message: '导入失败',
type: 'error' type: 'error'
}); });
} else if (data == 10){
this.$message({
message: '上课时间安排不合理，课程间隔需大于15分钟',
type: 'error'
});
} else { } else {
const datas = data.split('；'); const datas = data.split('；');
const column = datas[1].match(/\d+/)[0]; const column = datas[1].match(/\d+/)[0];
@ -1039,7 +1053,7 @@ export default {
CollegeChange() { CollegeChange() {
this.classformItem.MajorCode = ""; this.classformItem.MajorCode = "";
this.classformItem.MajorCodename = ""; this.classformItem.MajorCodename = "";
this.classformItem.ClassCode = ""; this.formItem.ClassCode = "";
this.classformItem.ClassCodename = ""; this.classformItem.ClassCodename = "";
this.classformItem.Gradename = ""; this.classformItem.Gradename = "";
this.getNewMajorListinfo('c'); this.getNewMajorListinfo('c');
@ -1064,7 +1078,7 @@ export default {
return item.value === e; // 筛选出匹配数据 return item.value === e; // 筛选出匹配数据
}); });
this.classformItem.MajorCodename = obj.name; this.classformItem.MajorCodename = obj.name;
this.classformItem.ClassCode = ""; this.formItem.ClassCode = "";
this.classformItem.ClassCodename = ""; this.classformItem.ClassCodename = "";
this.classformItem.Gradename = ""; this.classformItem.Gradename = "";
this.getNewClassListinfo(''); this.getNewClassListinfo('');
@ -1088,7 +1102,7 @@ export default {
return item.value === e; // 筛选出匹配数据 return item.value === e; // 筛选出匹配数据
}); });
this.classformItem.Gradename = obj.value; this.classformItem.Gradename = obj.value;
this.classformItem.ClassCode = ""; this.formItem.ClassCode = "";
this.classformItem.ClassCodename = ""; this.classformItem.ClassCodename = "";
this.getNewClassListinfo(this.classformItem.Gradename) this.getNewClassListinfo(this.classformItem.Gradename)
}, },
@ -1099,7 +1113,7 @@ export default {
/* obj = this.NewClassList.find((item) => { // 这里的userList就是上面遍历的数据源 /* obj = this.NewClassList.find((item) => { // 这里的userList就是上面遍历的数据源
return item.value === e; // 筛选出匹配数据 return item.value === e; // 筛选出匹配数据
}); });
this.classformItem.ClassCode = obj.value; this.formItem.ClassCode = obj.value;
this.classformItem.ClassCodename = obj.name; */ this.classformItem.ClassCodename = obj.name; */
@ -1247,9 +1261,9 @@ export default {
console.log(data.ClassCode.replace(/"([^"]*)"/, '$1').split(',')); console.log(data.ClassCode.replace(/"([^"]*)"/, '$1').split(','));
this.classformItem = { /* this.formItem = {
ClassCode: data.ClassCode.replace(/"([^"]*)"/, '$1').split(','), ClassCode: data.ClassCode.replace(/"([^"]*)"/, '$1').split(','),
} } */
// Time: `${this.formItem.Time[0]}-${this.formItem.Time[1]}`, // Time: `${this.formItem.Time[0]}-${this.formItem.Time[1]}`,
this.IsOutSide = data.IsOutSide== true ? '2' : '1', this.IsOutSide = data.IsOutSide== true ? '2' : '1',
@ -1262,7 +1276,7 @@ export default {
SchoolAreaCode: data.SchoolAreaCode, SchoolAreaCode: data.SchoolAreaCode,
CollegeCode: data.CollegeCode, CollegeCode: data.CollegeCode,
MajorCode: data.MajorCode, MajorCode: data.MajorCode,
ClassCode: data.ClassCode, ClassCode: data.ClassCode.replace(/"([^"]*)"/, '$1').split(','),
BuildingCode: data.BuildingCode, BuildingCode: data.BuildingCode,
Date: data.Date, Date: data.Date,
falseDate: data.falseDate, falseDate: data.falseDate,
@ -1339,7 +1353,7 @@ export default {
// } // }
let vm = this; let vm = this;
let flag1 = vm.zhaunclasslist.findIndex( let flag1 = vm.zhaunclasslist.findIndex(
(item) => item.ClassCode === vm.classformItem.ClassCode (item) => item.ClassCode === vm.formItem.ClassCode
); );
if (flag1 !== -1) { if (flag1 !== -1) {
//存在 //存在
@ -1349,7 +1363,7 @@ export default {
// debugger; // debugger;
vm.zhaunclasslist.push({ vm.zhaunclasslist.push({
MajorCode: vm.classformItem.MajorCode, MajorCode: vm.classformItem.MajorCode,
ClassCode: vm.classformItem.ClassCode, ClassCode: vm.formItem.ClassCode,
ClassCodename: vm.classformItem.ClassCodename, ClassCodename: vm.classformItem.ClassCodename,
MajorCodename: vm.classformItem.MajorCodename, MajorCodename: vm.classformItem.MajorCodename,
}); });
@ -1396,7 +1410,7 @@ export default {
return false; return false;
} */ } */
this.classformItem.MajorCode = new Array(this.classformItem.ClassCode.length).fill('e3649c').join(',') this.classformItem.MajorCode = new Array(this.formItem.ClassCode.length).fill('e3649c').join(',')
console.log(this.formItem.Date); console.log(this.formItem.Date);
console.log(this.formItem.Time); console.log(this.formItem.Time);
@ -1406,7 +1420,7 @@ export default {
SchoolAreaCode: 1, // 校区Code，必填 SchoolAreaCode: 1, // 校区Code，必填
CollegeCode: 101, // 学院Code，单个Code值，必填 CollegeCode: 101, // 学院Code，单个Code值，必填
MajorCode: this.classformItem.MajorCode, //专业Code，可多个Code值 MajorCode: this.classformItem.MajorCode, //专业Code，可多个Code值
ClassCode: this.classformItem.ClassCode.join(','), //班级Code，可多个Code值，必填 ClassCode: this.formItem.ClassCode == '' ? '' : this.formItem.ClassCode.join(','), //班级Code，可多个Code值，必填
BuildingCode: '001', //楼Code BuildingCode: '001', //楼Code
ClassroomCode: vm.formItem.ClassroomCode, //教室Code ClassroomCode: vm.formItem.ClassroomCode, //教室Code
Weeks: 1, //上课周次 例如,1,2, 代表第一周和第二周 Weeks: 1, //上课周次 例如,1,2, 代表第一周和第二周
@ -1558,6 +1572,11 @@ export default {
type: 'error' type: 'error'
}); });
} else if (data == 19) {
this.$message({
message: '日期有误',
type: 'error'
});
} else { } else {
this.$message({ this.$message({
message: '新增失败', message: '新增失败',
@ -1593,7 +1612,7 @@ export default {
return false; return false;
} }
this.classformItem.MajorCode = new Array(this.classformItem.ClassCode.length).fill('e3649c').join(',') this.classformItem.MajorCode = new Array(this.formItem.ClassCode.length).fill('e3649c').join(',')
let datas = { let datas = {
AcademicNumber: vm.formItem.AcademicNumber, //自动生成，不需填写 AcademicNumber: vm.formItem.AcademicNumber, //自动生成，不需填写
@ -1601,7 +1620,7 @@ export default {
SchoolAreaCode: vm.formItem.SchoolAreaCode, // 校区Code，必填 SchoolAreaCode: vm.formItem.SchoolAreaCode, // 校区Code，必填
CollegeCode: vm.formItem.CollegeCode, // 学院Code，单个Code值，必填 CollegeCode: vm.formItem.CollegeCode, // 学院Code，单个Code值，必填
MajorCode: this.classformItem.MajorCode, //专业Code，可多个Code值 MajorCode: this.classformItem.MajorCode, //专业Code，可多个Code值
ClassCode: this.classformItem.ClassCode.join(','), //班级Code，可多个Code值，必填 ClassCode: this.formItem.ClassCode.join(','), //班级Code，可多个Code值，必填
BuildingCode: vm.formItem.BuildingCode, //楼Code BuildingCode: vm.formItem.BuildingCode, //楼Code
ClassroomCode: vm.formItem.ClassroomCode, //教室Code ClassroomCode: vm.formItem.ClassroomCode, //教室Code
Weeks: vm.formItem.Weeks.toString(), //上课周次 例如,1,2, 代表第一周和第二周 Weeks: vm.formItem.Weeks.toString(), //上课周次 例如,1,2, 代表第一周和第二周
@ -1776,7 +1795,7 @@ export default {
this.AddInitialization(); this.AddInitialization();
this.zhaunclasslist = []; this.zhaunclasslist = [];
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
this.classformItem.ClassCode = '' this.formItem.ClassCode = ''
}, },
editresetForm(formName) { editresetForm(formName) {