@@ -537,6 +563,7 @@ export default {
form: {
is_publish:1,
type: "",
+ course_type_id: "",
course_id: "",
introduce: "",
course_content_id: "",
@@ -571,6 +598,13 @@ export default {
trigger: 'change'
},
],
+ course_type_id: [
+ {
+ required: true,
+ message: "请选择课程体系",
+ trigger: 'change'
+ },
+ ],
title: [
{
required: true,
@@ -820,6 +854,7 @@ export default {
// 手动验证主表单必填字段
const mainErrors = [];
if (!this.form.type) mainErrors.push('请选择日程类型');
+ if (this.form.type === 3 && !this.form.course_type_id) mainErrors.push('请选择课程体系');
if (!this.form.title) mainErrors.push('请输入标题');
if (!this.form.start_time) mainErrors.push('请选择开始时间');
@@ -1028,6 +1063,7 @@ export default {
this.form = {
is_publish: 1,
type: "",
+ course_type_id: "",
course_id: "",
introduce: "",
course_content_id: "",
diff --git a/src/views/calendar/index.vue b/src/views/calendar/index.vue
index 2dcfa4f..ec26f32 100644
--- a/src/views/calendar/index.vue
+++ b/src/views/calendar/index.vue
@@ -5,7 +5,7 @@
新建日历事件
导出日历事件
- 本月开课天数:{{ monthDayCalendar }}天 {{ calendarDate.getFullYear() }}年累计开课天数:{{ yearDayCalendar }}天
+ 本月开课天数:{{ monthDayCalendar }}天 {{ calendarDate.getFullYear() }}年累计开课天数:{{ yearDayCalendar }}天 本月开课场次:{{ monthCourseCount }}场 {{ calendarDate.getFullYear() }}年开课场次:{{ yearCourseCount }}场
@@ -67,7 +67,9 @@ import { getToken } from '@/utils/auth';
// 记录每一周行在容器内的实际像素 top,解决不等高行导致定位偏差
weekRowTops: [],
monthDayCalendar: 0,
- yearDayCalendar: 0
+ yearDayCalendar: 0,
+ monthCourseCount: 0,
+ yearCourseCount: 0
}
},
computed: {
@@ -153,6 +155,8 @@ import { getToken } from '@/utils/auth';
this.list = (res.list || res || []).map(e => ({ ...e, id: e.id || e._id }))
this.monthDayCalendar = res.monthDayCalendar || 0
this.yearDayCalendar = res.yearDayCalendar || 0
+ this.monthCourseCount = res.monthCourseCount || 0
+ this.yearCourseCount = res.yearCourseCount || 0
// 重新生成动态样式
this.generateDynamicStyles()
// 渲染后测量行位置信息
diff --git a/vue.config.js b/vue.config.js
index 7ffc4f9..29ac6d1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -28,9 +28,9 @@ module.exports = {
*/
publicPath: process.env.ENV === 'staging' ? '/admin' : '/admin',
// 测试
- // outputDir: '/Users/mac/Documents/朗业/2025/s-苏州科技商学院/wx.sstbc.com/public/admin',
+ outputDir: '/Users/mac/Documents/朗业/2025/s-苏州科技商学院/wx.sstbc.com/public/admin',
// 正式
- outputDir: '/Users/mac/Documents/朗业/2024/s-苏州科技商学院/wx.sstbc.com/public/admin',
+ // outputDir: '/Users/mac/Documents/朗业/2024/s-苏州科技商学院/wx.sstbc.com/public/admin',
assetsDir: 'static',
css: {
loaderOptions: { // 向 CSS 相关的 loader 传递选项