RLC 课件增加传参

package-lock.json

@@ -11,13 +11,13 @@
         "@tinymce/tinymce-vue": "^3.2.8",
         "awe-dnd": "^0.3.4",
         "axios": "^1.3.6",
-        "book-ui": "file:../book-ui-0.3.41.tgz",
+        "book-ui": "file:../book-ui-0.3.43.tgz",
         "core-js": "^3.30.1",
         "dayjs": "^1.11.7",
         "element-ui": "^2.15.13",
         "jquery": "^3.6.4",
         "js-base64": "^3.7.5",
-        "js-cookie": "^3.0.4",
+        "js-cookie": "^3.0.5",
         "jsplumb": "^2.15.6",
         "md5": "^2.3.0",
         "normalize.css": "^8.0.1",
@@ -58,9 +58,9 @@
         "script-ext-html-webpack-plugin": "^2.1.5",
         "stylelint": "^15.6.0",
         "stylelint-config-recess-order": "^4.0.0",
-        "stylelint-config-recommended-scss": "^10.0.0",
+        "stylelint-config-recommended-scss": "^11.0.0",
         "stylelint-config-recommended-vue": "^1.4.0",
-        "stylelint-config-standard-scss": "^8.0.0",
+        "stylelint-config-standard-scss": "^9.0.0",
         "stylelint-declaration-block-no-ignored-properties": "^2.7.0",
         "stylelint-webpack-plugin": "^4.1.1",
         "svg-sprite-loader": "^6.0.11",
@@ -5186,9 +5186,9 @@
       }
     },
     "node_modules/book-ui": {
-      "version": "0.3.41",
-      "resolved": "file:../book-ui-0.3.41.tgz",
-      "integrity": "sha512-eO2Cpp6nYbl63ZLx4TfukL53yOTNoDfcsIG50SGhdqiLBGlfFZKNeG2dvWtp79DPTNBTsPo5FKC46/k+FRiUBw==",
+      "version": "0.3.43",
+      "resolved": "file:../book-ui-0.3.43.tgz",
+      "integrity": "sha512-y04r3Ee80omyZGI/6IHXuVy2h/C+GPgoBKPO62DnVCbyU0OlCRL4NsjOBThX7fhvshEPrKZenjL7zeeli8ENwQ==",
       "dependencies": {
         "awe-dnd": "^0.3.4",
         "axios": "^0.21.1",
@@ -12311,12 +12311,11 @@
       }
     },
     "node_modules/js-cookie": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-3.0.4.tgz",
-      "integrity": "sha512-tlu5VGqPFMP5eBefnmszCFZkPXG2n527NRN9XdNtN6FZ5n/0e98TdDm8BOz290OIIsxtXb9XTJjfqE6gVhOHQw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-3.0.5.tgz",
+      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
       "engines": {
-        "node": ">=14",
-        "npm": ">=9.5.0"
+        "node": ">=14"
       }
     },
     "node_modules/js-message": {
@@ -18088,27 +18087,27 @@
       }
     },
     "node_modules/stylelint-config-recommended": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmmirror.com/stylelint-config-recommended/-/stylelint-config-recommended-11.0.0.tgz",
-      "integrity": "sha512-SoGIHNI748OCZn6BxFYT83ytWoYETCINVHV3LKScVAWQQauWdvmdDqJC5YXWjpBbxg2E761Tg5aUGKLFOVhEkA==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmmirror.com/stylelint-config-recommended/-/stylelint-config-recommended-12.0.0.tgz",
+      "integrity": "sha512-x6x8QNARrGO2sG6iURkzqL+Dp+4bJorPMMRNPScdvaUK8PsynriOcMW7AFDKqkWAS5wbue/u8fUT/4ynzcmqdQ==",
       "dev": true,
       "peerDependencies": {
-        "stylelint": "^15.3.0"
+        "stylelint": "^15.5.0"
       }
     },
     "node_modules/stylelint-config-recommended-scss": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmmirror.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-10.0.0.tgz",
