fix 问题

src/components/live/CurMaterial.vue

@@ -359,7 +359,7 @@ export default {
         exam_answer: this.exam_answer
       })
         .then(() => {
-          this.$message.success(`完成${this.isCurMaterial ? '推送' : ''}资料成功`);
+          this.$message.success('已完成');
           this.dialogMaterialClose();
         })
         .finally(() => {

src/layouts/components/LayoutHeader.vue

@@ -84,7 +84,7 @@ export default {
   created() {
     this.getChildSysList();
     this.updateWordPack({
-      word_key_list: ['Key8', 'Key9', 'Key39']
+      word_key_list: ['Key2', 'Key8', 'Key9', 'Key39', 'Key573']
     });
     const { token, isHas } = getToken();
     if (isHas) {
@@ -111,12 +111,17 @@ export default {
         window.location.href = '/';
       }
     },
+    // 改变下拉框导航索引
+    changeLoginNavIndex(key) {
+      if (!key) return;
+      this.LoginNavIndex = this.projectList.findIndex(item => item.key === key);
+    },
     // 切换项目
     handleCommand(command) {
       this.LoginNavIndex = command;
       if (!this.userMessage) {
-        this.$message.warning('请先登录');
-        this.projectName = '教学中心';
+        this.$message.warning(this.$i18n.t('Key573'));
+        this.projectName = this.$i18n.t('Key2');
         window.location.href = '/';
         return;
       }

src/layouts/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app">
     <header class="app-header">
-      <layout-header />
+      <layout-header ref="header" />
       <bread-crumb :is-show-nav.sync="isShowNav" />
     </header>
     <section class="app-main" :style="{ height: `calc(100vh - 64px ${isShowNav ? '- 56px' : ''})` }">
@@ -52,6 +52,7 @@ export default {
 
   &-main {
     width: 100%;
+    margin-left: calc(100vw - 100%);
     overflow-y: auto;
     background-color: $bac-color;
   }

src/store/modules/app.js

@@ -39,7 +39,7 @@ const mutations = {
     state.showProgress = isShow;
   },
   [app.SET_PERCENTAGE]: (state, percentage) => {
-    state.percentage = percentage;
+    state.percentage = parseInt(String(percentage).replace(/(\d+)\.\d+/, '$1'));
   }
 };
 

src/views/course_details/index.vue

@@ -260,6 +260,8 @@ export default {
       goods_id: query.goods_id,
       goods_type: Number(query.goods_type),
       readonly: 'readonly' in query ? query.readonly : false,
+      // 调用模块
+      invok_module: query.invok_module,
       collection: false,
       openList: [],
       timer: null, // 获取倒计时
@@ -294,6 +296,9 @@ export default {
         this.loading = false;
       });
   },
+  mounted() {
+    this.$parent.$refs.header.changeLoginNavIndex(this.invok_module);
+  },
   beforeDestroy() {
     // 清空定时器
     clearInterval(this.timer);
@@ -374,7 +379,6 @@ export default {
     getBackTime() {
       let date = new Date(this.CourseData.end_date);
       let targetTime = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59).getTime();
-      console.log(new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59).toString());
       // 目标时间戳 - 当前时间戳 = 倒计时
       this.timer = setInterval(() => {
         let backTime = targetTime - new Date().getTime();

src/views/live/student/group.vue

@@ -6,11 +6,7 @@
         <div class="live-title-name">
           {{ roomInfo.cs_item_name }} {{ roomInfo.task_name }}
         </div>
-        <div>
-          <el-button @click="exitRoom">
-            退出房间
-          </el-button>
-        </div>
+        <div />
       </div>
       <div class="live-course-name">
         {{ roomInfo.course_name }}
@@ -292,12 +288,6 @@ export default {
       );
     },
 
-    exitRoom() {
-      StudentExitLiveRoom({ task_id: this.task_id, room_user_id: this.room_user_id }).then(() => {
-        this.$router.push('/');
-      });
-    },
-
     getLiveStat() {
       common.getLiveStat({
         success: data => {

src/views/live/student/live.js

@@ -325,7 +325,7 @@ export function initListener(vue) {
   rtc.on('allowChatChange', ({ settings }) => {
     Message({
       type: 'success',
-      message: `已${settings.allow_chat ? '取消' : '开启'}全体禁言`
+      message: `已${settings.allow_chat ? '关闭' : '开启'}全体禁言`
     });
   });
 

src/views/live/teacher/live.js

@@ -332,7 +332,7 @@ export function initListener(vue) {
   rtc.on('allowChatChange', ({ settings }) => {
     Message({
       type: 'success',
-      message: `已${settings.allow_chat ? '取消' : '开启'}全体禁言`
+      message: `已${settings.allow_chat ? '关闭' : '开启'}全体禁言`
     });
   });
 

src/views/main/curricula_list/teacher.vue

@@ -28,7 +28,7 @@
     <!-- 课程列表 -->
     <div class="curricula-teacher-container">
       <div class="curricula-teacher-container-title">
-        <span class="title">课程列表</span>
+        <span class="title">{{ $t('Key279') }}</span>
         <div>
           <el-button class="create" @click="$router.push('/create_course')">
             <svg-icon icon-class="create" /><span>{{ $t('Key285') }}</span>
@@ -137,7 +137,8 @@ export default {
         'Key171',
         'Key173',
         'Key172',
-        'Key296'
+        'Key296',
+        'key279'
       ]
     });
     this.queryMyCourseList();

src/views/task_details/student/index.vue

@@ -38,7 +38,7 @@
       <!-- 完成评价 -->
       <template v-if="my_execute_info.is_finished === 'true'">
         <div class="teacher-commenting">
-          <div class="single-line">
+          <div v-if="is_enable_homework" class="single-line">
             <span class="label">{{ $t('Key327') }}</span>
             <div>
               <el-tag
@@ -51,15 +51,19 @@
               </el-tag>
             </div>
           </div>
-          <div v-if="teaching_type === 10" class="single-line">
-            <span class="label">{{ $t('Key316') }}</span>
-            <el-input v-model="my_execute_info.student_remark" disabled type="textarea" resize="none" :rows="6" />
-          </div>
-          <div v-if="teaching_type === 10" class="single-line">
-            <span class="label">{{ $t('Key317') }}</span>
-            <el-rate v-model="my_execute_info.student_score" disabled />
-          </div>
-          <div class="single-line">
+
+          <template v-if="teaching_type === 10 && is_enable_KHPJ">
+            <div class="single-line">
+              <span class="label">{{ $t('Key316') }}</span>
+              <el-input v-model="my_execute_info.student_remark" disabled type="textarea" resize="none" :rows="6" />
+            </div>
+            <div class="single-line">
+              <span class="label">{{ $t('Key317') }}</span>
+              <el-rate v-model="my_execute_info.student_score" disabled />
+            </div>
+          </template>
+
+          <div v-if="is_enable_message" class="single-line">
             <span class="label">{{ $t('Key328') }}</span>
             <el-input v-model="my_execute_info.student_message" disabled type="textarea" resize="none" :rows="6" />
           </div>
@@ -76,26 +80,28 @@
           <div class="single-line">
             <span class="enter-live" @click="enterLive"><svg-icon icon-class="video-red" /> {{ $t('Key329') }}</span>
           </div>
-          <div class="single-line">
-            <span class="label">{{ $t('Key316') }}</span>
-            <el-input v-model="student_remark" type="textarea" resize="none" :rows="6" />
-          </div>
-          <div class="single-line">
-            <span class="label">{{ $t('Key317') }}</span>
-            <el-rate v-model="student_score" />
-          </div>
-          <div class="confirm single-line">
-            <el-button type="primary" @click="fillTaskExecuteInfo_Student_live">
-              {{ $t('Key319') }}
-            </el-button>
-          </div>
+          <template v-if="is_enable_KHPJ">
+            <div class="single-line">
+              <span class="label">{{ $t('Key316') }}</span>
+              <el-input v-model="student_remark" type="textarea" resize="none" :rows="6" />
+            </div>
+            <div class="single-line">
+              <span class="label">{{ $t('Key317') }}</span>
+              <el-rate v-model="student_score" />
+            </div>
+            <div class="confirm single-line">
+              <el-button type="primary" @click="fillTaskExecuteInfo_Student_live">
+                {{ $t('Key319') }}
+              </el-button>
+            </div>
+          </template>
         </div>
       </template>
       <template v-else>
-        <div class="submit-homework">
+        <div v-if="is_enable_homework" class="submit-homework">
           <span class="label">{{ $t('Key330') }}</span>
           <el-upload action="no" :http-request="upload" multiple :show-file-list="false">
-            <el-button><svg-icon icon-class="upload" /> {{ $t('Key192') }}</el-button>
+            <el-button><svg-icon icon-class="upload" /> {{ $t('Key152') }}</el-button>
           </el-upload>
         </div>
         <div class="file-list">
@@ -110,11 +116,11 @@
             <span>{{ item.file_name }}</span>
           </el-tag>
         </div>
-        <div class="leave-message">
+        <div v-if="is_enable_message" class="leave-message">
           <span class="label">{{ $t('Key328') }}</span>
           <el-input v-model="student_message" type="textarea" resize="none" :rows="6" />
         </div>
-        <div class="submit-button">
+        <div v-if="is_enable_homework || is_enable_message" class="submit-button">
           <el-button type="primary" @click="fillTaskExecuteInfo_Student">
             {{ $t('Key331') }}
           </el-button>
@@ -150,7 +156,7 @@
 import TaskTop from '../TaskTop.vue';
 import FinishCourseware from '@/components/course/FinishCourseware.vue';
 import CompletionView from '@/components/course/CompletionView.vue';
-import ShowFile from '@/common/show_file';
+import ShowFile from '@/common/show_file/index.vue';
 import { fileUpload, FileDownload } from '@/api/app';
 import { CreateEnterLiveRoomSession } from '@/api/live';
 import { GetTaskInfo, FillMyTaskExecuteInfo_Student } from '@/api/course';
@@ -192,7 +198,11 @@ export default {
       student_score: 0,
       loading: false,
       showCurFileName: '',
-      showCurFileId: ''
+      showCurFileId: '',
+      // 开启课后评价
+      is_enable_KHPJ: false,
+      is_enable_homework: false,
+      is_enable_message: false
     };
   },
   computed: {
@@ -224,11 +234,10 @@ export default {
         'Key328',
         'Key318',
         'Key329',
-        'Key316',
         'Key317',
         'Key319',
         'Key330',
-        'Key192',
+        'Key152',
         'Key328',
         'Key331',
         'Key335',
@@ -256,7 +265,10 @@ export default {
           task_mode,
           content,
           time_space_view_txt,
-          my_execute_info
+          my_execute_info,
+          is_enable_KHPJ,
+          is_enable_homework,
+          is_enable_message
         }) => {
           this.itemInfo = {
             time_space_view_txt,
@@ -274,6 +286,9 @@ export default {
           this.task_mode = task_mode;
           this.time_space_view_txt = time_space_view_txt;
           this.my_execute_info = my_execute_info;
+          this.is_enable_KHPJ = is_enable_KHPJ === 'true';
+          this.is_enable_homework = is_enable_homework === 'true';
+          this.is_enable_message = is_enable_message === 'true';
         }
       )
       .finally(() => {

src/views/task_details/teacher/index.vue

@@ -54,24 +54,31 @@
               <span @click="viewFile(item.file_name, item.file_id)">{{ item.file_name }}</span>
             </el-tag>
           </div>
-          <div class="title">
-            {{ $t('Key314') }}
-          </div>
-          <div>
-            <el-tag
-              v-for="item in curFinishDetail.homework_list"
-              :key="item.file_id"
-              color="#fff"
-              :title="item.file_name"
-            >
-              <span @click="viewFile(item.file_name, item.file_id)">{{ item.file_name }}</span>
-            </el-tag>
-          </div>
-          <div class="title">
-            {{ $t('Key315') }}
-          </div>
-          <div>{{ curFinishDetail.student_message }}</div>
-          <template v-if="teaching_type === 10">
+          <!-- 作业列表 -->
+          <template v-if="is_enable_homework">
+            <div class="title">
+              {{ $t('Key314') }}
+            </div>
+            <div>
+              <el-tag
+                v-for="item in curFinishDetail.homework_list"
+                :key="item.file_id"
+                color="#fff"
+                :title="item.file_name"
+              >
+                <span @click="viewFile(item.file_name, item.file_id)">{{ item.file_name }}</span>
+              </el-tag>
+            </div>
+          </template>
+          <!-- 学员留言 -->
+          <template v-if="is_enable_message">
+            <div class="title">
+              {{ $t('Key315') }}
+            </div>
+            <div>{{ curFinishDetail.student_message }}</div>
+          </template>
+
+          <template v-if="teaching_type === 10 && is_enable_KHPJ">
             <div class="title">
               {{ $t('Key316') }}
             </div>
@@ -81,6 +88,7 @@
               <el-rate v-model="student_score" disabled />
             </div>
           </template>
+
           <div class="title">
             <span>{{ $t('Key318') }}</span>
             <el-rate v-model="teacher_score" />
@@ -163,7 +171,11 @@ export default {
       loading: false,
       student_list_height: 490,
       showCurFileName: '',
-      showCurFileId: ''
+      showCurFileId: '',
+      // 开启课后评价
+      is_enable_KHPJ: false,
+      is_enable_homework: false,
+      is_enable_message: false
     };
   },
   created() {
@@ -203,7 +215,10 @@ export default {
           time_space_view_txt,
           student_list,
           is_custom_student,
-          custom_student_list
+          custom_student_list,
+          is_enable_KHPJ,
+          is_enable_homework,
+          is_enable_message
         }) => {
           this.itemInfo = {
             time_space_view_txt,
@@ -219,6 +234,9 @@ export default {
           this.accessory_list = accessory_list;
           this.task_mode = task_mode;
           this.time_space_view_txt = time_space_view_txt;
+          this.is_enable_KHPJ = is_enable_KHPJ === 'true';
+          this.is_enable_homework = is_enable_homework === 'true';
+          this.is_enable_message = is_enable_message === 'true';
           this.student_list = is_custom_student === 'true' ? custom_student_list : student_list;
           if (this.student_list.length > 0) this.getTaskStudentExecuteInfo(this.student_list[0].student_id);
         }