Merge branch 'master' into ciis

package.json

@@ -73,8 +73,8 @@
     "webpack-merge": "^4.2.2"
   },
   "dependencies": {
-    "@ckeditor/ckeditor5-build-classic": "^27.0.0",
-    "@ckeditor/ckeditor5-build-decoupled-document": "^27.0.0",
+    "@ckeditor/ckeditor5-build-classic": "^24.0.0",
+    "@ckeditor/ckeditor5-build-decoupled-document": "^24.0.0",
     "@ckeditor/ckeditor5-vue2": "^1.0.5",
     "@ezijing/web-message-sdk": "^0.2.1",
     "axios": "^0.21.1",

src/api/course_api.js

@@ -10,7 +10,7 @@ export default class CourseAPI extends BaseAPI {
    * @param {[string]} isMy
    * @param {[object]} param
    */
-  getCourseList = (isMy, param) => this.get('/api/lms/v3/education/courses' + (isMy ? '/my' : ''), param)
+  getCourseList = (isMy, param) => this.get('/api/lms/v2/education/courses' + (isMy ? '/my' : ''), param)
   /**
    * 获取某个课程详细信息 - 课程考核 和 课程讨论单独获取
    * @param {[string]} id

src/main.js

@@ -10,7 +10,6 @@ import Modules from '@/modules'
 import createBefore from './components/beforeEnter'
 import _ from 'lodash'
 import VueMeta from 'vue-meta'
-
 Vue.use(VueMeta)
 
 Vue.prototype.$_ = _

src/modules/viewer/components/work/chapterWork.vue

@@ -22,7 +22,7 @@
       </div>
       <!-- 有互评的，批改后不显示 -->
       <template v-if="!(hasComment && isRevised)">
-        <p style="color: red" v-if="deadline && detail.status !== 1">
+        <p style="color: red" v-if="deadline && ![0, 1].includes(detail.status)">
           {{ $t('viewerWork.deadline', { date: deadline }) }}
         </p>
         <div class="work-bottom" v-if="detail.status !== 1">
@@ -49,11 +49,9 @@
           </div>
         </div>
         <div class="buttons">
-          <el-tooltip :content="$t('viewerWork.workSubmitButtonTips')" placement="right">
-            <el-button type="primary" :disabled="disabled" :loading="submitLoading" @click="onSubmit">{{
-              submitText
-            }}</el-button>
-          </el-tooltip>
+          <el-button type="primary" :disabled="disabled" :loading="submitLoading" @click="onSubmit">
+            {{ submitText }}
+          </el-button>
           <!-- 驳回 -->
           <template v-if="detail.status === 1">
             <span>提交后不可修改，请检查好作业内容再做提交。</span>
@@ -95,7 +93,7 @@
       </template>
     </chapter-work-comment>
 
-    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="500px">
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="500px" top="0">
       <div class="paper-check-item">
         <p>您本次的作业被老师驳回，请您重新编辑作业提交！</p>
       </div>
@@ -430,4 +428,8 @@ export default {
     white-space: nowrap;
   }
 }
+::v-deep .el-dialog {
+  top: 50%;
+  transform: translateY(-50%);
+}
 </style>