Merge branch 'master' of http://gcls-git.helxsoft.cn/GCLS/eep_page

src/views/book/courseware/create/components/base/upload_preview/UploadPreview.vue

@@ -17,21 +17,13 @@
         :limit="100"
         @updateFileList="updateFileList"
       />
-      <el-form :model="data" label-width="72px" label-position="left">
-        <el-form-item label="下载">
-          <el-radio-group v-model="data.is_enable_download">
-            <el-radio v-for="{ value, label } in switchOption" :key="value" :label="value">
-              {{ label }}
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
+      <el-form :model="data" label-width="72px" label-position="left"> </el-form>
     </template>
   </ModuleBase>
 </template>
 
 <script>
-import { getUploadPreviewData, switchOption } from '@/views/book/courseware/data/uploadPreview';
+import { getUploadPreviewData } from '@/views/book/courseware/data/uploadPreview';
 import ModuleMixin from '../../common/ModuleMixin';
 import UploadFile from '../common/UploadFile.vue';
 
@@ -42,7 +34,6 @@ export default {
   data() {
     return {
       data: getUploadPreviewData(),
-      switchOption,
       labelText: '文件',
       acceptFileType: '.txt,.pdf,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.mp3,.wma,.mp4,.mov,.zip,.rar',
       uploadTip: '支持上传txt，pdf，doc，excel，ppt，mp3，wma，mp4，mov，zip，rar等格式文件，单个文件最大500MB',

src/views/book/courseware/create/components/base/upload_preview/UploadRreviewSetting.vue

@@ -2,23 +2,29 @@
   <div>
     <el-form :model="property" :label-position="labelPosition" label-width="72px">
       <SerailNumber :property="property" />
+      <el-form-item label="下载">
+        <el-radio-group v-model="property.is_enable_download">
+          <el-radio v-for="{ value, label } in switchOption" :key="value" :label="value">
+            {{ label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
     </el-form>
   </div>
 </template>
 
 <script>
 import SettingMixin from '@/views/book/courseware/create/components/common/SettingMixin';
-import { viewMethodList, snGenerationMethodList } from '@/views/book/courseware/data/common';
-import { getPictureProperty } from '@/views/book/courseware/data/picture';
+import { getUploadPreviewProperty, switchOption } from '@/views/book/courseware/data/uploadPreview';
 
 export default {
   name: 'PictureSetting',
   mixins: [SettingMixin],
   data() {
     return {
-      viewMethodList,
+      switchOption,
       labelPosition: 'left',
-      property: getPictureProperty(),
+      property: getUploadPreviewProperty(),
     };
   },
   methods: {},

src/views/book/courseware/data/uploadPreview.js

@@ -12,6 +12,7 @@ export function getUploadPreviewProperty() {
     sn_type: serialNumberTypeList[0].value, // 序号类型：letter字母 number数字  capital大写字母 bracket_number括号数字
     sn_position: serialNumberPositionList[3].value, // 序号位置：top-start top top-end，left-start left left-end等
     sn_display_mode: displayList[0].value,
+    is_enable_download: switchOption[0].value,
   };
 }
 
@@ -28,6 +29,5 @@ export function getUploadPreviewData() {
     file_id_list: [], // 文件 id['20032-121212', '20032-121216']
     // 内容中包含的文件列表,
     file_list: [],
-    is_enable_download: switchOption[0].value,
   };
 }