-      "integrity": "sha512-+YvPgUHi0W5mCJCKdupBCIsWPYNbWuJcRmFtSYujwNg+41ljFknhO9bpY6C+oahv659zW7W1AT7i6DQvJYYr1A==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmmirror.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-11.0.0.tgz",
+      "integrity": "sha512-EDghTDU7aOv2LTsRZvcT1w8mcjUaMhuy+t38iV5I/0Qiu6ixdkRwhLEMul3K/fnB2v9Nwqvb3xpvJfPH+HduDw==",
       "dev": true,
       "dependencies": {
         "postcss-scss": "^4.0.6",
-        "stylelint-config-recommended": "^11.0.0",
+        "stylelint-config-recommended": "^12.0.0",
         "stylelint-scss": "^4.6.0"
       },
       "peerDependencies": {
         "postcss": "^8.3.3",
-        "stylelint": "^15.3.0"
+        "stylelint": "^15.5.0"
       },
       "peerDependenciesMeta": {
         "postcss": {
@@ -18168,29 +18167,29 @@
       "dev": true
     },
     "node_modules/stylelint-config-standard": {
-      "version": "32.0.0",
-      "resolved": "https://registry.npmmirror.com/stylelint-config-standard/-/stylelint-config-standard-32.0.0.tgz",
-      "integrity": "sha512-UnGJxYDyYFrIE9CjDMZRkrNh2o4lOtO+MVZ9qG5b8yARfsWho0GMx4YvhHfsv8zKKgHeWX2wfeyxmuoqcaYZ4w==",
+      "version": "33.0.0",
+      "resolved": "https://registry.npmmirror.com/stylelint-config-standard/-/stylelint-config-standard-33.0.0.tgz",
+      "integrity": "sha512-eyxnLWoXImUn77+ODIuW9qXBDNM+ALN68L3wT1lN2oNspZ7D9NVGlNHb2QCUn4xDug6VZLsh0tF8NyoYzkgTzg==",
       "dev": true,
       "dependencies": {
-        "stylelint-config-recommended": "^11.0.0"
+        "stylelint-config-recommended": "^12.0.0"
       },
       "peerDependencies": {
-        "stylelint": "^15.4.0"
+        "stylelint": "^15.5.0"
       }
     },
     "node_modules/stylelint-config-standard-scss": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmmirror.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-8.0.0.tgz",
-      "integrity": "sha512-TDT/gJD/0LUDoUgkjF1uoI/4DfczXHxg7gJVcWT4/JbE6k5hszVuI14reNX+tEwSyMNhcK2BA7izrK+uVAz7XA==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmmirror.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-9.0.0.tgz",
+      "integrity": "sha512-yPKpJsrZn4ybuQZx/DkEHuCjw7pJginErE/47dFhCnrvD48IJ4UYec8tSiCuJWMA3HRjbIa3nh5ZeSauDGuVAg==",
       "dev": true,
       "dependencies": {
-        "stylelint-config-recommended-scss": "^10.0.0",
-        "stylelint-config-standard": "^32.0.0"
+        "stylelint-config-recommended-scss": "^11.0.0",
+        "stylelint-config-standard": "^33.0.0"
       },
       "peerDependencies": {
         "postcss": "^8.3.3",
-        "stylelint": "^15.4.0"
+        "stylelint": "^15.5.0"
       },
       "peerDependenciesMeta": {
         "postcss": {

package.json

@@ -16,13 +16,13 @@
     "@tinymce/tinymce-vue": "^3.2.8",
     "awe-dnd": "^0.3.4",
     "axios": "^1.3.6",
-    "book-ui": "file:../book-ui-0.3.41.tgz",
+    "book-ui": "file:../book-ui-0.3.43.tgz",
     "core-js": "^3.30.1",
     "dayjs": "^1.11.7",
     "element-ui": "^2.15.13",
     "jquery": "^3.6.4",
     "js-base64": "^3.7.5",
-    "js-cookie": "^3.0.4",
+    "js-cookie": "^3.0.5",
     "jsplumb": "^2.15.6",
     "md5": "^2.3.0",
     "normalize.css": "^8.0.1",
@@ -63,9 +63,9 @@
     "script-ext-html-webpack-plugin": "^2.1.5",
     "stylelint": "^15.6.0",
     "stylelint-config-recess-order": "^4.0.0",
-    "stylelint-config-recommended-scss": "^10.0.0",
+    "stylelint-config-recommended-scss": "^11.0.0",
     "stylelint-config-recommended-vue": "^1.4.0",
-    "stylelint-config-standard-scss": "^8.0.0",
+    "stylelint-config-standard-scss": "^9.0.0",
     "stylelint-declaration-block-no-ignored-properties": "^2.7.0",
     "stylelint-webpack-plugin": "^4.1.1",
     "svg-sprite-loader": "^6.0.11",

src/components/course/CompletionView.vue

@@ -20,7 +20,9 @@
         v-if="context"
         :context="context"
         task-model="ANSWER"
+        :is-show-title="true"
         :is-show-save="false"
+        :is-answer-item-show="true"
         :book-answer-content="bookAnswerContent"
         :theme-color="themeColor"
         :preview-type="previewType"
@@ -36,6 +38,7 @@
         task-model="ANSWER"
         :is-show-title="true"
         :is-show-save="false"
+        :is-answer-item-show="true"
         :preview-type="previewType"
         :preview-group-id="previewGroupId"
         :book-answer-content="bookAnswerContent"
@@ -51,6 +54,10 @@
         :current-tree-i-d="curCoursewareId"
         :preview-type="previewType"
         :preview-group-id="previewGroupId"
+        :is-answer-item-show="true"
+        :is-show-save="false"
+        task-model="ANSWER"
+        :book-answer-content="bookAnswerContent"
       />
     </template>
 

src/components/course/FinishCourseware.vue

@@ -11,8 +11,8 @@
       <booknpc
         v-if="context"
         ref="booknpc"
-        :is-show-save="false"
-        :is-answer-item-show="true"
+        :is-show-save="true"
+        :is-answer-item-show="false"
         task-model=""
         :context="context"
         :theme-color="themeColor"
@@ -30,8 +30,8 @@
         :theme-color="themeColor"
         :is-show-title="true"
         task-model=""
-        :is-show-save="false"
-        :is-answer-item-show="true"
+        :is-show-save="true"
+        :is-answer-item-show="false"
         :preview-type="previewType"
         :preview-group-id="previewGroupId"
         :current-tree-i-d="coursewareId"
@@ -44,14 +44,19 @@
         v-if="context"
         :context="context"
         :theme-color="themeColor"
+        :is-show-title="false"
+        task-model=""
+        :is-show-save="true"
+        :is-answer-item-show="false"
         :book-font-size="bookFontSize"
         :current-tree-i-d="coursewareId"
         :preview-type="previewType"
         :preview-group-id="previewGroupId"
+        @finishTaskMaterial="finishMyTaskMaterial_Student"
       />
     </template>
 
-    <div v-if="category !== 'NPC' && category !== 'NNPE'" slot="footer">
+    <div v-if="category !== 'NPC' && category !== 'NNPE' && category !== 'RLC'" slot="footer">
       <el-button type="primary" @click="finishTaskMaterial">
         {{ $t('Key82') }}
       </el-button>
@@ -151,7 +156,6 @@ export default {
       })
         .then(() => {
           this.$message.success(this.$i18n.t('Key334'));
-          this.dialogClose();
           this.$router.go(0);
         })
         .finally(() => {

src/components/live/CurMaterial.vue

@@ -39,6 +39,7 @@
           ref="booknpc"
           :task-model="isFinished ? 'ANSWER' : ''"
           :is-show-save="!isFinished"
+          :is-answer-item-show="isFinished"
           :book-answer-content="bookAnswerContent"
           :context="context"
           :theme-color="themeColor"
@@ -55,6 +56,7 @@
           :theme-color="themeColor"
           :task-model="isFinished ? 'ANSWER' : ''"
           :is-show-save="!isFinished"
+          :is-answer-item-show="isFinished"
           :is-show-title="true"
           :book-answer-content="bookAnswerContent"
           :preview-type="previewType"
@@ -73,6 +75,12 @@
           :current-tree-i-d="material_id"
           :preview-type="previewType"
           :preview-group-id="courseware_group_id_selected_info"
+          :is-show-save="!isFinished"
+          :is-answer-item-show="isFinished"
+          :is-show-title="false"
+          :book-answer-content="bookAnswerContent"
+          :task-model="isFinished ? 'ANSWER' : ''"
+          @finishTaskMaterial="saveNPCAnswer"
         />
       </template>
     </template>
@@ -94,6 +102,7 @@
         v-if="
           category !== 'NPC' &&
           category !== 'NNPE' &&
+          category !== 'RLC' &&
           (isCurMaterial || (!isFinished && material_type === 'COURSEWARE'))
         "
         type="primary"

src/components/preview/PreviewCourse.vue

@@ -33,6 +33,8 @@
           v-if="context"
           :context="context"
           :theme-color="themeColor"
+          :is-show-save="false"
+          :is-show-title="false"
           :book-font-size="bookFontSize"
           :current-tree-i-d="fileId"
           :preview-type="previewType"

src/components/select/SelectCourse.vue

@@ -55,6 +55,8 @@
             ref="book"
             :context="context"
             :theme-color="themeColor"
+            :is-show-save="false"
+            :is-show-title="false"
             :book-font-size="bookFontSize"
             :current-tree-i-d="courseID"
             :preview-type="previewType"

src/views/live/teacher/CompleteList.vue

@@ -89,6 +89,10 @@
             :current-tree-i-d="material_id"
             :preview-type="previewType"
             :preview-group-id="courseware_group_id_selected_info"
+            :is-show-title="false"
+            task-model="ANSWER"
+            :is-show-save="false"
+            :book-answer-content="bookAnswerContent"
           />
         </template>
       </template>

src/views/new_live/teacher/components/CompleteList.vue

@@ -89,6 +89,10 @@
             :current-tree-i-d="material_id"
             :preview-type="previewType"
             :preview-group-id="courseware_group_id_selected_info"
+            :is-show-title="false"
+            task-model="ANSWER"
+            :is-show-save="false"
+            :book-answer-content="bookAnswerContent"
           />
         </template>
       </template>

src/views/new_task_view/components/common/CoursewareView.vue

@@ -44,6 +44,11 @@
         :current-tree-i-d="coursewareData.courseware_id"
         :preview-type="previewType"
         :preview-group-id="previewGroupId"
+        :task-model="isFinished ? 'ANSWER' : ''"
+        :is-show-save="false"
+        :is-answer-item-show="isTeacher ? false : true"
+        :is-show-title="false"
+        @finishTaskMaterial="saveNPCAnswer"
       />
     </template>
   </div>

src/views/task_details/ShowCourseware.vue

@@ -39,6 +39,9 @@
           :current-tree-i-d="coursewareId"
           :preview-type="previewType"
           :preview-group-id="group_id_selected_info"
+          task-model=""
+          :is-show-title="false"
+          :is-show-save="false"
         />
       </template>
     </div>

src/views/task_details/student/index.vue

@@ -209,6 +209,7 @@ let coursewareId = ref('');
 let curCoursewareId = ref('');
 let dialogVisible_completion = ref(false);
 let my_execute_info = ref({});
+let isFinished = computed(() => my_execute_info.value.is_finished === 'true');
 let student_remark = ref('');
 let student_score = ref(0);
 let loading = ref(true);
@@ -323,7 +324,7 @@ let { visible, curFileId, curFileName, dialogShowFileClose, showFileVisible } =
 
 function fillTaskExecuteInfo_Student() {
   // 基础任务，必须提交作业
-  if (my_execute_info.value.is_finished === 'false' && teaching_type.value === 12 && file_list.value.length <= 0) {
+  if (!isFinished.value && teaching_type.value === 12 && file_list.value.length <= 0) {
     return Message.error('请先提交作业');
   }
 
@@ -367,7 +368,7 @@ function enterLive() {
 
 // 完成任务
 function finishTask(id, is_finished, group_id_selected_info) {
-  if (my_execute_info.value.is_finished === 'true' && is_finished === 'false') {
+  if (isFinished.value && is_finished === 'false') {
     return Message.error($t('Key338'));
   }
   previewGroupId.value = group_id_selected_info.length <= 0 ? '[]' : group_id_selected_info;

src/views/teacher/create_course/step_three/components/preview/task_preview/components/CoursewareView.vue

@@ -39,6 +39,9 @@
         :current-tree-i-d="coursewareId"
         :preview-type="previewType"
         :preview-group-id="previewGroupId"
+        task-model=""
+        :is-show-save="false"
+        :is-show-title="false"
       />
     </template>
   </div>