Merge branch 'main' of https://gitlab.lingxixue.com/dmg/lingxixue-admin

playground/src/views/org/classroom-monitor/home.vue

@@ -259,15 +259,15 @@ function formatTime(time?: number | string) {
   return date.toLocaleString()
 }
 
-/** teacher-electron 注入：打开独立屏幕共享窗口 */
+/** teacher-electron：打开课堂管控窗口（教师推屏 + 学员屏幕监控） */
-async function openTeacherScreenShareWindow(item: ClassroomItem) {
+async function openClassroomControlWindow(item: ClassroomItem) {
   const api = window.teacherApi
   if (!api?.openScreenShareWindow) {
-    hud.warning('请在教师端桌面客户端中使用「共享屏幕」')
+    hud.warning('请在教师端桌面客户端中使用「课堂管控」')
     return
   }
   await hud.load({
-    option: '准备共享屏幕',
+    option: '准备课堂管控',
     task: async () => {
       try {
         const page = await classStudentService.findPage(1, 999, {
@@ -281,34 +281,7 @@ async function openTeacherScreenShareWindow(item: ClassroomItem) {
       }
     },
     error: async () => {
-      hud.error('打开屏幕共享窗口失败')
+      hud.error('打开课堂管控窗口失败')
-    },
-  })
-}
-
-/** teacher-electron：学员 JPEG 截屏监控窗口 */
-async function openStudentScreenMonitorWindow(item: ClassroomItem) {
-  const openMon = window.teacherApi?.openStudentScreenMonitorWindow
-  if (!openMon) {
-    hud.warning('请在教师端桌面客户端中使用「屏幕监控」')
-    return
-  }
-  await hud.load({
-    option: '准备屏幕监控',
-    task: async () => {
-      try {
-        const page = await classStudentService.findPage(1, 999, {
-          classId: item.id,
-        })
-        const rows = (page as any)?.data?.rows ?? page?.rows ?? []
-        await openMon(rows, item.name ?? '', item.id)
-      } catch (error) {
-        console.error(error)
-        throw error
-      }
-    },
-    error: async () => {
-      hud.error('打开屏幕监控窗口失败')
     },
   })
 }
@@ -332,17 +305,8 @@ async function openStudentScreenMonitorWindow(item: ClassroomItem) {
             <span class="class-name">{{ item.name }}</span>
           </div>
           <div class="class-row-actions">
-            <el-button
+            <el-button type="primary" @click="openClassroomControlWindow(item)">
-              type="primary"
+              课堂管控
-              @click="openTeacherScreenShareWindow(item)"
-            >
-              共享屏幕
-            </el-button>
-            <el-button
-              type="primary"
-              @click="openStudentScreenMonitorWindow(item)"
-            >
-              屏幕监控
             </el-button>
           </div>
         </div>