2 Revīzijas bfd292b228 ... 43df9570dd

Autors SHA1 Ziņojums Datums
  zhuf 43df9570dd ~ 4 mēneši atpakaļ
  zhuf fc86d58b6e ~ 4 mēneši atpakaļ

+ 2 - 3
src/components/FileUpload/index.vue

@@ -2,7 +2,7 @@
 import { ElMessage } from 'element-plus';
 import { ref, useAttrs, watch } from 'vue';
 import { REQUEST } from '~/utils/request';
-
+console.log('file upload');
 const emit = defineEmits(['update:part', 'update:full', 'update:size', 'update:time', 'compile'])
 
 const props = defineProps({
@@ -148,7 +148,7 @@ watch(() => List_part.value, () => {
   emit('update:full', List_full.value)
   emit('update:size', renderSize(List_size.value))
   emit('update:time', List_time.value)
-  emit('compile')
+  emit('compile', FILE_LIST.value)
 })
 </script>
 
@@ -176,4 +176,3 @@ watch(() => List_part.value, () => {
     <img w-full :src="dialogImageUrl" alt="Preview Image" />
   </el-dialog>
 </template>
-

+ 1 - 0
src/components/FileUploadProgress/index.vue

@@ -6,6 +6,7 @@ import { getFullUrl, getPartUrl } from '~/utils/helper';
 import user from '~/store/user';
 const token = user.token
 const action = window.GLOBAL_CONFIG.api + '/upload/main/file'
+console.log('file upload progress');
 
 const data = { token, client: 'web', api: 'json', issubmit: '1', site: 'tyyx' }
 const emit = defineEmits(['update:part', 'update:full', 'update:size', 'update:time', 'compile', 'update:list'])

+ 28 - 14
src/pages/personal/components/MyCourse/ssys-create.vue

@@ -4,16 +4,19 @@
     <el-card>
       <div style="padding: 0 75px;">
         <span class="title">全景课堂</span>
-        <span class="subTitle">我的课程 - 我创建的 - <span class="pointer" @click="goBack">全景课堂</span> - <span style="color: #000;">{{ editId == "" ? "创建" : "编辑" }}课程</span></span>
+        <span class="subTitle">我的课程 - 我创建的 - <span class="pointer" @click="goBack">全景课堂</span> - <span
+            style="color: #000;">{{ editId == "" ? "创建" : "编辑" }}课程</span></span>
       </div>
     </el-card>
 
     <el-card>
       <div style="color: #050026;font-size: 18px;font-weight: 400;">{{ editId == "" ? "创建" : "编辑" }}课程</div>
       <div class="formContent">
-        <el-form :model="formline" ref="formline" :rules="rules" size="large" label-position="top" class="demo-ruleForm">
+        <el-form :model="formline" ref="formline" :rules="rules" size="large" label-position="top"
+          class="demo-ruleForm">
           <el-form-item label="课程封面图" class="kcfmt" prop="ks_img">
-            <file-upload v-model:part="ks_img" list-type="picture-card" accept=".jpg,.png,.jpeg" :size-limit="5 * 1024" @compile="handleCompile">
+            <file-upload v-model:part="ks_img" list-type="picture-card" accept=".jpg,.png,.jpeg" :size-limit="5 * 1024"
+              @compile="handleCompile">
               <template #default>
                 <el-icon size="38" color="#9d9ab9" v-if="formline.ks_img == ''">
                   <Picture />
@@ -21,7 +24,8 @@
                 <img v-else :src="getFullUrl(formline.ks_img)" alt="" style="width: 100%;height: 100%;" />
               </template>
               <template #tip>
-                <div style="color: #949494;font-size: 12px;margin-left: 20px;display: inline-block;vertical-align: top;line-height: 20px;">
+                <div
+                  style="color: #949494;font-size: 12px;margin-left: 20px;display: inline-block;vertical-align: top;line-height: 20px;">
                   支持格式:jpg,png,jpeg(5M以内) 建议尺寸600x320</div>
               </template>
             </file-upload>
@@ -63,13 +67,18 @@
           <div style="display: flex;">
             <el-form-item style="flex: 1;" label="开始时间" prop="ks_start_datetime">
               <el-config-provider :locale="local">
-                <el-date-picker popper-class="ssystime" v-model="formline.ks_start_datetime" value-format="YYYY-MM-DD HH:mm:ss" :disabled-date="pickerStartTime" :disabled-hours="pickerStartHour" :disabled-minutes="pickerStartMinute" :disabled-seconds="pickerStartSecond" type="datetime"
+                <el-date-picker popper-class="ssystime" v-model="formline.ks_start_datetime"
+                  value-format="YYYY-MM-DD HH:mm:ss" :disabled-date="pickerStartTime" :disabled-hours="pickerStartHour"
+                  :disabled-minutes="pickerStartMinute" :disabled-seconds="pickerStartSecond" type="datetime"
                   placeholder="选择日期时间"></el-date-picker>
               </el-config-provider>
             </el-form-item>
             <el-form-item style="flex: 1;margin-left: 20px;" label="结束时间" prop="ks_end_datetime">
               <el-config-provider :locale="local">
-                <el-date-picker popper-class="ssystime" v-model="formline.ks_end_datetime" value-format="YYYY-MM-DD HH:mm:ss" :disabled-date="pickerEndTime" :disabled-hours="pickerEndHour" :disabled-minutes="pickerEndMinute" :disabled-seconds="pickerEndSecond" type="datetime" placeholder="选择日期时间">
+                <el-date-picker popper-class="ssystime" v-model="formline.ks_end_datetime"
+                  value-format="YYYY-MM-DD HH:mm:ss" :disabled-date="pickerEndTime" :disabled-hours="pickerEndHour"
+                  :disabled-minutes="pickerEndMinute" :disabled-seconds="pickerEndSecond" type="datetime"
+                  placeholder="选择日期时间">
                 </el-date-picker>
               </el-config-provider>
             </el-form-item>
@@ -79,10 +88,12 @@
           </el-form-item> -->
           <div class="flex">
             <el-form-item class="flex-1" label="年级" prop="grade_id">
-              <remote-multi-select v-model="formline.grade_id" v-model:model-name="formline.grade_name" to="grade"></remote-multi-select>
+              <remote-multi-select v-model="formline.grade_id" v-model:model-name="formline.grade_name"
+                to="grade"></remote-multi-select>
             </el-form-item>
             <el-form-item class="flex-1" style="margin-left: 20px;" label="学科" prop="subject_id">
-              <remote-multi-select v-model="formline.subject_id" v-model:model-name="formline.subject_name" to="subject"></remote-multi-select>
+              <remote-multi-select v-model="formline.subject_id" v-model:model-name="formline.subject_name"
+                to="subject"></remote-multi-select>
             </el-form-item>
           </div>
           <!-- <div class="must" style="display: block;">
@@ -108,9 +119,11 @@
             </div>
           </div> -->
           <el-form-item label="附件">
-            <file-upload-progress v-model:part="formline.ks_kj" :limit="1" accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.mp4,.mp3" :size-limit="1500 * 1024">
+            <file-upload-progress v-model:part="formline.ks_kj" :limit="1"
+              accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.mp4,.mp3" :size-limit="1500 * 1024">
               <template #default>
-                <div class="flex_center w-65px h-65px border border-dashed border-hex-E4E6E8 bg-hex-F9F9F9 text-hex-9D9AB9">
+                <div
+                  class="flex_center w-65px h-65px border border-dashed border-hex-E4E6E8 bg-hex-F9F9F9 text-hex-9D9AB9">
                   <i-akar-icons:plus class="text-xl" />
                 </div>
               </template>
@@ -142,7 +155,8 @@
           <el-form-item label="回放视频">
             <file-upload-progress v-model:part="formline.ks_lzsp" accept=".mp4">
               <template #default>
-                <div class="flex_center w-65px h-65px border border-dashed border-hex-E4E6E8 bg-hex-F9F9F9 text-hex-9D9AB9">
+                <div
+                  class="flex_center w-65px h-65px border border-dashed border-hex-E4E6E8 bg-hex-F9F9F9 text-hex-9D9AB9">
                   <i-akar-icons:plus class="text-xl" />
                 </div>
               </template>
@@ -156,8 +170,8 @@
             <el-form-item style="flex: 1;" label="是否手机端推荐课程">
               <el-radio-group v-model="formline.ks_sfsjdtjkc">
                 <el-radio v-for="item in sfsjdtjkcData" :key="item.v" :label="item.v" size="large">{{
-                  item.n
-                }}</el-radio>
+    item.n
+  }}</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item style="flex: 1;margin-left: 50px;" label="是否精品">
@@ -623,7 +637,7 @@ export default {
     },
     handleCompile(fileList) {
       let data = fileList[fileList.length - 1];
-      this.formline.ks_img = data.response.data.url;
+      this.formline.ks_img = data?.part_url ?? data?.response?.data?.url;
       this.cropImg = data.url;
     },
     // 封面图