Pārlūkot izejas kodu

上传组件改为学生端上传

natasha 1 nedēļu atpakaļ
vecāks
revīzija
d01b4f7511

+ 14 - 1
src/views/book/courseware/create/components/base/upload_control/UploadControl.vue

@@ -1,6 +1,10 @@
 <template>
   <ModuleBase ref="base" :type="data.type">
-    <template #content> 学生上传文件控件 </template>
+    <template #content>
+      <div class="write-base-wrapper">
+        <span>占位</span>
+      </div>
+    </template>
   </ModuleBase>
 </template>
 
@@ -20,3 +24,12 @@ export default {
   methods: {},
 };
 </script>
+<style lang="scss" scoped>
+.write-base-wrapper {
+  min-height: 100px;
+  line-height: 100px;
+  color: #aaa;
+  text-align: center;
+  background: #f7f8fa;
+}
+</style>

+ 19 - 19
src/views/book/courseware/data/bookType.js

@@ -27,10 +27,10 @@ import FillPage from '../create/components/question/fill/Fill.vue';
 import FillSetting from '../create/components/question/fill/FillSetting.vue';
 import RecordInput from '../create/components/question/record_input/RecordInput.vue';
 import RecordInputSetting from '../create/components/question/record_input/RecordInputSetting.vue';
-// import UploadControl from '../create/components/base/upload_control/UploadControl.vue';
-// import UploadControlSetting from '../create/components/base/upload_control/UploadControlSetting.vue';
-import UploadPreview from '../create/components/base/upload_preview/UploadPreview.vue';
-import UploadRreviewSetting from '../create/components/base/upload_preview/UploadRreviewSetting.vue';
+import UploadControl from '../create/components/base/upload_control/UploadControl.vue';
+import UploadControlSetting from '../create/components/base/upload_control/UploadControlSetting.vue';
+// import UploadPreview from '../create/components/base/upload_preview/UploadPreview.vue';
+// import UploadRreviewSetting from '../create/components/base/upload_preview/UploadRreviewSetting.vue';
 import PinyinBase from '../create/components/question/pinyin_base/PinyinBase.vue';
 import PinyinBaseSetting from '../create/components/question/pinyin_base/PinyinBaseSetting.vue';
 // import CharacterBase from '../create/components/base/character_base/CharacterBase.vue';
@@ -89,8 +89,8 @@ import SortPreview from '@/views/book/courseware/preview/components/sort/SortPre
 import VoiceMatrixPreview from '@/views/book/courseware/preview/components/voice_matrix/VoiceMatrixPreview.vue';
 import FillPreview from '@/views/book/courseware/preview/components/fill/FillPreview.vue';
 import RecordInputPreview from '../preview/components/record_input/RecordInputPreview.vue';
-// import UploadControlPreview from '../preview/components/upload_control/UploadControlPreview.vue';
-import UploadPreviewPreview from '../preview/components/upload_preview/UploadPreviewPreview.vue';
+import UploadControlPreview from '../preview/components/upload_control/UploadControlPreview.vue';
+// import UploadPreviewPreview from '../preview/components/upload_preview/UploadPreviewPreview.vue';
 import PinyinBasePreview from '../preview/components/pinyin_base/PinyinBasePreview.vue';
 // import CharacterBasePreview from '../preview/components/character_base/CharacterBasePreview.vue';
 import CharacterPreview from '../preview/components/character/CharacterPreview.vue';
@@ -184,22 +184,22 @@ export const bookTypeOption = [
         set: RecordInputSetting,
         preview: RecordInputPreview,
       },
-      // {
-      //   value: 'upload_control',
-      //   label: '上传',
-      //   icon: 'uploadControl',
-      //   component: UploadControl,
-      //   set: UploadControlSetting,
-      //   preview: UploadControlPreview,
-      // },
       {
-        value: 'upload_preview',
+        value: 'upload_control',
         label: '上传',
-        icon: 'uploadPreviews',
-        component: UploadPreview,
-        set: UploadRreviewSetting,
-        preview: UploadPreviewPreview,
+        icon: 'uploadControl',
+        component: UploadControl,
+        set: UploadControlSetting,
+        preview: UploadControlPreview,
       },
+      // {
+      //   value: 'upload_preview',
+      //   label: '上传',
+      //   icon: 'uploadPreviews',
+      //   component: UploadPreview,
+      //   set: UploadRreviewSetting,
+      //   preview: UploadPreviewPreview,
+      // },
       {
         value: 'drawing',
         label: '趣味画板',

+ 2 - 2
src/views/book/courseware/preview/components/upload_control/UploadControlPreview.vue

@@ -25,7 +25,7 @@
             :preview-src-list="[data.answer.answer_list[0].file_url]"
           />
         </template>
-        <template v-else-if="data.answer.answer_list[0].file_name.indexOf('pdf') !== -1">
+        <template v-else>
           <iframe
             id="ifm"
             :src="data.answer.answer_list[0].newpath"
@@ -72,7 +72,7 @@ export default {
   data() {
     return {
       data: getUploadControlData(),
-      acceptFileType: '.png,.jpg,.pdf',
+      acceptFileType: '.png,.jpg,.jpeg,.txt,.pdf,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.mp3,.wma,.mp4,.mov,.zip,.rar',
       file_preview_url: getConfig() ? getConfig().doc_preview_service_address : '',
       showIframe: false,
     };

+ 8 - 12
src/views/book/courseware/preview/components/upload_control/components/UploadView.vue

@@ -51,11 +51,12 @@ export default {
       let UserCode = '';
       let UserType = '';
       if (userInfor) {
-        let user = getToken();
-        UserCode = user.user_code;
-        UserType = user.user_type;
-        SessionID = user.session_id;
+        let token = getToken();
+        UserCode = token?.gcls_sys_session_info?.user_id ?? '';
+        UserType = token?.gcls_sys_session_info?.user_type ?? '';
+        SessionID = token?.gcls_sys_session_info?.session_id ?? '';
       }
+
       return `${process.env.VUE_APP_EEP}/FileServer/WebFileUpload?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}&SecurityLevel=Mid`;
     },
   },
@@ -107,13 +108,8 @@ export default {
           this.$message.warning('上传图片大小不能超过2M');
           return false; // 必须返回false
         }
-      } else if (file.type.indexOf('application/pdf') !== -1) {
-        if (file.size > 20 * 1024 * 1024) {
-          this.$message.warning('上传pdf大小不能超过20M');
-          return false; // 必须返回false
-        }
-      } else if (file.size > 500 * 1024 * 1024) {
-        this.$message.warning('上传文件大小不能超过500M');
+      } else if (file.size > 20 * 1024 * 1024) {
+        this.$message.warning('上传pdf大小不能超过20M');
         return false; // 必须返回false
       }
 
@@ -177,7 +173,7 @@ export default {
   justify-content: center;
   width: 141px;
   height: 39px;
-  margin: -20px auto 10px;
+  margin: 20px auto 10px;
   font-size: 16px;
   line-height: 150%;
   color: #000;