diff --git a/src/views/course/components/KnowledgeGraphUi/foldInfoUi.vue b/src/views/course/components/KnowledgeGraphUi/foldInfoUi.vue index 4fc2666..b45d81c 100644 --- a/src/views/course/components/KnowledgeGraphUi/foldInfoUi.vue +++ b/src/views/course/components/KnowledgeGraphUi/foldInfoUi.vue @@ -17,7 +17,7 @@
本章资源
- 删除 + 删除 diff --git a/src/views/course/courseChapters.vue b/src/views/course/courseChapters.vue index 066c5e8..2beb408 100644 --- a/src/views/course/courseChapters.vue +++ b/src/views/course/courseChapters.vue @@ -16,8 +16,7 @@
- + @@ -108,6 +107,7 @@ function foldAddSubmit(data: any, updLoading: Function) { .finally(() => updLoading(false)) } //删除章节 +<<<<<<< HEAD const foldDelLoading = ref(false) function flodDel(id: string) { foldDelLoading.value = true @@ -118,6 +118,14 @@ function flodDel(id: string) { type: 'success', }) getFold() +======= +function flodDel(id: string,setLoading:Function) { + setLoading(true) + deleteSectionApi(id).then(() => { + ElMessage({ + message: `删除成功`, + type: 'success' +>>>>>>> efc569df5dcaa0a473e7d75d75a5abe7e5d030d5 }) .catch(() => { ElMessage({ @@ -125,7 +133,11 @@ function flodDel(id: string) { type: 'error', }) }) +<<<<<<< HEAD .finally(() => (foldDelLoading.value = false)) +======= + }).finally(() =>setLoading(false)) +>>>>>>> efc569df5dcaa0a473e7d75d75a5abe7e5d030d5 } // 更新章节 const showHide1 = ref(false) diff --git a/src/views/courseResources/componse/resourceAdd.vue b/src/views/courseResources/componse/resourceAdd.vue index c2e4b2a..4d2e952 100644 --- a/src/views/courseResources/componse/resourceAdd.vue +++ b/src/views/courseResources/componse/resourceAdd.vue @@ -3,23 +3,37 @@ import { ref } from 'vue' const visibilerDrawer = ref(false) import { ElMessage } from 'element-plus' import { CourseResourceControllerService } from '../../../../generated/services/CourseResourceControllerService' +import tool from '@/utils/oss.js' +import { id } from 'element-plus/es/locales.mjs'; //默认数据 const defaultForm = { description: '', - id: '', + id:'', img: '', //封面 name: '', type: '', //资源类型 path: '', } const imageUrl = ref('') -const onSelectFile = (uploadFile) => { - // console.log(uploadFile) +//上传阿里云oss +const upload = async (option) =>{ //预览图片 - imageUrl.value = URL.createObjectURL(uploadFile.raw) - //将图片存入 - formModel.value.img = uploadFile.raw + imageUrl.value = URL.createObjectURL(option.raw) + const res = await tool.oss.upload(option.raw);//将图片存入阿里云 + const url = "https://wenyu132.oss-cn-beijing.aliyuncs.com/" + res.name;//获取到存入阿里云后的url + console.log(url); + //将url赋值给要上传后端的参数里 + formModel.value.img = url } + + +// const onSelectFile = (uploadFile) => { +// // console.log(uploadFile) +// //预览图片 +// imageUrl.value = URL.createObjectURL(uploadFile.raw) +// //将图片存入 +// formModel.value.img = uploadFile.raw +// } //准备数据 const formModel = ref({ @@ -184,7 +198,7 @@ defineExpose({ :show-file-list="false" :auto-upload="false" :before-upload="beforeAvatarUpload" - :on-change="onSelectFile" + :on-change="upload" > diff --git a/src/views/courseResources/index.vue b/src/views/courseResources/index.vue index 66f7d52..b0614b5 100644 --- a/src/views/courseResources/index.vue +++ b/src/views/courseResources/index.vue @@ -85,7 +85,7 @@ const param = ref({ download: '0', content: '', address: '/portal', - type: '1', + type: '4', }) //点击生成浏览记录 const generateRecords = async (rescource) => {