dusenyao 3 éve
szülő
commit
7da9967cd8

+ 0 - 3
src/layouts/components/LayoutHeader.vue

@@ -115,10 +115,8 @@ export default {
     // 改变下拉框导航索引
     changeLoginNavIndex(key) {
       if (!key) return;
-      console.log(this.projectList);
       this.loginNav = key;
       this.LoginNavIndex = this.projectList.findIndex(item => item.key === key);
-      console.log(this.LoginNavIndex);
     },
     // 切换项目
     handleCommand(command) {
@@ -166,7 +164,6 @@ export default {
             this.projectList.forEach((item, index) => {
               if (item.key === this.loginNav) {
                 this.LoginNavIndex = index;
-                console.log(this.LoginNavIndex);
               }
             });
           }

+ 5 - 4
src/views/live/student/audit.js

@@ -1,6 +1,7 @@
 import { Message } from 'element-ui';
 import { rtc, getHistory } from '@/views/live/common';
 export { initSDK, sendMsg, getLiveStat, createScript, downloadWebSDK, handsDown, chatRoll } from '@/views/live/common';
+import i18n from '@/utils/i18n';
 
 /**
  * 取消订阅远程流
@@ -24,7 +25,7 @@ export function initListener(vue) {
   rtc.on('login_success', data => {
     console.log('登录成功', data);
     Message({
-      message: '登录成功',
+      message: i18n.t('Key442'),
       type: 'success'
     });
   });
@@ -32,7 +33,7 @@ export function initListener(vue) {
   rtc.on('login_failed', data => {
     console.log('登录失败', data);
     Message({
-      message: `登录失败:${JSON.stringify(data)}`,
+      message: `${i18n.t('Key443')}:${JSON.stringify(data)}`,
       type: 'warning'
     });
   });
@@ -97,7 +98,7 @@ export function initListener(vue) {
     console.log('直播已开启', str);
     Message({
       type: 'success',
-      message: '直播已开启'
+      message: i18n.t('Key456')
     });
     vue.liveStat = true;
   });
@@ -106,7 +107,7 @@ export function initListener(vue) {
     console.log('分组讨论已关闭', str);
     Message({
       type: 'success',
-      message: '分组讨论已关闭'
+      message: i18n.t('Key457')
     });
     vue.liveStat = false;
   });

+ 14 - 1
src/views/live/student/audit.vue

@@ -231,7 +231,20 @@ export default {
     this.getMyGroupInfo_Student();
 
     this.updateWordPack({
-      word_key_list: ['Key94', 'Key459', 'Key409', 'Key410', 'Key302', 'Key460', 'Key458']
+      word_key_list: [
+        'Key94',
+        'Key459',
+        'Key409',
+        'Key410',
+        'Key302',
+        'Key460',
+        'Key458',
+        'Key441',
+        'Key442',
+        'Key443',
+        'Key456',
+        'Key457'
+      ]
     });
   },
   mounted() {

+ 7 - 6
src/views/live/student/group.js

@@ -14,6 +14,7 @@ export {
   pauseVideo,
   playVideo
 } from '@/views/live/common';
+import i18n from '@/utils/i18n';
 
 /**
  * 取消订阅远程流
@@ -49,7 +50,7 @@ function createLocalStream(vue) {
       // 创建本地流失败,应用层处理
       Message({
         type: 'error',
-        message: `创建本地流失败:${data}`
+        message: `${i18n.t('Key441')}:${data}`
       });
     }
   });
@@ -62,7 +63,7 @@ export function initListener(vue) {
   rtc.on('login_success', data => {
     console.log('登录成功', data);
     Message({
-      message: '登录成功',
+      message: i18n.t('Key442'),
       type: 'success'
     });
   });
@@ -70,7 +71,7 @@ export function initListener(vue) {
   rtc.on('login_failed', data => {
     console.log('登录失败', data);
     Message({
-      message: `登录失败:${JSON.stringify(data)}`,
+      message: `${i18n.t('Key443')}:${JSON.stringify(data)}`,
       type: 'warning'
     });
   });
@@ -144,7 +145,7 @@ export function initListener(vue) {
   rtc.on('local_stream_publish_failed', () => {
     console.log('推流前查询直播状态失败,导致没有推流');
     Message({
-      message: '推流前查询直播状态失败,导致没有推流',
+      message: i18n.t('Key403'),
       type: 'warning'
     });
   });
@@ -159,7 +160,7 @@ export function initListener(vue) {
     console.log('直播已开启', str);
     Message({
       type: 'success',
-      message: '直播已开启'
+      message: i18n.t('Key456')
     });
     vue.liveStat = true;
   });
@@ -168,7 +169,7 @@ export function initListener(vue) {
     console.log('分组讨论已关闭', str);
     Message({
       type: 'success',
-      message: '分组讨论已关闭'
+      message: i18n.t('Key457')
     });
     vue.liveStat = false;
   });

+ 7 - 1
src/views/live/student/group.vue

@@ -254,7 +254,13 @@ export default {
         'Key434',
         'Key435',
         'Key436',
-        'Key458'
+        'Key458',
+        'Key441',
+        'Key442',
+        'Key443',
+        'Key403',
+        'Key456',
+        'Key457'
       ]
     });
   },

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

@@ -342,7 +342,12 @@ export default {
         'Key296',
         'Key425',
         'Key431',
-        'Key441'
+        'Key441',
+        'Key442',
+        'Key445',
+        'Key446',
+        'Key403',
+        'Key456'
       ]
     });
   },

+ 8 - 7
src/views/live/student/live.js

@@ -13,6 +13,7 @@ export {
   updateMcResult,
   sendPublishMessage
 } from '@/views/live/common';
+import i18n from '@/utils/i18n';
 
 // 连麦
 
@@ -53,7 +54,7 @@ export function initListener(vue) {
   rtc.on('login_success', data => {
     console.log('登录成功', data);
     Message({
-      message: '登录成功',
+      message: i18n.t('Key442'),
       type: 'success'
     });
     vue.roomData = data;
@@ -69,7 +70,7 @@ export function initListener(vue) {
   rtc.on('login_failed', data => {
     console.log('登录失败', data);
     Message({
-      message: `登录失败:${JSON.stringify(data)}`,
+      message: `${i18n.t('Key443')}:${JSON.stringify(data)}`,
       type: 'warning'
     });
   });
@@ -111,7 +112,7 @@ export function initListener(vue) {
         console.log('直播关闭状态或查询直播失败: ', str);
         Message({
           type: 'error',
-          message: `直播关闭状态或查询直播失败: ${str}`
+          message: `${i18n.t('Key445')}: ${str}`
         });
       }
     });
@@ -121,7 +122,7 @@ export function initListener(vue) {
     // 加入房间失败  err为错误原因
     console.log('加入房间失败', err);
     Message({
-      message: `加入房间失败:${err}`,
+      message: `${i18n.t('Key446')}:${err}`,
       type: 'warning'
     });
   });
@@ -157,7 +158,7 @@ export function initListener(vue) {
   rtc.on('local_stream_publish_failed', () => {
     console.log('推流前查询直播状态失败,导致没有推流');
     Message({
-      message: '推流前查询直播状态失败,导致没有推流',
+      message: i18n.t('Key403'),
       type: 'warning'
     });
   });
@@ -173,7 +174,7 @@ export function initListener(vue) {
     console.log('直播已开启', str);
     Message({
       type: 'success',
-      message: '直播已开启'
+      message: i18n.t('Key456')
     });
     vue.liveStat = true;
   });
@@ -302,7 +303,7 @@ export function initListener(vue) {
           // 创建本地流失败,应用层处理
           Message({
             type: 'error',
-            message: `创建本地流失败:${data.err}`
+            message: `${i18n.t('Key441')}:${data.err}`
           });
         }
       });

+ 9 - 8
src/views/live/teacher/group.js

@@ -1,6 +1,7 @@
 import { Message } from 'element-ui';
 import { rtc, updateMcResult, createScript, createData } from '@/views/live/common';
 export { initSDK, sendMsg, closeVideo, roomUpdate, chatRoll, reconnection } from '@/views/live/common';
+import i18n from '@/utils/i18n';
 
 /**
  * 推送本地流
@@ -38,7 +39,7 @@ function createLocalStream() {
       // 创建本地流失败,应用层处理
       Message({
         type: 'error',
-        message: `创建本地流失败:${data}`
+        message: `${i18n.t('Key441')}:${data}`
       });
     }
   });
@@ -71,7 +72,7 @@ export function initListener(vue) {
   rtc.on('login_failed', data => {
     console.log('登录失败', data);
     Message({
-      message: `登录失败:${JSON.stringify(data)}`,
+      message: `${i18n.t('Key443')}:${JSON.stringify(data)}`,
       type: 'warning'
     });
   });
@@ -79,10 +80,10 @@ export function initListener(vue) {
   // 教师 必须在加入房间成功的事件回调里创建本地流
   rtc.on('conference_join', () => {
     console.log('加入房间成功');
-    Message({
-      message: '加入房间成功',
-      type: 'success'
-    });
+    // Message({
+    //   message: '加入房间成功',
+    //   type: 'success'
+    // });
 
     rtc.handsUp({
       success: str => {
@@ -132,7 +133,7 @@ export function initListener(vue) {
   rtc.on('not_live', () => {
     console.log('直播未开始,不能推流');
     Message({
-      message: '直播未开始,不能推流',
+      message: i18n.t('Key402'),
       type: 'warning'
     });
   });
@@ -141,7 +142,7 @@ export function initListener(vue) {
   rtc.on('local_stream_publish_failed', () => {
     console.log('推流前查询直播状态失败,导致没有推流');
     Message({
-      message: '推流前查询直播状态失败,导致没有推流',
+      message: i18n.t('Key403'),
       type: 'warning'
     });
   });

+ 4 - 1
src/views/live/teacher/group.vue

@@ -312,7 +312,10 @@ export default {
         'Key414',
         'Key415',
         'Key416',
-        'Key417'
+        'Key417',
+        'Key443',
+        'Key402',
+        'Key403'
       ]
     });
   },

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

@@ -448,7 +448,21 @@ export default {
         'Key438',
         'Key399',
         'Key401',
-        'Key441'
+        'Key441',
+        'Key442',
+        'Key443',
+        'Key444',
+        'Key445',
+        'Key446',
+        'Key402',
+        'Key403',
+        'Key449',
+        'Key450',
+        'Key451',
+        'Key452',
+        'Key453',
+        'Key454',
+        'Key455'
       ]
     });
   },

+ 15 - 14
src/views/live/teacher/live.js

@@ -22,6 +22,7 @@ export {
   pauseVideo,
   playVideo
 } from '@/views/live/common';
+import i18n from '@/utils/i18n';
 
 /**
  * 推送本地流
@@ -62,7 +63,7 @@ export function createLocalStream(vue) {
       // 创建本地流失败,应用层处理
       Message({
         type: 'error',
-        message: `创建本地流失败:${data.err}`
+        message: `${i18n.t('Key441')}:${data.err}`
       });
     }
   });
@@ -82,7 +83,7 @@ export function initListener(vue) {
   rtc.on('login_success', data => {
     console.log('登录成功', data);
     Message({
-      message: '登录成功',
+      message: i18n.t('Key442'),
       type: 'success'
     });
     vue.roomData = data;
@@ -100,7 +101,7 @@ export function initListener(vue) {
   rtc.on('login_failed', data => {
     console.log('登录失败', data);
     Message({
-      message: `登录失败:${JSON.stringify(data)}`,
+      message: `${i18n.t('Key443')}:${JSON.stringify(data)}`,
       type: 'warning'
     });
   });
@@ -129,7 +130,7 @@ export function initListener(vue) {
         if (data.video.length === 0 && data.audio.length === 0) {
           Message({
             type: 'warning',
-            message: '无音视频设备,无法创建本地流'
+            message: i18n.t('Key444')
           });
         }
 
@@ -150,7 +151,7 @@ export function initListener(vue) {
         console.log('直播关闭状态或查询直播失败: ', str);
         Message({
           type: 'error',
-          message: `直播关闭状态或查询直播失败: ${str}`
+          message: `${i18n.t('Key445')}: ${str}`
         });
       }
     });
@@ -160,7 +161,7 @@ export function initListener(vue) {
     // 加入房间失败  err为错误原因
     console.log('加入房间失败', err);
     Message({
-      message: `加入房间失败:${err}`,
+      message: `${i18n.t('Key446')}:${err}`,
       type: 'warning'
     });
   });
@@ -199,7 +200,7 @@ export function initListener(vue) {
   rtc.on('not_live', () => {
     console.log('直播未开始,不能推流');
     Message({
-      message: '直播未开始,不能推流',
+      message: i18n.t('Key402'),
       type: 'warning'
     });
   });
@@ -208,7 +209,7 @@ export function initListener(vue) {
   rtc.on('local_stream_publish_failed', () => {
     console.log('推流前查询直播状态失败,导致没有推流');
     Message({
-      message: '推流前查询直播状态失败,导致没有推流',
+      message: i18n.t('Key403'),
       type: 'warning'
     });
   });
@@ -343,7 +344,7 @@ export function initListener(vue) {
       vue.callLoading = false;
       Message({
         type: 'warning',
-        message: '对方已挂断'
+        message: i18n.t('Key449')
       });
     }
 
@@ -352,7 +353,7 @@ export function initListener(vue) {
       vue.callLoading = false;
       Message({
         type: 'warning',
-        message: `对方当前没有${data.video_mode === 1 ? '视频' : '音频'}设备`
+        message: data.video_mode === 1 ? i18n.t('Key451') : i18n.t('Key450')
       });
     }
   });
@@ -367,13 +368,13 @@ export function startLive() {
       console.log(data);
       publishStream('main'); // 如果需要立即推流,执行 publish 方法
       Message({
-        message: '开启直播成功',
+        message: i18n.t('Key452'),
         type: 'success'
       });
     },
     fail(data) {
       Message({
-        message: `开启直播失败:${data}`,
+        message: `${i18n.t('Key453')}:${data}`,
         type: 'warning'
       });
     }
@@ -388,13 +389,13 @@ export function stopLive() {
     success() {
       Message({
         type: 'success',
-        message: '直播已结束'
+        message: i18n.t('Key454')
       });
     },
     fail(data) {
       Message({
         type: 'error',
-        message: `结束直播失败:${JSON.stringify(data)}`
+        message: `${i18n.t('Key455')}:${JSON.stringify(data)}`
       });
     }
   });