From 709e59e1429f6e5bdae9d845a793e997ded947dc Mon Sep 17 00:00:00 2001
From: zhonghua <zhonghua>
Date: Mon, 16 Mar 2026 19:22:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B1=95=E6=92=AD=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8E=E6=8E=92=E8=AF=BE=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 展播模式：空状态/错误状态添加返回上课按钮
- 展播模式：退出时自动跳转回上课页面或关闭标签页
- 数据库：lesson表id添加AUTO_INCREMENT，修复预约上课报错

Made-with: Cursor
---
 reading-platform-frontend/src/components.d.ts | 13 +++++++
 .../views/teacher/lessons/BroadcastView.vue   | 35 ++++++++++++++++---
 .../V12__add_lesson_auto_increment.sql        |  9 +++++
 3 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 reading-platform-java/src/main/resources/db/migration/V12__add_lesson_auto_increment.sql

diff --git a/reading-platform-frontend/src/components.d.ts b/reading-platform-frontend/src/components.d.ts
index f58df7e..5c0795f 100644
--- a/reading-platform-frontend/src/components.d.ts
+++ b/reading-platform-frontend/src/components.d.ts
@@ -11,11 +11,16 @@ declare module 'vue' {
     AAvatar: typeof import('ant-design-vue/es')['Avatar']
     ABadge: typeof import('ant-design-vue/es')['Badge']
     AButton: typeof import('ant-design-vue/es')['Button']
+    AButtonGroup: typeof import('ant-design-vue/es')['ButtonGroup']
     ACard: typeof import('ant-design-vue/es')['Card']
     ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
     ACheckboxGroup: typeof import('ant-design-vue/es')['CheckboxGroup']
     ACol: typeof import('ant-design-vue/es')['Col']
+    ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
+    ADescriptions: typeof import('ant-design-vue/es')['Descriptions']
+    ADescriptionsItem: typeof import('ant-design-vue/es')['DescriptionsItem']
     ADivider: typeof import('ant-design-vue/es')['Divider']
+    ADrawer: typeof import('ant-design-vue/es')['Drawer']
     ADropdown: typeof import('ant-design-vue/es')['Dropdown']
     AEmpty: typeof import('ant-design-vue/es')['Empty']
     AForm: typeof import('ant-design-vue/es')['Form']
@@ -34,25 +39,33 @@ declare module 'vue' {
     AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
     AModal: typeof import('ant-design-vue/es')['Modal']
     APageHeader: typeof import('ant-design-vue/es')['PageHeader']
+    APagination: typeof import('ant-design-vue/es')['Pagination']
     APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
     AProgress: typeof import('ant-design-vue/es')['Progress']
     ARadio: typeof import('ant-design-vue/es')['Radio']
     ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
+    ARangePicker: typeof import('ant-design-vue/es')['RangePicker']
+    ARate: typeof import('ant-design-vue/es')['Rate']
     ARow: typeof import('ant-design-vue/es')['Row']
     ASelect: typeof import('ant-design-vue/es')['Select']
     ASelectOptGroup: typeof import('ant-design-vue/es')['SelectOptGroup']
     ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
+    ASkeleton: typeof import('ant-design-vue/es')['Skeleton']
     ASpace: typeof import('ant-design-vue/es')['Space']
     ASpin: typeof import('ant-design-vue/es')['Spin']
+    AStatistic: typeof import('ant-design-vue/es')['Statistic']
     AStep: typeof import('ant-design-vue/es')['Step']
     ASteps: typeof import('ant-design-vue/es')['Steps']
+    ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
     ASwitch: typeof import('ant-design-vue/es')['Switch']
     ATable: typeof import('ant-design-vue/es')['Table']
     ATabPane: typeof import('ant-design-vue/es')['TabPane']
     ATabs: typeof import('ant-design-vue/es')['Tabs']
     ATag: typeof import('ant-design-vue/es')['Tag']
     ATextarea: typeof import('ant-design-vue/es')['Textarea']
+    ATimeRangePicker: typeof import('ant-design-vue/es')['TimeRangePicker']
     ATooltip: typeof import('ant-design-vue/es')['Tooltip']
+    ATypographyText: typeof import('ant-design-vue/es')['TypographyText']
     AUpload: typeof import('ant-design-vue/es')['Upload']
     FilePreviewModal: typeof import('./components/FilePreviewModal.vue')['default']
     FileUploader: typeof import('./components/course/FileUploader.vue')['default']
diff --git a/reading-platform-frontend/src/views/teacher/lessons/BroadcastView.vue b/reading-platform-frontend/src/views/teacher/lessons/BroadcastView.vue
index 2afda7a..b124013 100644
--- a/reading-platform-frontend/src/views/teacher/lessons/BroadcastView.vue
+++ b/reading-platform-frontend/src/views/teacher/lessons/BroadcastView.vue
@@ -10,7 +10,10 @@
     <div v-else-if="error" class="error-container">
       <ExclamationCircleOutlined style="font-size: 48px; color: #ff4d4f;" />
       <p>{{ error }}</p>
-      <a-button type="primary" @click="loadData">重新加载</a-button>
+      <a-space>
+        <a-button type="primary" @click="loadData">重新加载</a-button>
+        <a-button @click="goBackToLesson">返回上课</a-button>
+      </a-space>
     </div>
 
     <!-- 展播内容 -->
@@ -30,19 +33,22 @@
     <div v-else class="empty-container">
       <InboxOutlined style="font-size: 48px; color: #ccc;" />
       <p>暂无展播内容</p>
+      <p class="empty-hint">请先在上课页面选择教学环节，或确认课程已配置教学流程</p>
+      <a-button type="primary" @click="goBackToLesson">返回上课</a-button>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
 import { ref, computed, onMounted, onUnmounted } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { ExclamationCircleOutlined, InboxOutlined } from '@ant-design/icons-vue';
 import { message } from 'ant-design-vue';
 import KidsMode from './components/KidsMode.vue';
 import * as teacherApi from '@/api/teacher';
 
 const route = useRoute();
+const router = useRouter();
 
 // 状态
 const loading = ref(true);
@@ -273,9 +279,24 @@ const loadData = async () => {
   }
 };
 
-// 处理退出
+// 返回上课页面
+const goBackToLesson = () => {
+  if (lessonId) {
+    router.push(`/teacher/lessons/${lessonId}`);
+  } else {
+    router.push('/teacher/lessons');
+  }
+};
+
+// 处理退出：跳转回上课页面
 const handleExit = () => {
-  message.info('展播模式已关闭，您可以关闭此标签页');
+  // 优先尝试关闭标签页并聚焦 opener（从上课页新开时）
+  if (window.opener && !window.opener.closed) {
+    window.opener.focus();
+    window.close();
+  } else {
+    goBackToLesson();
+  }
 };
 
 // 处理环节切换
@@ -358,6 +379,12 @@ onUnmounted(() => {
     font-size: 18px;
     opacity: 0.8;
   }
+
+  .empty-hint {
+    font-size: 14px !important;
+    opacity: 0.6;
+    margin: 0;
+  }
 }
 
 .error-container {
diff --git a/reading-platform-java/src/main/resources/db/migration/V12__add_lesson_auto_increment.sql b/reading-platform-java/src/main/resources/db/migration/V12__add_lesson_auto_increment.sql
new file mode 100644
index 0000000..02ade35
--- /dev/null
+++ b/reading-platform-java/src/main/resources/db/migration/V12__add_lesson_auto_increment.sql
@@ -0,0 +1,9 @@
+-- =====================================================
+-- 幼儿园阅读平台数据库迁移脚本
+-- 版本：V12
+-- 描述：为 lesson 表（排课表）添加 id 自增，修复预约上课报错
+-- =====================================================
+-- 说明：V11 迁移遗漏了 lesson 表，导致插入时 "Field 'id' doesn't have a default value"
+
+ALTER TABLE `lesson`
+    MODIFY COLUMN `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键 ID';