解决 演示bug

src/api/resourceAudit.js

@@ -78,5 +78,8 @@ export default {
 	//公开人员查询所有以及下级
 	orgUserTreeSelector(data = {}) {
 		return request('disk/college/orgUserTreeSelector', data, 'get')
+	},
+	orgList(data = {}) {
+		return request('sys/org/queryList', data, 'get')
 	}
 }

src/components/UpLoadBreakPoint/index.vue

@@ -86,7 +86,7 @@
 	import SparkMD5 from 'spark-md5'
 	import tool from '@/utils/tool'
 	import { message } from 'ant-design-vue'
-
+	import sysConfig from '@/config/index'
 	const pauseFlags = ref({}) // 控制每个文件是否暂停 { md5: true/false }
 	const uploadingTasks = ref({}) // 正在上传的任务 { md5: true }
 	//当前选中的文件
@@ -343,7 +343,7 @@
 		md5List.push(element)
 
 		await axios
-			.post('/api/webapp/minio/checkMd5List', md5List, { headers: { Token: tool.data.get('TOKEN') } })
+			.post(sysConfig.API_URL+'/api/webapp/minio/checkMd5List', md5List, { headers: { Token: tool.data.get('TOKEN') } })
 			.then((res) => {
 				console.log('文件上传返回结果：', res.data)
 				// return
@@ -413,7 +413,7 @@
 		console.log('上传的md5_suffix_List是：', md5List)
 
 		await axios
-			.post('/api/webapp/minio/checkMd5List', md5List, { headers: { Token: tool.data.get('TOKEN') } })
+			.post(sysConfig.API_URL+'/api/webapp/minio/checkMd5List', md5List, { headers: { Token: tool.data.get('TOKEN') } })
 			.then((res) => {
 				console.log('文件上传返回结果：', res.data)
 				// return
@@ -532,7 +532,7 @@
 			if (uploadFileList.value[i].chunks.length === chunksUploadedList[i]) {
 				const mergeResult = await axios.post(
 					// `/api/webapp/disk/minio/merge?md5=${uploadFileList.value[i].md5}&fileSuffix=${uploadFileList.value[i].fileSuffix}&chunkTotal=${chunksUploadedList[i]}`
-					`/api/webapp/minio/merge?md5=${uploadFileList.value[i].md5}&fileSuffix=${uploadFileList.value[i].fileSuffix}&chunkTotal=${chunksUploadedList[i]}&fileName=${uploadFileList.value[i].name}&fileSize=${uploadFileList.value[i].size}`,
+					sysConfig.API_URL+`/api/webapp/minio/merge?md5=${uploadFileList.value[i].md5}&fileSuffix=${uploadFileList.value[i].fileSuffix}&chunkTotal=${chunksUploadedList[i]}&fileName=${uploadFileList.value[i].name}&fileSize=${uploadFileList.value[i].size}`,
 					null,
 					{ headers: { Token: tool.data.get('TOKEN') } }
 				)
@@ -580,7 +580,7 @@
 		formData.append('fileSuffix', data.fileSuffix)
 		formData.append('fileName', data.fileName)
 		return axios
-			.post('/api/webapp/minio/upload', formData, {
+			.post(sysConfig.API_URL+'/api/webapp/minio/upload', formData, {
 				headers: { 'Content-Type': 'multipart/form-data', Token: tool.data.get('TOKEN') }
 			})
 			.then((res) => onSuccess())
@@ -606,7 +606,7 @@
 		formData.append('fileSuffix', data.fileSuffix)
 		formData.append('fileName', data.fileName)
 		return axios
-			.post('/api/webapp/minio/upload', formData, {
+			.post(sysConfig.API_URL+'/api/webapp/minio/upload', formData, {
 				headers: { 'Content-Type': 'multipart/form-data', Token: tool.data.get('TOKEN') }
 			})
 			.then((res) => onSuccess())
@@ -621,7 +621,7 @@
 	// 删除文件
 	const deleteFile = (url) => {
 		axios
-			.get(`/api/webapp/disk/delete?url=` + url)
+			.get(sysConfig.API_URL+`/api/webapp/disk/delete?url=` + url)
 			.then((res) => {
 				console.log('删除文件：', res.data)
 				alert(res.data ? '删除成功！' : '删除失败！')
@@ -736,7 +736,7 @@
 
 		// 合并分片
 		const mergeResult = await axios.post(
-			`/api/webapp/minio/merge?md5=${md5}&fileSuffix=${item.fileSuffix}&chunkTotal=${item.chunks.length}&fileName=${item.name}&fileSize=${item.size}`,
+			sysConfig.API_URL+`/api/webapp/minio/merge?md5=${md5}&fileSuffix=${item.fileSuffix}&chunkTotal=${item.chunks.length}&fileName=${item.name}&fileSize=${item.size}`,
 			null,
 			{ headers: { Token: tool.data.get('TOKEN') } }
 		)

src/components/UpLoadImg/index.vue

@@ -26,8 +26,8 @@ import {message} from 'ant-design-vue'
 import {PictureOutlined, CloudUploadOutlined} from '@ant-design/icons-vue'
 import tool from "@/utils/tool";
 
-const action = ref(sysConfig.API_URL +'/api/webapp/dev/file/uploadMinioReturnUrl')
-// const action = ref(sysConfig.API_URL +'/api/webapp/dev/file/uploadMinioReturnId')
+// const action = ref(sysConfig.API_URL +'/api/webapp/dev/file/uploadMinioReturnUrl')
+const action = ref(sysConfig.API_URL +'/api/webapp/dev/file/uploadMinioReturnId')
 const headers = ref({
 	token: tool.data.get('TOKEN')
 })
@@ -163,7 +163,7 @@ defineExpose({
 		display: flex;
 		align-items: center;
 	}
-	
+
 }
 
 .cover-upload-row {

src/views/courseAdd/components/courseInfo.vue

@@ -33,20 +33,27 @@
 			></coverUpload>
 		</a-form-item>
 
-		<a-form-item label="院系" name="collegeId">
-			<a-cascader
-				v-model:value="majorIdName"
+		<a-form-item label="院系" name="collegeTwoId">
+			<a-select
+				v-model:value="formState.collegeTwoId"
+				:fieldNames="{ label: 'name', value: 'id' }"
 				:options="collegeMajorOptions"
-				:fieldNames="{ label: 'name', value: 'id', children: 'children' }"
-				placeholder="请选择院系"
-				changeOnSelect
+				placeholder="请选择专业"
 				@change="changeCollegeMajor"
 			/>
+<!--			<a-cascader-->
+<!--				v-model:value="majorIdName"-->
+<!--				:options="collegeMajorOptions"-->
+<!--				:fieldNames="{ label: 'name', value: 'id' }"-->
+<!--				placeholder="请选择院系"-->
+<!--				changeOnSelect-->
+<!--				@change="changeCollegeMajor"-->
+<!--			/>-->
 		</a-form-item>
 		<a-form-item label="专业" name="majorId">
 			<a-select
 				v-model:value="formState.majorId"
-				:fieldNames="{ label: 'majorName', value: 'majorCode' }"
+				:fieldNames="{ label: 'majorName', value: 'id' }"
 				:options="majorOptions"
 				placeholder="请选择专业"
 			/>
@@ -114,7 +121,7 @@
 		teacherId: [{ required: true, message: '请选择授课教师', trigger: 'change' }],
 		courseType: [{ required: true, message: '请选择课程分类', trigger: 'change' }],
 		courseDesc: [{ required: true, message: '请输入教室描述', trigger: 'change' }],
-		collegeId: [{ required: true, message: '请选择院系', trigger: 'change' }],
+		collegeTwoId: [{ required: true, message: '请选择院系', trigger: 'change' }],
 		majorId: [{ required: true, message: '请选择专业', trigger: 'change' }],
 		coverImageId: [{ required: true, message: '请上传封面', trigger: 'change' }]
 	}
@@ -192,9 +199,9 @@
 	//院系组织查询
 	const getOrgTreeSelector = () => {
 		resourceAuditApi
-			.orgTreeSelector()
+			.orgList()
 			.then((res) => {
-				console.log(res.data, '获取组织树选择器')
+				console.log(res.data, '获取学院')
 				collegeMajorOptions.value = res.data
 			})
 			.catch((err) => {
@@ -204,24 +211,26 @@
 	const changeCollegeMajor = (value, selectedOptions) => {
 		console.log('Selected:', value, selectedOptions)
 		if (!value) {
-			majorIdName.value = ''
+			formState.collegeTwoId = ''
+			// majorIdName.value = ''
 			return false
 		}
-		majorIdName.value = selectedOptions.map((it) => it.name).join('/')
-		formState.collegeId = value[0] || null
-		formState.collegeTwoId = value[1] || null
-		formState.collegeThreeId = value[2] || null
-		if (selectedOptions.length) {
+		formState.majorId = undefined
+		// majorIdName.value = selectedOptions.map((it) => it.name).join('/')
+		// formState.collegeId = value[0] || null
+		// formState.collegeTwoId = value[1] || null
+		// formState.collegeThreeId = value[2] || null
+		// if (selectedOptions.length) {
 			// 获取选中的最后一级
-			const lastSelected = selectedOptions[selectedOptions.length - 1]
+			// const lastSelected = selectedOptions[selectedOptions.length - 1]
 			// formState.selectedCollegeMajor = {
 			// 	id: lastSelected.id,
 			// 	name: lastSelected.name,
 			// 	fullPath: selectedOptions.map((opt) => opt.name).join(' / ')
 			// }
-			console.log(lastSelected, '最后一级id')
-			getCollegeMajor(lastSelected.id)
-		}
+			console.log(formState.collegeTwoId, '最后一级id')
+			getCollegeMajor(formState.collegeTwoId)
+		// }
 	}
 	const getCollegeMajor = (id) => {
 		resourceAuditApi
@@ -254,8 +263,9 @@
 			formState.courseName = res.data.courseName
 			formState.teacherId = res.data.teacherId
 			formState.collegeId = res.data.collegeId
-			majorIdName.value = res.data.collegeAllId?.split(',')
-			getCollegeMajor(majorIdName.value[majorIdName.value.length - 1])
+			formState.collegeTwoId = res.data.collegeTwoId
+			// majorIdName.value = res.data.collegeAllId?.split(',')
+			getCollegeMajor(formState.collegeTwoId)
 			formState.courseType = res.data.courseType
 			formState.courseDesc = res.data.courseDesc
 			toRaw(quillEditorRef.value).setHTML(formState.courseDesc)

src/views/courseAdd/components/courseProduction/addClassHours.vue

@@ -62,7 +62,7 @@ const form = reactive({
 
 const rules = {
 	title: [{required: true, message: '请输入课时名称'}],
-	video: [{required: true, message: '请选择或上传视频'}],
+	video: [{required: true, message: '请选择或上传资源'}],
 	coverUrl: [{required: true, message: '请上传封面'}],
 	docUrl: [{required: true, message: '请上传讲义'}],
 	srtUrl: [{required: true, message: '请上传字幕'}],
@@ -121,6 +121,12 @@ const getData = (callBack) => {
 
 
 		callBack(data)
+	}).catch((res)=>{
+		console.log("错误内容",res)
+		if(res.errorFields[0]){
+			message.error(res.errorFields[0].errors[0])
+		}
+
 	})
 }
 

src/views/courseAdd/components/courseProduction/addDialog.vue

@@ -98,7 +98,7 @@ const handleChange = (activeKey) => {
 	nextTick(() => {
 		if (activeKey == '1' && addClassHoursRef.value) {
 			if (modeTag.value == 'add') {
-				addClassHoursRef.value.reset()
+				// addClassHoursRef.value.reset()
 				addClassHoursRef.value.open()
 			}
 			if (modeTag.value == 'edit') {