-
+
{{ translateLessonType(lesson.lessonType) }}
@@ -254,29 +247,20 @@
核心资源
-
+
+
+
-
+
+
-
-
+
小班
中班
大班
-
+
草稿
审核中
已驳回
@@ -30,13 +20,8 @@
已下架
-
@@ -53,25 +38,15 @@
-
+
@@ -541,9 +503,9 @@ const domainTags = computed(() => {
// 是否有课程介绍内容
const hasIntroContent = computed(() => {
return course.value.introSummary || course.value.introHighlights ||
- course.value.introGoals || course.value.introSchedule ||
- course.value.introKeyPoints || course.value.introMethods ||
- course.value.introEvaluation || course.value.introNotes;
+ course.value.introGoals || course.value.introSchedule ||
+ course.value.introKeyPoints || course.value.introMethods ||
+ course.value.introEvaluation || course.value.introNotes;
});
// 排课参考数据
@@ -582,7 +544,7 @@ const allVideos = computed(() => {
paths.forEach((item: any) => {
videos.push({ path: item.path, name: item.name || '视频', source: '资源库' });
});
- } catch {}
+ } catch { }
}
return videos;
});
@@ -596,7 +558,7 @@ const allAudios = computed(() => {
paths.forEach((item: any) => {
audios.push({ path: item.path, name: item.name || '音频', source: '资源库' });
});
- } catch {}
+ } catch { }
}
return audios;
});
@@ -623,7 +585,7 @@ const allDocuments = computed(() => {
paths.forEach((item: any) => {
docs.push({ path: item.path, name: item.name || '电子绘本', type: 'pdf', source: '资源库' });
});
- } catch {}
+ } catch { }
}
return docs;
});
@@ -637,16 +599,16 @@ const allImages = computed(() => {
paths.forEach((item: any) => {
images.push({ path: item.path, name: item.name || '挂图' });
});
- } catch {}
+ } catch { }
}
return images;
});
const hasAnyResources = computed(() => {
return allVideos.value.length > 0 ||
- allAudios.value.length > 0 ||
- allDocuments.value.length > 0 ||
- allImages.value.length > 0;
+ allAudios.value.length > 0 ||
+ allDocuments.value.length > 0 ||
+ allImages.value.length > 0;
});
const totalResourcesCount = computed(() => {
@@ -1119,9 +1081,17 @@ const fetchCourseDetail = async () => {
font-size: 18px;
margin-right: 8px;
- &.video { color: #722ed1; }
- &.ppt { color: #fa8c16; }
- &.pdf { color: #f5222d; }
+ &.video {
+ color: #722ed1;
+ }
+
+ &.ppt {
+ color: #fa8c16;
+ }
+
+ &.pdf {
+ color: #f5222d;
+ }
}
.resource-name {
diff --git a/reading-platform-frontend/src/views/admin/courses/CourseListView.vue b/reading-platform-frontend/src/views/admin/courses/CourseListView.vue
index 758c280..51e90c6 100644
--- a/reading-platform-frontend/src/views/admin/courses/CourseListView.vue
+++ b/reading-platform-frontend/src/views/admin/courses/CourseListView.vue
@@ -4,25 +4,15 @@
-
@@ -414,11 +380,7 @@
-
+
- ![]()
+ ![]()
{{ record.name }}
@@ -111,7 +86,8 @@
编辑
- 发布
@@ -120,10 +96,7 @@
-
+
删除
@@ -150,7 +123,8 @@
数据
- 更多
@@ -166,10 +140,7 @@
查看
数据
重新发布
-
+
删除
@@ -179,18 +150,9 @@
-
-
+
+
-
+
- @@ -200,12 +162,8 @@
-
@@ -258,13 +216,13 @@ const pagination = reactive({
});
const columns = [
- { title: '课程包名称', key: 'name', width: 250 },
- { title: '关联绘本', key: 'pictureBook', width: 120 },
- { title: '状态', key: 'status', width: 90 },
- { title: '版本', key: 'version', width: 70 },
- { title: '数据统计', key: 'stats', width: 130 },
- { title: '最近更新', key: 'updatedAt', width: 120 },
- { title: '操作', key: 'actions', width: 200, fixed: 'right' as const },
+ { title: '课程包名称', key: 'name', minWidth: 220 },
+ { title: '关联绘本', key: 'pictureBook', minWidth: 120 },
+ { title: '状态', key: 'status', minWidth: 90 },
+ { title: '版本', key: 'version', minWidth: 70 },
+ { title: '数据统计', key: 'stats', minWidth: 130 },
+ { title: '最近更新', key: 'updatedAt', minWidth: 120 },
+ { title: '操作', key: 'actions', minWidth: 220, fixed: 'right' as const },
];
// 提交审核相关
@@ -547,6 +505,10 @@ const formatDate = (dateStr: string) => {
diff --git a/reading-platform-frontend/src/views/admin/courses/CourseStatsView.vue b/reading-platform-frontend/src/views/admin/courses/CourseStatsView.vue
index 81adb6d..4e694a6 100644
--- a/reading-platform-frontend/src/views/admin/courses/CourseStatsView.vue
+++ b/reading-platform-frontend/src/views/admin/courses/CourseStatsView.vue
@@ -1,9 +1,6 @@
-
+ @@ -11,40 +8,22 @@- + - + - + - + - + {{ item.date }}@@ -80,50 +55,25 @@@@ -136,13 +86,8 @@- - + + - - + + - - + + - + - -+ {{ record.teacher?.name || '-' }} @@ -163,7 +108,8 @@ -+-@@ -177,42 +123,26 @@- + - + - + - + ({}); const lessonColumns = [ - { title: '教师', key: 'teacher', width: 120 }, - { title: '班级', key: 'class', width: 120 }, - { title: '授课时间', key: 'date', width: 150 }, - { title: '时长', key: 'duration', width: 100 }, - { title: '状态', key: 'status', width: 100 }, + { title: '教师', key: 'teacher', minWidth: 120 }, + { title: '班级', key: 'class', minWidth: 120 }, + { title: '授课时间', key: 'date', minWidth: 150 }, + { title: '时长', key: 'duration', minWidth: 100 }, + { title: '状态', key: 'status', minWidth: 100 }, ]; onMounted(async () => { @@ -306,6 +236,10 @@ const getLessonStatusText = (status: string) => { background: #f5f5f5; min-height: calc(100vh - 64px); + :deep(.ant-table-thead > tr > th) { + white-space: nowrap; + } + :deep(.ant-page-header) { background: white; padding: 16px 24px; diff --git a/reading-platform-frontend/src/views/admin/courses/components/Step3ScheduleRef.vue b/reading-platform-frontend/src/views/admin/courses/components/Step3ScheduleRef.vue index 3660232..8bf177c 100644 --- a/reading-platform-frontend/src/views/admin/courses/components/Step3ScheduleRef.vue +++ b/reading-platform-frontend/src/views/admin/courses/components/Step3ScheduleRef.vue @@ -7,31 +7,16 @@ + 此表格为排课参考，帮助教师了解课程安排建议。可根据实际情况调整。 -+ - + -周一 周二 周三 @@ -40,11 +25,7 @@+ -导入课 集体课 健康领域 @@ -56,25 +37,13 @@+ - + - + @@ -230,6 +199,7 @@ defineExpose({ } :deep(.ant-table) { + .ant-input, .ant-select { width: 100%; diff --git a/reading-platform-frontend/src/views/admin/packages/PackageDetailView.vue b/reading-platform-frontend/src/views/admin/packages/PackageDetailView.vue index b5fe887..ce8f51b 100644 --- a/reading-platform-frontend/src/views/admin/packages/PackageDetailView.vue +++ b/reading-platform-frontend/src/views/admin/packages/PackageDetailView.vue @@ -34,20 +34,12 @@ 包含课程包 -+ -diff --git a/reading-platform-frontend/src/views/admin/packages/PackageEditView.vue b/reading-platform-frontend/src/views/admin/packages/PackageEditView.vue index 10663d3..2c62ecc 100644 --- a/reading-platform-frontend/src/views/admin/packages/PackageEditView.vue +++ b/reading-platform-frontend/src/views/admin/packages/PackageEditView.vue @@ -8,12 +8,7 @@+
{{ record.course?.name }}
返回 -+ + @@ -73,7 +63,9 @@ - + + + 添加课程包 - + + {{ tag }} @@ -145,16 +126,16 @@ const form = reactive({ const selectedCourses = ref<{ courseId: number; gradeLevel: string; sortOrder: number; courseName: string }[]>([]); const courseColumns = [ - { title: '课程包', dataIndex: 'courseName', key: 'courseName' }, - { title: '年级', dataIndex: 'gradeLevel', key: 'gradeLevel', width: 120 }, - { title: '排序', dataIndex: 'sortOrder', key: 'sortOrder', width: 80 }, - { title: '操作', key: 'action', width: 80 }, + { title: '课程包', dataIndex: 'courseName', key: 'courseName', minWidth: 200 }, + { title: '年级', dataIndex: 'gradeLevel', key: 'gradeLevel', minWidth: 120, maxWidth: 140 }, + { title: '排序', dataIndex: 'sortOrder', key: 'sortOrder', minWidth: 80, maxWidth: 100 }, + { title: '操作', key: 'action', minWidth: 100, fixed: 'right' as const }, ]; const selectorColumns = [ - { title: '课程包名称', dataIndex: 'name', key: 'name' }, - { title: '年级标签', dataIndex: 'gradeTags', key: 'gradeTags' }, - { title: '时长', dataIndex: 'duration', key: 'duration', width: 80 }, + { title: '课程包名称', dataIndex: 'name', key: 'name', minWidth: 200 }, + { title: '年级标签', dataIndex: 'gradeTags', key: 'gradeTags', minWidth: 160 }, + { title: '时长', dataIndex: 'duration', key: 'duration', minWidth: 80, maxWidth: 100 }, ]; const rowSelection = computed(() => ({ @@ -276,4 +257,8 @@ onMounted(() => { diff --git a/reading-platform-frontend/src/views/admin/packages/PackageListView.vue b/reading-platform-frontend/src/views/admin/packages/PackageListView.vue index d97b9f4..67a2ac6 100644 --- a/reading-platform-frontend/src/views/admin/packages/PackageListView.vue +++ b/reading-platform-frontend/src/views/admin/packages/PackageListView.vue @@ -6,20 +6,16 @@- + + + 新建套餐 --+ 草稿 待审核 已通过 @@ -30,14 +26,8 @@+ ¥{{ (record.price / 100).toFixed(2) }} @@ -51,35 +41,16 @@ 查看 -+ 编辑 -+ 提交 -+ 发布 -+ 删除 -+ - + + + - + + + - + + + - + + + - + + + 新建资源库 - + + + 上传资源 + @@ -146,12 +135,8 @@编辑 -+ 预览 @@ -180,12 +165,7 @@ - + @@ -204,13 +184,8 @@ + @@ -232,15 +207,8 @@ - + 选择文件 - + 绘本阅读 儿歌 游戏 @@ -268,12 +231,7 @@+ @@ -282,29 +240,20 @@ - + + - +@@ -421,11 +370,11 @@ const uploadHeaders = computed(() => ({ })); const columns = [ - { title: '资源', key: 'resource', width: 300 }, - { title: '所属资源库', key: 'library', width: 150 }, - { title: '标签', key: 'tags', width: 200 }, - { title: '上传时间', key: 'createdAt', width: 120 }, - { title: '操作', key: 'action', width: 200, fixed: 'right' as const }, + { title: '资源', key: 'resource', minWidth: 300 }, + { title: '所属资源库', key: 'library', minWidth: 150 }, + { title: '标签', key: 'tags', minWidth: 200 }, + { title: '上传时间', key: 'createdAt', minWidth: 120 }, + { title: '操作', key: 'action', minWidth: 200, fixed: 'right' as const }, ]; const getFileTypeLabel = (type: FileTypeType) => { @@ -669,6 +618,10 @@ onMounted(() => { background: #f5f5f5; min-height: calc(100vh - 64px); + :deep(.ant-table-thead > tr > th) { + white-space: nowrap; + } + :deep(.ant-page-header) { background: white; padding: 16px 24px; diff --git a/reading-platform-frontend/src/views/admin/tenants/TenantListView.vue b/reading-platform-frontend/src/views/admin/tenants/TenantListView.vue index 7777b08..d5240ac 100644 --- a/reading-platform-frontend/src/views/admin/tenants/TenantListView.vue +++ b/reading-platform-frontend/src/views/admin/tenants/TenantListView.vue @@ -5,33 +5,18 @@-- + - + 生效中 已过期 已暂停 - + 基础版 标准版 高级版 @@ -41,7 +26,9 @@- + + + 搜索 重置 @@ -49,20 +36,17 @@- + + + 添加租户 + @@ -87,16 +71,14 @@ + - 操作 + 操作 + @@ -106,16 +88,10 @@ 调整配额 重置密码 - + 暂停服务 -+ 恢复服务 删除 @@ -129,36 +105,17 @@ -- + + -- + - + @@ -178,38 +135,19 @@ - + - + - + + {{ currentTenant?.name }} @@ -223,23 +161,15 @@ - + 已使用: {{ currentTenant?.teacherCount || 0 }}- + 已使用: {{ currentTenant?.studentCount || 0 }}@@ -248,12 +178,7 @@+ @@ -263,10 +188,7 @@ {{ detailData.loginAccount }} - + {{ detailData.contactPerson || '-' }} @@ -305,23 +227,13 @@ 最近教师 -+ 最近学生 -+ @@ -375,15 +287,15 @@ const pagination = reactive({ // 表格列定义 const columns = [ - { title: '学校名称', dataIndex: 'name', key: 'name', width: 150 }, - { title: '登录账号', dataIndex: 'loginAccount', key: 'loginAccount', width: 120 }, - { title: '联系人', dataIndex: 'contactPerson', key: 'contactPerson', width: 100 }, - { title: '联系电话', dataIndex: 'contactPhone', key: 'contactPhone', width: 120 }, - { title: '套餐', dataIndex: 'packageType', key: 'packageType', width: 80 }, - { title: '配额使用', key: 'quota', width: 120 }, - { title: '有效期', key: 'validity', width: 140 }, - { title: '状态', dataIndex: 'status', key: 'status', width: 80 }, - { title: '操作', key: 'action', width: 100, fixed: 'right' as const }, + { title: '学校名称', dataIndex: 'name', key: 'name', minWidth: 150 }, + { title: '登录账号', dataIndex: 'loginAccount', key: 'loginAccount', minWidth: 120 }, + { title: '联系人', dataIndex: 'contactPerson', key: 'contactPerson', minWidth: 100 }, + { title: '联系电话', dataIndex: 'contactPhone', key: 'contactPhone', minWidth: 120 }, + { title: '套餐', dataIndex: 'packageType', key: 'packageType', minWidth: 80 }, + { title: '配额使用', key: 'quota', minWidth: 140 }, + { title: '有效期', key: 'validity', minWidth: 160 }, + { title: '状态', dataIndex: 'status', key: 'status', minWidth: 90 }, + { title: '操作', key: 'action', minWidth: 120, fixed: 'right' as const }, ]; // 详情抽屉列定义 @@ -502,9 +414,9 @@ const showAddModal = () => { studentQuota: 200, }); dateRange.value = [ - dayjs().format('YYYY-MM-DD'), - dayjs().add(1, 'year').format('YYYY-MM-DD'), - ] as [string, string]; + dayjs().format('YYYY-MM-DD'), + dayjs().add(1, 'year').format('YYYY-MM-DD'), + ] as [string, string]; modalVisible.value = true; }; @@ -700,4 +612,8 @@ onMounted(() => { diff --git a/reading-platform-frontend/src/views/admin/themes/ThemeListView.vue b/reading-platform-frontend/src/views/admin/themes/ThemeListView.vue index e6cece1..7a7f25a 100644 --- a/reading-platform-frontend/src/views/admin/themes/ThemeListView.vue +++ b/reading-platform-frontend/src/views/admin/themes/ThemeListView.vue @@ -6,18 +6,15 @@ - -+ + + 新建主题 + @@ -37,12 +34,8 @@ - + @@ -83,11 +76,11 @@ const form = reactive({ }); const columns = [ - { title: '排序', dataIndex: 'sortOrder', key: 'sortOrder', width: 80 }, - { title: '主题名称', dataIndex: 'name', key: 'name' }, - { title: '描述', dataIndex: 'description', key: 'description' }, - { title: '状态', dataIndex: 'status', key: 'status', width: 100 }, - { title: '操作', key: 'action', width: 150 }, + { title: '排序', dataIndex: 'sortOrder', key: 'sortOrder', minWidth: 80, maxWidth: 100 }, + { title: '主题名称', dataIndex: 'name', key: 'name', minWidth: 180 }, + { title: '描述', dataIndex: 'description', key: 'description', minWidth: 220 }, + { title: '状态', dataIndex: 'status', key: 'status', minWidth: 100, maxWidth: 120 }, + { title: '操作', key: 'action', minWidth: 150, fixed: 'right' as const }, ]; const fetchData = async () => { @@ -168,3 +161,9 @@ onMounted(() => { fetchData(); }); + + diff --git a/reading-platform-frontend/src/views/school/PackageView.vue b/reading-platform-frontend/src/views/school/PackageView.vue index f771774..57ccce9 100644 --- a/reading-platform-frontend/src/views/school/PackageView.vue +++ b/reading-platform-frontend/src/views/school/PackageView.vue @@ -4,7 +4,8 @@ -+@@ -21,7 +22,8 @@-+@@ -30,7 +32,8 @@-+@@ -39,14 +42,17 @@-+-+@@ -60,25 +66,16 @@-{{ expiringCount }}+{{ + expiringCount }}即将到期-+ -+ ]">-{{ item.package.name }}@@ -108,7 +105,8 @@ +-包含课程包：@@ -138,12 +134,8 @@@@ -125,11 +123,9 @@ 查看详情 + @click="showRenewModal(item)"> 续订 + @@ -166,7 +158,8 @@ 到期时间 {{ formatDate(selectedPackage.endDate) }} -+ {{ getDaysLeft(selectedPackage.endDate) }}天后到期 已过期 @@ -180,14 +173,9 @@包含课程包 ({{ selectedPackage.package.courses?.length || 0 }}个) -+ {{ record.gradeLevel }} @@ -201,13 +189,8 @@ -+ -@@ -240,33 +223,21 @@ --+ + -@@ -132,7 +134,8 @@+ -
-客服电话：400-XXX-XXXX
+客服邮箱：service@example.com +
+客服电话：400-XXX-XXXX + +
客服邮箱：service@example.com + 我知道了 @@ -310,9 +281,9 @@ const applyModalVisible = ref(false); // 课程表格列定义 const courseColumns = [ - { title: '序号', dataIndex: 'sortOrder', key: 'sortOrder', width: 60 }, - { title: '课程包名称', dataIndex: ['course', 'name'], key: 'courseName' }, - { title: '适用年级', dataIndex: 'gradeLevel', key: 'gradeLevel', width: 100 }, + { title: '序号', dataIndex: 'sortOrder', key: 'sortOrder', minWidth: 60, maxWidth: 80 }, + { title: '课程包名称', dataIndex: ['course', 'name'], key: 'courseName', minWidth: 220 }, + { title: '适用年级', dataIndex: 'gradeLevel', key: 'gradeLevel', minWidth: 100, maxWidth: 120 }, ]; // 计算属性 @@ -435,6 +406,7 @@ onMounted(() => { diff --git a/reading-platform-frontend/src/views/school/courses/CourseDetailView.vue b/reading-platform-frontend/src/views/school/courses/CourseDetailView.vue index 767d1a7..acc4a34 100644 --- a/reading-platform-frontend/src/views/school/courses/CourseDetailView.vue +++ b/reading-platform-frontend/src/views/school/courses/CourseDetailView.vue @@ -23,7 +23,8 @@ -@@ -97,7 +98,8 @@+
使用教师-{{ course.avgRating?.toFixed(1) || '-' }}+{{ course.avgRating?.toFixed(1) || '-' }} +平均评分+-课程介绍 @@ -170,7 +173,8 @@ +-排课计划参考 @@ -190,19 +194,22 @@ +-环创建设 -{{ course.environmentConstruction }}+{{ course.environmentConstruction }} ++课程配置 @@ -211,13 +218,11 @@ --@@ -394,7 +404,8 @@+-@@ -379,14 +393,10 @@+{{ translateLessonType(lesson.lessonType) }}{{ lesson.name }}@@ -234,54 +239,65 @@教学准备-{{ lesson.preparation }}+{{ lesson.preparation }} +核心资源-+ @click="previewFile(lesson.videoPath, lesson.videoName || '绘本动画')">-- {{ lesson.videoName || '绘本动画' }} - + {{ + lesson.videoName || + '绘本动画' }} + + @click="previewFile(lesson.pptPath, lesson.pptName || '教学课件')">-- {{ lesson.pptName || '教学课件' }} - + {{ + lesson.pptName || + '教学课件' }} + + @click="previewFile(lesson.pdfPath, lesson.pdfName || '电子绘本')">- {{ lesson.pdfName || '电子绘本' }} - + {{ + lesson.pdfName || + '电子绘本' }} + -@@ -358,17 +373,16 @@教学环节 ({{ lesson.steps.length }}个)+教学环节 ({{ + lesson.steps.length }}个)---@@ -305,7 +321,8 @@{{ index + 1 }}+++ {{ index + 1 }}{{ step.name }}{{ step.duration }}分钟-目标：{{ step.objective }}-{{ step.content }}+目标：{{ step.objective + }} ++{{ step.content }} ++@@ -339,15 +355,14 @@数字资源 @@ -320,15 +337,14 @@ 视频资源 -+ @click="previewFile(item.path, item.name)">- {{ item.name }} - + {{ item.name + }} + 音频资源 -+ @click="previewFile(item.path, item.name)">- {{ item.name }} - + {{ item.name + }} + 文档资源 -+ @click="previewFile(item.path, item.name)">- {{ item.name }} - + {{ item.name + }} + 图片资源 -+ @click="previewImage(getFileUrl(item.path))" />
+教师反馈 @@ -403,7 +414,8 @@ -+-{{ feedback.teacherName }} {{ formatDate(feedback.createdAt) }} @@ -423,11 +435,7 @@ -@@ -552,9 +560,9 @@ const domainTags = computed(() => { // 是否有课程介绍内容 const hasIntroContent = computed(() => { return course.value.introSummary || course.value.introHighlights || - course.value.introGoals || course.value.introSchedule || - course.value.introKeyPoints || course.value.introMethods || - course.value.introEvaluation || course.value.introNotes; + course.value.introGoals || course.value.introSchedule || + course.value.introKeyPoints || course.value.introMethods || + course.value.introEvaluation || course.value.introNotes; }); // 课程介绍填写数量 @@ -614,7 +622,7 @@ const allVideos = computed(() => { videos.push({ path: item.path, name: item.name || '视频', source: '资源库' }); }); } - } catch {} + } catch { } } return videos; }); @@ -630,7 +638,7 @@ const allAudios = computed(() => { audios.push({ path: item.path, name: item.name || '音频', source: '资源库' }); }); } - } catch {} + } catch { } } return audios; }); @@ -659,7 +667,7 @@ const allDocuments = computed(() => { docs.push({ path: item.path, name: item.name || '电子绘本', type: 'pdf', source: '资源库' }); }); } - } catch {} + } catch { } } return docs; }); @@ -675,16 +683,16 @@ const allImages = computed(() => { images.push({ path: item.path, name: item.name || '挂图' }); }); } - } catch {} + } catch { } } return images; }); const hasAnyResources = computed(() => { return allVideos.value.length > 0 || - allAudios.value.length > 0 || - allDocuments.value.length > 0 || - allImages.value.length > 0; + allAudios.value.length > 0 || + allDocuments.value.length > 0 || + allImages.value.length > 0; }); const totalResourcesCount = computed(() => { diff --git a/reading-platform-frontend/src/views/school/parents/ParentListView.vue b/reading-platform-frontend/src/views/school/parents/ParentListView.vue index 08d2db8..18fa527 100644 --- a/reading-platform-frontend/src/views/school/parents/ParentListView.vue +++ b/reading-platform-frontend/src/views/school/parents/ParentListView.vue @@ -26,46 +26,42 @@+ +---+ + 添加家长 -+--+ :class="parent.status !== 'ACTIVE' ? 'opacity-70' : ''"> ++@@ -82,26 +78,28 @@- + {{ parent.status === 'ACTIVE' ? '活跃' : '停用' }}{{ parent.name }}@{{ parent.loginAccount }}- 关联 {{ parent.childrenCount }} 个孩子 + 关联 {{ parent.childrenCount + }} + 个孩子 未关联孩子 --+ 编辑 + 孩子 + 重置 + 删除 +@@ -127,25 +127,14 @@暂无家长数据
-+ 添加第一位家长 --+ + @@ -153,52 +142,47 @@ {{ isEdit ? '编辑家长' : '添加家长' }} - + - + + + - + + + - + + + - - + + + + - + + + + @@ -216,11 +200,7 @@ 已关联孩子 ({{ parentChildren.length }})-+ @@ -238,10 +218,7 @@ + 解除 +暂无关联的孩子+ @@ -272,37 +245,19 @@ - + {{ record.gender === 'MALE' ? '男' : record.gender === 'FEMALE' ? '女' : '-' }} @@ -310,7 +265,8 @@ -+已选择：{{ selectedStudent.name }} @@ -333,12 +289,7 @@ -+ @@ -352,7 +303,8 @@ 新密码：
-+@@ -672,11 +624,11 @@ const loadStudentsForSelect = async () => { studentsLoading.value = true; try { const result = await getStudents({ - page: studentPagination.current, - pageSize: studentPagination.pageSize, - keyword: studentSearchKeyword.value || undefined, - classId: studentClassFilter.value || undefined, - }); + page: studentPagination.current, + pageSize: studentPagination.pageSize, + keyword: studentSearchKeyword.value || undefined, + classId: studentClassFilter.value || undefined, + }); studentTableData.value = result.items; studentPagination.total = result.total; } catch (error) { @@ -744,6 +696,7 @@ onMounted(() => { border-radius: 12px; border: 2px solid #F0F0F0; } + .search-box :deep(.ant-input-affix-wrapper:hover) { border-color: #FF8C42; } @@ -759,15 +712,18 @@ onMounted(() => { align-items: center; padding: 12px 16px; } + .children-list-ant :deep(.ant-list-item-meta) { display: flex; align-items: center; margin-bottom: 0; } + .children-list-ant :deep(.ant-list-item-meta-content) { display: flex; align-items: center; } + .children-list-ant :deep(.ant-list-item-meta-title) { margin-bottom: 0; line-height: 1; @@ -782,6 +738,7 @@ onMounted(() => { .search-box :deep(.ant-input-search) { width: 100% !important; } + .card-actions { flex-wrap: wrap; } diff --git a/reading-platform-frontend/src/views/school/schedule/ScheduleView.vue b/reading-platform-frontend/src/views/school/schedule/ScheduleView.vue index 7340af1..8cb7c59 100644 --- a/reading-platform-frontend/src/views/school/schedule/ScheduleView.vue +++ b/reading-platform-frontend/src/views/school/schedule/ScheduleView.vue @@ -1,11 +1,15 @@{{ newPassword }} --课程排期
-+ +课程排期
+- @@ -24,12 +28,16 @@+ + + 新建排课 - + + + 排课模板 - @@ -53,39 +61,20 @@+ + + 视图切换 - + {{ cls.name }} + {{ teacher.name }} - + + 有效 已取消 编辑 -+ 取消 - + + -- + {{ cls.name }} - + {{ course.name }} - + {{ teacher.name }} @@ -187,12 +149,8 @@- + @@ -211,12 +169,7 @@ + 新建模板 @@ -229,6 +182,7 @@ size="small" rowKey="id" :pagination="{ pageSize: 5 }" + :scroll="{ x: true }" > @@ -252,18 +206,9 @@ - - + + -- + + 添加排课 @@ -336,6 +271,7 @@ size="small" rowKey="key" :pagination="false" + :scroll="{ x: true }" > @@ -375,12 +311,8 @@ - + @@ -464,14 +396,14 @@ const pagination = reactive({ // 表格列 const columns = [ - { title: '班级', dataIndex: 'className', key: 'className' }, - { title: '课程', dataIndex: 'courseName', key: 'courseName' }, - { title: '授课教师', dataIndex: 'teacherName', key: 'teacherName' }, - { title: '排课时间', key: 'scheduledDate' }, - { title: '重复', dataIndex: 'repeatType', key: 'repeatType' }, - { title: '来源', dataIndex: 'source', key: 'source' }, - { title: '状态', dataIndex: 'status', key: 'status' }, - { title: '操作', key: 'actions', width: 150 }, + { title: '班级', dataIndex: 'className', key: 'className', minWidth: 100 }, + { title: '课程', dataIndex: 'courseName', key: 'courseName', minWidth: 160 }, + { title: '授课教师', dataIndex: 'teacherName', key: 'teacherName', minWidth: 120 }, + { title: '排课时间', key: 'scheduledDate', minWidth: 180 }, + { title: '重复', dataIndex: 'repeatType', key: 'repeatType', minWidth: 80, maxWidth: 100 }, + { title: '来源', dataIndex: 'source', key: 'source', minWidth: 90, maxWidth: 110 }, + { title: '状态', dataIndex: 'status', key: 'status', minWidth: 80, maxWidth: 100 }, + { title: '操作', key: 'actions', minWidth: 150, fixed: 'right' as const }, ]; // 弹窗 @@ -681,14 +613,14 @@ const templateModalVisible = ref(false); const templateLoading = ref(false); const templates = ref - @@ -24,12 +26,16 @@+ + + 新建排课 - + + + 排课模板 - @@ -49,12 +55,16 @@+ + + 视图切换 - + + + 上一周 本周 - @@ -65,24 +75,14 @@+ + + 下一周 周次：{{ weekRangeText }} - + {{ cls.name }} + {{ teacher.name }} @@ -93,12 +93,8 @@-+@@ -107,25 +103,19 @@{{ day.dayName }}{{ day.dateDisplay }}--++ ]" @click="showScheduleDetail(schedule)">{{ schedule.scheduledTime || '待定' }}-{{ schedule.courseName }}+{{ + schedule.courseName }}{{ schedule.className }}{{ schedule.teacherName }} @@ -142,12 +132,7 @@-+ {{ selectedSchedule.className }} @@ -174,30 +159,19 @@+ 新建模板 + 应用 @@ -207,33 +181,22 @@+ 添加排课 + @@ -272,12 +235,8 @@ + @@ -594,4 +553,8 @@ onMounted(() => { diff --git a/reading-platform-frontend/src/views/school/school-courses/SchoolCourseListView.vue b/reading-platform-frontend/src/views/school/school-courses/SchoolCourseListView.vue index e5517fc..e6c002b 100644 --- a/reading-platform-frontend/src/views/school/school-courses/SchoolCourseListView.vue +++ b/reading-platform-frontend/src/views/school/school-courses/SchoolCourseListView.vue @@ -67,6 +67,7 @@ :loading="loading" row-key="id" :pagination="{ pageSize: 10 }" + :scroll="{ x: true }" > @@ -322,21 +323,21 @@ const getFileUrl = (filePath: string | null | undefined): string => { }; const columns = [ - { title: 'ID', dataIndex: 'id', key: 'id', width: 60 }, - { title: '校本课程包名称', key: 'name' }, - { title: '基于课程包', key: 'sourceCourse' }, - { title: '创建者', key: 'createdBy', width: 100 }, - { title: '使用次数', dataIndex: 'usageCount', key: 'usageCount', width: 100 }, - { title: '状态', dataIndex: 'status', key: 'status', width: 80 }, - { title: '操作', key: 'action', width: 180 }, + { title: 'ID', dataIndex: 'id', key: 'id', minWidth: 60 }, + { title: '校本课程包名称', key: 'name', minWidth: 200 }, + { title: '基于课程包', key: 'sourceCourse', minWidth: 200 }, + { title: '创建者', key: 'createdBy', minWidth: 100 }, + { title: '使用次数', dataIndex: 'usageCount', key: 'usageCount', minWidth: 100 }, + { title: '状态', dataIndex: 'status', key: 'status', minWidth: 80 }, + { title: '操作', key: 'action', minWidth: 200, fixed: 'right' as const }, ]; const reservationColumns = [ - { title: '预约时间', dataIndex: 'scheduledDate', key: 'scheduledDate', width: 160 }, - { title: '教师', dataIndex: ['teacher', 'name'], key: 'teacherName', width: 100 }, - { title: '班级', dataIndex: ['class', 'name'], key: 'className', width: 100 }, - { title: '状态', key: 'status', width: 80 }, - { title: '操作', key: 'action', width: 80 }, + { title: '预约时间', dataIndex: 'scheduledDate', key: 'scheduledDate', minWidth: 160 }, + { title: '教师', dataIndex: ['teacher', 'name'], key: 'teacherName', minWidth: 100 }, + { title: '班级', dataIndex: ['class', 'name'], key: 'className', minWidth: 100 }, + { title: '状态', key: 'status', minWidth: 80 }, + { title: '操作', key: 'action', minWidth: 80, fixed: 'right' as const }, ]; // 计算属性 @@ -538,4 +539,8 @@ onMounted(() => { .list-card :deep(.ant-card-head) { border-bottom: 1px solid #f0f0f0; } + +:deep(.ant-table-thead > tr > th) { + white-space: nowrap; +} diff --git a/reading-platform-frontend/src/views/school/settings/OperationLogView.vue b/reading-platform-frontend/src/views/school/settings/OperationLogView.vue index 0d06adb..5583271 100644 --- a/reading-platform-frontend/src/views/school/settings/OperationLogView.vue +++ b/reading-platform-frontend/src/views/school/settings/OperationLogView.vue @@ -7,34 +7,21 @@ -- @@ -62,14 +49,8 @@+ {{ module }} + {{ action }} + - + + + 查询 + {{ record.userType }} @@ -90,12 +71,7 @@+ {{ selectedLog.userType }} (ID: {{ selectedLog.userId }}) @@ -119,10 +95,12 @@ {{ selectedLog.description }} - {{ formatJson(selectedLog.oldValue) }}+{{ + formatJson(selectedLog.oldValue) }}- {{ formatJson(selectedLog.newValue) }}+{{ + formatJson(selectedLog.newValue) }}-+{{ getTypeText(task.taskType) }} @@ -107,13 +91,10 @@-- {{ getCompletedCount(task) }}/{{ task.completionCount || 0 }} 人完成 + + {{ getCompletedCount(task) }}/{{ task.completionCount || 0 }} + 人完成 @@ -46,21 +48,11 @@@@ -142,24 +123,13 @@ --+ + @@ -187,46 +157,28 @@ - + {{ cls.name }} ({{ cls.grade }}) - + + -{{ completionStats.pending }} 待完成 {{ completionStats.inProgress }} 进行中 {{ completionStats.completed }} 已完成 + diff --git a/reading-platform-frontend/src/views/teacher/classes/ClassStudentsView.vue b/reading-platform-frontend/src/views/teacher/classes/ClassStudentsView.vue index 5f2c0bd..62a1165 100644 --- a/reading-platform-frontend/src/views/teacher/classes/ClassStudentsView.vue +++ b/reading-platform-frontend/src/views/teacher/classes/ClassStudentsView.vue @@ -5,7 +5,9 @@ -
+班级学生 +
班级学生 + {{ classInfo.name }} - 共 {{ students.length }} 名学生
-学生列表
-+ + @@ -78,12 +70,8 @@{{ record.lessonCount || 0 }} -+ @@ -96,12 +84,7 @@ - + @@ -196,11 +180,11 @@ const avatarColors = ['#FF8C42', '#667eea', '#f093fb', '#4facfe', '#43e97b', '#f const getAvatarColor = (id: number) => avatarColors[id % avatarColors.length]; const columns = [ - { title: '姓名', key: 'name', dataIndex: 'name' }, - { title: '阅读次数', key: 'readingCount', dataIndex: 'readingCount', width: 100 }, - { title: '上课次数', key: 'lessonCount', dataIndex: 'lessonCount', width: 100 }, - { title: '平均得分', key: 'avgScore', width: 120 }, - { title: '操作', key: 'action', width: 100 }, + { title: '姓名', key: 'name', dataIndex: 'name', minWidth: 140 }, + { title: '阅读次数', key: 'readingCount', dataIndex: 'readingCount', minWidth: 100 }, + { title: '上课次数', key: 'lessonCount', dataIndex: 'lessonCount', minWidth: 100 }, + { title: '平均得分', key: 'avgScore', minWidth: 120 }, + { title: '操作', key: 'action', minWidth: 100, fixed: 'right' as const }, ]; const filteredStudents = computed(() => { @@ -273,6 +257,10 @@ $primary-color: #FF8C42; $primary-light: #FFF4EC; .class-students-view { + :deep(.ant-table-thead > tr > th) { + white-space: nowrap; + } + .page-header { display: flex; align-items: center; diff --git a/reading-platform-frontend/src/views/teacher/school-courses/SchoolCourseDetailView.vue b/reading-platform-frontend/src/views/teacher/school-courses/SchoolCourseDetailView.vue index 607b8f1..116e170 100644 --- a/reading-platform-frontend/src/views/teacher/school-courses/SchoolCourseDetailView.vue +++ b/reading-platform-frontend/src/views/teacher/school-courses/SchoolCourseDetailView.vue @@ -28,12 +28,7 @@@@ -153,7 +136,8 @@ {{ record.lesson?.course?.name || '未知课程' }}{{ formatDateTime(record.lesson?.startDatetime) }}-+ 课程列表 -+ {{ getLessonTypeName(record.lessonType) }} diff --git a/reading-platform-frontend/src/views/teacher/school-courses/SchoolCourseListView.vue b/reading-platform-frontend/src/views/teacher/school-courses/SchoolCourseListView.vue index 4264814..79c42d3 100644 --- a/reading-platform-frontend/src/views/teacher/school-courses/SchoolCourseListView.vue +++ b/reading-platform-frontend/src/views/teacher/school-courses/SchoolCourseListView.vue @@ -6,25 +6,19 @@- -+ + + 创建校本课程包 + -@@ -62,13 +56,13 @@ const loading = ref(false); const dataSource = ref+
{{ record.sourceCourse?.name }}