Ver código fonte

update 直播

dusenyao 4 anos atrás
pai
commit
28e42f4c9e

+ 15 - 13
src/views/live/student/group.vue

@@ -97,7 +97,8 @@ import {
   StudentExitLiveRoom,
   GetLiveRoomInfo,
   IsEnableGroup,
-  GetMyGroupInfo_Student
+  GetMyGroupInfo_Student,
+  CreateEnterLiveRoomSession
 } from '@/api/live';
 import * as common from './group';
 
@@ -251,18 +252,19 @@ export default {
           .then(({ is_enable_group }) => {
             if (is_enable_group === 'false') {
               clearInterval(this.timer);
-              const {
-                room_info: { live_room_sys_user_id, room_id, session_id, room_user_id }
-              } = this.$route.query;
-              this.$router.push({
-                path: '/live/student',
-                query: {
-                  live_room_sys_user_id,
-                  room_id,
-                  session_id,
-                  task_id: this.task_id,
-                  room_user_id
-                }
+              CreateEnterLiveRoomSession({
+                task_id: this.task_id
+              }).then(({ live_room_sys_user_id, room_id, session_id, room_user_id }) => {
+                this.$router.push({
+                  path: `/live/student`,
+                  query: {
+                    live_room_sys_user_id,
+                    room_id,
+                    session_id,
+                    task_id: this.task_id,
+                    room_user_id
+                  }
+                });
               });
             }
           })

+ 1 - 8
src/views/live/student/index.vue

@@ -373,20 +373,13 @@ export default {
         let data = student_list.find(el => {
           return el.is_self === 'true';
         });
-        const query = this.$route.query;
         this.$router.push({
           path: '/live/student/group',
           query: {
             task_id: this.task_id,
             live_room_sys_user_id,
             room_id,
-            sessionid: data.session_id,
-            room_info: {
-              live_room_sys_user_id: query.live_room_sys_user_id,
-              room_id: query.room_id,
-              session_id: query.session_id,
-              room_user_id: query.room_user_id
-            }
+            sessionid: data.session_id
           }
         });
       });

+ 20 - 13
src/views/live/teacher/group.vue

@@ -106,7 +106,13 @@
 </template>
 
 <script>
-import { GetLiveRoomInfo, StudentExitLiveRoom, StopGroup, GetGroupInfo_Teacher } from '@/api/live';
+import {
+  GetLiveRoomInfo,
+  StudentExitLiveRoom,
+  StopGroup,
+  GetGroupInfo_Teacher,
+  CreateEnterLiveRoomSession
+} from '@/api/live';
 import * as common from './live';
 
 export default {
@@ -235,18 +241,19 @@ export default {
     stopGroup() {
       StopGroup({ task_id: this.task_id }).then(() => {
         this.$message.success('结束分组讨论成功');
-        const {
-          room_info: { live_room_sys_user_id, room_id, session_id, room_user_id }
-        } = this.$route.query;
-        this.$router.push({
-          path: '/live/teacher',
-          query: {
-            live_room_sys_user_id,
-            room_id,
-            session_id,
-            task_id: this.task_id,
-            room_user_id
-          }
+        CreateEnterLiveRoomSession({
+          task_id: this.task_id
+        }).then(({ live_room_sys_user_id, room_id, session_id, room_user_id }) => {
+          this.$router.push({
+            path: `/live/teacher`,
+            query: {
+              live_room_sys_user_id,
+              room_id,
+              session_id,
+              task_id: this.task_id,
+              room_user_id
+            }
+          });
         });
       });
     }

+ 1 - 8
src/views/live/teacher/index.vue

@@ -542,17 +542,10 @@ export default {
       // 开始分组讨论
       StartGroup({ task_id: this.task_id, group_count: this.group_count }).then(() => {
         this.$message.success('开启分组讨论成功');
-        let query = this.$route.query;
         this.$router.push({
           path: '/live/teacher/group',
           query: {
-            task_id: this.task_id,
-            room_info: {
-              live_room_sys_user_id: query.live_room_sys_user_id,
-              room_id: query.room_id,
-              session_id: query.session_id,
-              room_user_id: query.room_user_id
-            }
+            task_id: this.task_id
           }
         });
       });