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-11 17:05:52 +08:00
parent 2ee0bd02ff
commit 5483242ee8
6 changed files with 846 additions and 1450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/teacherselect.vue
View File

@ -42,13 +42,13 @@
style="overflow: auto; height: 450px; overflow-x: hidden" :scrollbar-always-on="true"> style="overflow: auto; height: 450px; overflow-x: hidden" :scrollbar-always-on="true">
<!-- <el-table-column type="selection"> <!-- <el-table-column type="selection">
</el-table-column> --> </el-table-column> -->
<el-table-column align="center" width="55" label="选择"> <!-- <el-table-column align="center" width="55" label="选择">
<template #default="scope"> <template #default="scope"> -->
<!-- 可以手动的修改label的值，从而控制选择哪一项 --> <!-- 可以手动的修改label的值，从而控制选择哪一项 -->
<el-radio class="radio" v-model="templateSelection" <!-- <el-radio class="radio" v-model="templateSelection"
:label="scope.row.TeacherId">&nbsp;</el-radio> :label="scope.row.TeacherId">&nbsp;</el-radio>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="序号" type="index" align="center" width="55" /> <el-table-column label="序号" type="index" align="center" width="55" />
<el-table-column prop="Name" align="center" label="姓名"> <el-table-column prop="Name" align="center" label="姓名">
</el-table-column> </el-table-column>
@ -105,7 +105,7 @@ export default {
oldTotal: 0, oldTotal: 0,
oldCurrent: 1, oldCurrent: 1,
Total: 0, Total: 0,
pageSize: 10, pageSize: 1000,
pageNum: 0, pageNum: 0,
pageSizeOptions: [10, 20, 50, 100, 150, 200], pageSizeOptions: [10, 20, 50, 100, 150, 200],
disabled: false, disabled: false,

2171
src/views/atten-information/atten-information.vue
View File

File diff suppressed because it is too large Load Diff

2
src/views/atten-information/attenProfession.vue
View File

@ -936,7 +936,7 @@ export default {
}); });
}); });
}, },
exportExcel() { exportExcel() {
//this.HTTPCount++; //this.HTTPCount++;
//this.tipContent = '正在导出数据文件，时间稍长，请耐心等待'; //this.tipContent = '正在导出数据文件，时间稍长，请耐心等待';

16
src/views/collage-information/collage-information.vue
View File

@ -238,7 +238,7 @@
</div> </div>
</el-drawer> </el-drawer>
<el-dialog title="选择教师" v-model="teachershow" center draggable> <el-dialog title="选择教师" v-model="teachershow" center draggable destroy-on-close>
<teacher-select @funval="numberval" :showteacherselect="showteacherselect" <teacher-select @funval="numberval" :showteacherselect="showteacherselect"
:activwshow="activwshow"></teacher-select> :activwshow="activwshow"></teacher-select>
</el-dialog> </el-dialog>
@ -549,15 +549,13 @@ export default {
getclinfodetail(id,HeadTeacherNum) { getclinfodetail(id,HeadTeacherNum) {
//获取编辑信息 //获取编辑信息
getClassInfodetail({ gcid: id }).then((res) => { getClassInfodetail({ gcid: id }).then((res) => {
debugger
let data = res; let data = res;
this.formItem = { this.formItem = {
collegeId: data.CollegeId, collegeId: data.CollegeId,
selectId: data.MajorId, selectId: data.MajorId,
ClassinfoGrade: data.Grade || '', ClassinfoGrade: data.Grade || '',
Counselor: data.CounselorNum || '', Counselor: data.CounselorNum || '',
ClassRemark: data.HeadTeacherNum || '', ClassRemark: data.ClassRemark || '',
Name: data.Name, Name: data.Name,
ClassInfoId: data.ClassInfoId, ClassInfoId: data.ClassInfoId,
TrainingStartTime:data.TrainingStartTime, TrainingStartTime:data.TrainingStartTime,
@ -590,7 +588,7 @@ export default {
MajorId: 1, MajorId: 1,
TeacherName:this.formItem.TeacherName, TeacherName:this.formItem.TeacherName,
ClassRemark:this.formItem.ClassRemark, ClassRemark:this.formItem.ClassRemark,
ClassinfoGrade: '',//this.formItem.ClassinfoGrade ClassinfoGrade: '1',//this.formItem.ClassinfoGrade
HeadTeacherNum: this.formItem.TeacherNumber HeadTeacherNum: this.formItem.TeacherNumber
}; };
@ -681,20 +679,20 @@ export default {
let datas = { let datas = {
ClassinfoId: this.formItem.ClassInfoId, ClassinfoId: this.formItem.ClassInfoId,
Name: this.formItem.Name, Name: this.formItem.Name,
HeadTeacherNum: this.formItem.TeacherNumber, HeadTeacherNum: this.formItem.HeadTeacherNum,
TrainingStartTime: this.formItem.TrainingStartTime, TrainingStartTime: this.formItem.TrainingStartTime,
TrainingEndTime: this.formItem.TrainingEndTime, TrainingEndTime: this.formItem.TrainingEndTime,
TeacherName:this.formItem.TeacherName, TeacherName:this.formItem.TeacherName,
ClassRemark:this.formItem.ClassRemark, ClassRemark:this.formItem.ClassRemark,
ClassinfoGrade: '', Grade: '1',// 年级
collegeId:1, collegeId:1,
MajorId: 1, MajorId: 1,
Grade: '',
CounselorNum: '', CounselorNum: '',
}; };
debugger
console.log(datas); console.log(datas);
postClassInfoeditinfo(datas).then((res) => { postClassInfoeditinfo(datas).then((res) => {

8
src/views/courseStatistics/courseStatistics.vue
View File

@ -8,17 +8,17 @@
<div class="seachbox"> <div class="seachbox">
<div class="seachbox"> <div class="seachbox">
<!-- 学期检索 --><el-select v-model="queryParams.Term" @change="getgetcourseListinfo()" filterable <!-- 学期检索 --><!-- <el-select v-model="queryParams.Term" @change="getgetcourseListinfo()" filterable
placeholder="学期" clearable size="small" class="ml-5 seachbox_input"> placeholder="学期" clearable size="small" class="ml-5 seachbox_input">
<el-option v-for="item in TermList" :key="item.name" :label="item.name" :value="item.value" /> <el-option v-for="item in TermList" :key="item.name" :label="item.name" :value="item.value" />
</el-select> </el-select> -->
<!-- 学院检索 --> <!-- 学院检索 -->
<el-select v-model="queryParams.collegeId" filterable @change="getgetcourseListinfo()" <!-- <el-select v-model="queryParams.collegeId" filterable @change="getgetcourseListinfo()"
placeholder="学院" clearable size="small" class="ml-5 seachbox_input"> placeholder="学院" clearable size="small" class="ml-5 seachbox_input">
<el-option v-for="item in CollegeList" :key="item.value" :label="item.name" <el-option v-for="item in CollegeList" :key="item.value" :label="item.name"
:value="item.value" /> :value="item.value" />
</el-select> </el-select> -->
<!-- 教师检索 --> <!-- 教师检索 -->
<el-input v-model.trim="queryParams.nname" placeholder="教师姓名" clearable size="small" <el-input v-model.trim="queryParams.nname" placeholder="教师姓名" clearable size="small"
style="width:200px; margin:0px 10px 0px 0px "></el-input> style="width:200px; margin:0px 10px 0px 0px "></el-input>

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

@ -5,52 +5,22 @@
<div> <div>
<el-card> <el-card>
<!-- 检索区域 --> <!-- 检索区域 -->
<div class="seachbox"> <div class="seachbox" style="display: flex;align-items: center;">
<div class="seachbox"> <!-- <div class="seachbox"> -->
<!-- 学期检索 --><!-- <el-select v-model="queryParams.Term" placeholder="学期" filterable clearable
size="small" class="ml-5 seachbox_input">
<el-option v-for="item in TermList" :key="item.name" :label="item.name" :value="item.value" />
</el-select> -->
<!-- 学院检索 -->
<!-- <el-select v-model="queryParams.College" placeholder="学院" filterable clearable size="small"
class="ml-5 seachbox_input">
<el-option v-for="item in CollegeList" :key="item.name" :label="item.name"
:value="item.value" />
</el-select> -->
<!-- 教室检索 -->
<el-select v-model="queryParams.Classroom" placeholder="教室" filterable clearable size="small" <el-select v-model="queryParams.Classroom" placeholder="教室" filterable clearable size="small"
class="ml-5 seachbox_input"> class="ml-5 seachbox_input">
<el-option v-for="item in ClassroomList" :key="item.name" :label="item.name" <el-option v-for="item in ClassroomList" :key="item.name" :label="item.name"
:value="item.name" /> :value="item.name" />
</el-select> </el-select>
<!-- 周次检索 -->
<!-- <el-select v-model="queryParams.Week" placeholder="周次" filterable clearable size="small"
@change="selectweek" class="ml-5 seachbox_input">
<el-option v-for="item in WeekList" :key="item.name" :label="item.name" :value="item.value" />
</el-select> -->
<!-- 教师检索 -->
<el-input v-model.trim="queryParams.Teacher" placeholder="教师" clearable size="small" <el-input v-model.trim="queryParams.Teacher" placeholder="教师" clearable size="small"
style="width:200px; margin:0px 10px 0px 0px "></el-input> style="width:200px; margin:0px 10px 0px 0px "></el-input>
<!-- 节次检索 --> <div style="width: 390px;">
<!-- <el-select v-model="queryParams.Section" placeholder="节次" filterable clearable size="small" <el-date-picker v-model="queryParams.Date" value-format="YYYY-MM-DD" type="daterange"
class="ml-5 seachbox_input"> @change="selecttimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"/>
<el-option v-for="item in SectionList" :key="item.name" :label="item.name" </div>
:value="item.value" /> <el-button class="ml-5" style="margin-left: 0px;" type="primary"
</el-select> -->
<!-- <el-select v-model="queryParams.Status" placeholder="状态" filterable clearable size="small"
class="ml-5 seachbox_input">
<el-option v-for="item in StatusList" :key="item.name" :label="item.name" :value="item.value" />
</el-select> -->
<!-- 日历检索 -->
<!-- <el-date-picker v-model="queryParams.Date" value-format="YYYY-MM-DD" type="daterange"
@change="selecttimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
style="margin-top: 10px;" /> -->
<!-- 按钮——————搜索 -->
<el-button class="ml-5" style="margin-left: 10px;" type="primary"
@click="ClickSearch">搜索</el-button> @click="ClickSearch">搜索</el-button>
</div> <!-- </div> -->
<!-- 状态检索 --> <!-- 状态检索 -->
<!-- <div class="status"> <!-- <div class="status">
@ -76,7 +46,9 @@
<el-table :data="tableData" border stripe :header-cell-style="{ 'text-align': 'center' }" <el-table :data="tableData" border stripe :header-cell-style="{ 'text-align': 'center' }"
:scrollbar-always-on="true"> :scrollbar-always-on="true">
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column prop="TeacherName" align="center" label="教师名字" width="100"> <el-table-column prop="CourceName" align="left" label="课程名称">
</el-table-column>
<el-table-column prop="TeacherName" align="center" label="教师姓名" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="TeacherTitle" align="center" label="教师职称" width="100"> <el-table-column prop="TeacherTitle" align="center" label="教师职称" width="100">
</el-table-column> </el-table-column>
@ -86,9 +58,7 @@
<el-tag v-if="scope.row.IsOutSide">校外教师</el-tag> <el-tag v-if="scope.row.IsOutSide">校外教师</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="DateTime" label="日期" align="left"> <el-table-column prop="DateTime" label="日期" align="center">
</el-table-column>
<el-table-column prop="CourceName" align="left" label="课程名称">
</el-table-column> </el-table-column>
<el-table-column prop="ClassName" align="left" label="班级名称"> <el-table-column prop="ClassName" align="left" label="班级名称">
</el-table-column> </el-table-column>
@ -189,7 +159,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="校内/外教师" prop="xnw"> <el-form-item label="校内/外教师" prop="xnw">
<el-radio-group v-model="IsOutSide"> <el-radio-group v-model="IsOutSide" @change="handleChange">
<el-radio label="1">校内</el-radio> <el-radio label="1">校内</el-radio>
<el-radio label="2">校外</el-radio> <el-radio label="2">校外</el-radio>
</el-radio-group> </el-radio-group>
@ -262,18 +232,18 @@
<el-form-item label="课程名称" prop="CourceName"> <el-form-item label="课程名称" prop="CourceName">
<el-input placeholder="请填写课程" clearable v-model.trim="formItem.CourceName"> </el-input> <el-input placeholder="请填写课程" clearable v-model.trim="formItem.CourceName"> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="午别时段" prop="TimeInterval"> <!-- <el-form-item label="午别时段" prop="TimeInterval">
<el-input placeholder="请填写午别时段" clearable v-model.trim="formItem.TimeInterval"> </el-input> <el-input placeholder="请填写午别时段" clearable v-model.trim="formItem.TimeInterval"> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="教学形式" prop="TeachingForm"> <el-form-item label="教学形式" prop="TeachingForm">
<el-input placeholder="请填写午别时段" clearable v-model.trim="formItem.TeachingForm"> </el-input> <el-input placeholder="请填写午别时段" clearable v-model.trim="formItem.TeachingForm"> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item label="按日期时间排课" prop="IsByDate"> <!-- <el-form-item label="按日期时间排课" prop="IsByDate">
<el-radio-group v-model="formItem.IsByDate"> <el-radio-group v-model="formItem.IsByDate">
<el-radio label="1">是</el-radio> <el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio> <el-radio label="2">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item> -->
<!-- 新增__课程类型 --> <!-- 新增__课程类型 -->
<!-- <!--
<el-form-item label="请填写课程类型" prop="CourceType"> <el-form-item label="请填写课程类型" prop="CourceType">
@ -1085,7 +1055,6 @@ export default {
classSelectclasscode(e) { classSelectclasscode(e) {
//弹框里选择班级 //弹框里选择班级
debugger;
let obj = {}; let obj = {};
/* obj = this.NewClassList.find((item) => { // 这里的userList就是上面遍历的数据源 /* obj = this.NewClassList.find((item) => { // 这里的userList就是上面遍历的数据源
return item.value === e; // 筛选出匹配数据 return item.value === e; // 筛选出匹配数据
@ -1242,7 +1211,7 @@ export default {
} }
// 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.formItem = { this.formItem = {
Time: countTime, Time: countTime,
TeacherTitle: data.TeacherTitle, TeacherTitle: data.TeacherTitle,
@ -1271,6 +1240,7 @@ export default {
TeachingLogId: data.TeachingLogId, TeachingLogId: data.TeachingLogId,
CourceCode: data.CourceCode, CourceCode: data.CourceCode,
CourceType: data.CourceType == "" ? "必修" : data.CourceType, CourceType: data.CourceType == "" ? "必修" : data.CourceType,
IsByDate:data.IsByDate==true?'1':'2',
// SchoolArea: '', //校区 // SchoolArea: '', //校区
// Term: '', //学期 // Term: '', //学期
// College: '', //学院 // College: '', //学院
@ -1363,6 +1333,12 @@ export default {
return item.id !== index return item.id !== index
}) })
}, },
handleChange(){
//debugger
this.formItem.TeacherName = ''
this.formItem.TeacherNumber = ''
this.formItem.TeacherTitle = ''
},
submitForm(formName) { submitForm(formName) {
//新增提交 //新增提交
let vm = this; let vm = this;
@ -1401,7 +1377,7 @@ export default {
Grade: "", //年级 Grade: "", //年级
IsValid: vm.formItem.IsValid, //是否有效 IsValid: vm.formItem.IsValid, //是否有效
xnw:'1', xnw:'1',
TeacherNumber: vm.formItem.TeacherNumber, //任课教师工号 TeacherNumber: this.IsOutSide == '1' ? vm.formItem.TeacherNumber : '', //任课教师工号
TeacherName: vm.formItem.TeacherName, //教师姓名 TeacherName: vm.formItem.TeacherName, //教师姓名
TeachingLogId: 0, TeachingLogId: 0,
@ -1413,7 +1389,6 @@ export default {
TimeInterval:0, TimeInterval:0,
TeachingForm:0 TeachingForm:0
}; };
debugger debugger
postaddinfo(datas).then((res) => { postaddinfo(datas).then((res) => {
let data = res; let data = res;
@ -1578,13 +1553,15 @@ export default {
return false; return false;
} }
this.classformItem.MajorCode = new Array(this.classformItem.ClassCode.length).fill('e3649c').join(',')
let datas = { let datas = {
AcademicNumber: vm.formItem.AcademicNumber, //自动生成，不需填写 AcademicNumber: vm.formItem.AcademicNumber, //自动生成，不需填写
YearTerm: vm.formItem.YearTerm, //学期，必填 YearTerm: vm.formItem.YearTerm, //学期，必填
SchoolAreaCode: vm.formItem.SchoolAreaCode, // 校区Code，必填 SchoolAreaCode: vm.formItem.SchoolAreaCode, // 校区Code，必填
CollegeCode: vm.formItem.CollegeCode, // 学院Code，单个Code值，必填 CollegeCode: vm.formItem.CollegeCode, // 学院Code，单个Code值，必填
MajorCode: vm.getzhaunclasslist("MajorCode").toString(), //专业Code，可多个Code值 MajorCode: this.classformItem.MajorCode, //专业Code，可多个Code值
ClassCode: vm.getzhaunclasslist("ClassCode").toString(), //班级Code，可多个Code值，必填 ClassCode: this.classformItem.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, 代表第一周和第二周
@ -1601,6 +1578,12 @@ export default {
TeacherNumber: vm.formItem.TeacherNumber, //任课教师工号 TeacherNumber: vm.formItem.TeacherNumber, //任课教师工号
TeacherName: vm.formItem.TeacherName, //教师姓名 TeacherName: vm.formItem.TeacherName, //教师姓名
TeachingLogId: vm.formItem.TeachingLogId, TeachingLogId: vm.formItem.TeachingLogId,
IsOutSide: this.IsOutSide == '1' ? false : true,
TeacherTitle: vm.formItem.TeacherTitle,
Date: this.formItem.Date,
Time: `${this.formItem.Time[0]}-${this.formItem.Time[1]}`,
IsByDate: this.formItem.IsByDate == '1' ? true : false,
}; };
posteditinfo(datas).then((res) => { posteditinfo(datas).then((res) => {
let data = res; let data = res;