diff --git a/frontend/src/views/teachBusiness/calendar/index.vue b/frontend/src/views/teachBusiness/calendar/index.vue index 04fe5f17..b9885121 100644 --- a/frontend/src/views/teachBusiness/calendar/index.vue +++ b/frontend/src/views/teachBusiness/calendar/index.vue @@ -115,8 +115,8 @@ export default { totalWeeks: 0, dateRangeText: '', weeks: [], - // 显示控制:默认勾选显示日期;节次全部展示 - showDate: true, + // 显示控制:默认不勾选显示日期;节次全部展示 + showDate: false, // 事件存储:key = cellKey -> event events: {}, loading: false diff --git a/frontend/src/views/teachBusiness/semester/index.vue b/frontend/src/views/teachBusiness/semester/index.vue index 68e8d17e..c36a3dff 100644 --- a/frontend/src/views/teachBusiness/semester/index.vue +++ b/frontend/src/views/teachBusiness/semester/index.vue @@ -5,6 +5,12 @@ 新添 + + + 编辑校历 + + 批量删除 @@ -13,105 +19,79 @@ - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + @@ -124,7 +104,8 @@ - + @@ -132,44 +113,37 @@ - + - + - + - +
- + @@ -195,7 +169,9 @@
调课不审批 -
设定【调课不审批】后,在教学信息系统中调课时,如果只是更改教员,或更改授课地点,调课申请会立即生效。而对于改变授课地点,调课申请会立即生效。而对于改变授课时间、增加或减少授课教员的调课申请依然不受该设置影响,依然需要逐级审批后才能生效。
+
+ 设定【调课不审批】后,在教学信息系统中调课时,如果只是更改教员,或更改授课地点,调课申请会立即生效。而对于改变授课地点,调课申请会立即生效。而对于改变授课时间、增加或减少授课教员的调课申请依然不受该设置影响,依然需要逐级审批后才能生效。 +
@@ -236,6 +212,8 @@ export default { semesterList: [], // 选中的学期数组 ids: [], + // 当前点击选中的学期 + currentSemester: null, // 非单个禁用 single: true, // 非多个禁用 @@ -358,6 +336,10 @@ export default { this.single = selection.length !== 1 this.multiple = !selection.length }, + /** 单击行选中变化:记录当前选中的学期,用于启用「编辑校历」 */ + handleCurrentChange(currentRow) { + this.currentSemester = currentRow || null + }, /** 组装提交数据 */ buildPayload(form) { const lockValue = form.lockValue !== undefined && form.lockValue !== null ? form.lockValue : '' @@ -421,15 +403,15 @@ export default { } this.open = true this.title = "学期信息 - 编辑" - }).catch(() => {}) + }).catch(() => { }) }, - /** 编辑校历按钮 */ - handleEditCalendar(row) { - const nd = row && row.nd ? row.nd : this.ids[0] - if (!nd) return + /** 编辑校历按钮:对当前选中的学期编辑校历 */ + handleEditCalendar() { + const row = this.currentSemester + if (!row || !row.nd) return this.$router.push({ path: '/teachBusiness/semester/semesterCalendar', - query: { nd: nd, name: this.getSemesterName(nd) } + query: { nd: row.nd, name: this.getSemesterName(row.nd) } }) }, /** 删除按钮 */ @@ -444,7 +426,7 @@ export default { }).then(() => { this.getList() this.$modal.msgSuccess("删除成功") - }).catch(() => {}) + }).catch(() => { }) }, /** 提交表单 */ submitForm() { @@ -465,7 +447,7 @@ export default { this.$modal.msgSuccess(this.isAdd ? "新增成功" : "修改成功") this.open = false this.getList() - }).catch(() => {}) + }).catch(() => { }) } }) }, diff --git a/frontend/src/views/teachBusiness/timetable/index.vue b/frontend/src/views/teachBusiness/timetable/index.vue index 38347f3d..ad328d5e 100644 --- a/frontend/src/views/teachBusiness/timetable/index.vue +++ b/frontend/src/views/teachBusiness/timetable/index.vue @@ -90,14 +90,6 @@ 下一周
- -