diff --git a/src/App.vue b/src/App.vue index 76e5bc2..11e53a6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -38,7 +38,7 @@ import {useRoute} from "vue-router/dist/vue-router"; import {USER_INFO} from "@/api/api"; import {IsPhone} from "@/api/utils"; -console.log("版本2.1.6------------"); +console.log("版本2.3.9------------"); const store = useStore(); const { path } = useRoute(); diff --git a/src/api/api.js b/src/api/api.js index c54171d..22de8f2 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -10,7 +10,7 @@ export const LOGIN = '/admin/CheckUser/userLogin post' export const USER_INFO = '/admin/CheckUser/userInfo' // export const FILE_UPLOAD = 'http://143.143.139.204:30001/file/upload' export const FILE_UPLOAD = import.meta.env.VITE_BASE_API + '/file/uploadFile' -export const FILE_UPLOAD_ANNEX = import.meta.env.VITE_BASE_API + '/file/upload' +export const FILE_UPLOAD_ANNEX = import.meta.env.VITE_BASE_API + '/file/uploadunlimit' export const FILE_UPLOAD_IMG = import.meta.env.VITE_BASE_API + '/file/img' export const COMMON_TOKEN = 'https://upload-z2.qiniup.com' export const ROUTER_CHAPTER_LIST = '/stu/router/chapterList' diff --git a/src/api/request.js b/src/api/request.js index 6b7f53c..a723194 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -3,6 +3,7 @@ import {reactive, ref, toRefs, watch} from "vue"; import axios from 'axios'; import {getCookie} from "@/api/utils"; import JSONBigInt from 'json-bigint'; +import {ElMessage} from "element-plus"; const JSONBigIntStr = JSONBigInt({storeAsString: true}); @@ -97,15 +98,13 @@ export async function request(_url, params) { ...method !== 'get' ? {data: JSON.stringify(body)} : {} }).then(resp => resp.data).then(response => { if (response.code !== 200 && response.code !== 0) { - if (response.code === 1000) { - (import.meta.env.MODE === 'development' || import.meta.env.MODE === 'test') ? router.push({path: '/login'}) : window.open(window.location.protocol + import.meta.env.VITE_BASE_LOGIN_URL, '_top') - } - if (response.code === 2001) { - router.push({path: '/FaceTeachSignUp', query: {courseId: router.currentRoute.value.query.courseId,type:3}}) - } - if (response.code === 2002) { - router.push({path: '/FaceTeachNoCommon', query: {courseId: router.currentRoute.value.query.courseId,type:3}}) - } + if (response.code === 1000) (import.meta.env.MODE === 'development' || import.meta.env.MODE === 'test') ? router.push({path: '/login'}) : window.open(window.location.protocol + import.meta.env.VITE_BASE_LOGIN_URL, '_top') + + else if (response.code === 2001) router.push({path: '/FaceTeachSignUp', query: {courseId: router.currentRoute.value.query.courseId,type:3}}) + + else if (response.code === 2002) router.push({path: '/FaceTeachNoCommon', query: {courseId: router.currentRoute.value.query.courseId,type:3}}) + else if (response.code === 9000) ElMessage.warning("该数据已经被删除或停用，请联系管理员"); + // if (import.meta.env.DEV && response.code === 1000) { // router.push({path: '/login'}) // } else { diff --git a/src/components/img/UploadImgHomeWork.vue b/src/components/img/UploadImgHomeWork.vue index 126d3df..ec04e75 100644 --- a/src/components/img/UploadImgHomeWork.vue +++ b/src/components/img/UploadImgHomeWork.vue @@ -79,7 +79,8 @@ function handleChange(file) { } function remove(i) { - files.value.splice(i, 1) + files.value.splice(i, 1); + files.value = []; console.log(imageRef) } diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue index 5c39c0f..7d66364 100644 --- a/src/views/discuss/DiscussPage.vue +++ b/src/views/discuss/DiscussPage.vue @@ -221,10 +221,13 @@ const handleCreated = (editor) => { editorRef.value = editor; // 记录 editor 实例，重要！ }; +const discussSettings = ref(""); + request(DISCUSS_LIST, { type, id, }).then(e=>{ + discussSettings.value = e.data.discussDtoList[0].discussSettings; state.info = e.data; getPostList(e.data.discussDtoList[0].id); }).catch(err=>{ @@ -278,7 +281,7 @@ function handleCurrentChange(e, k) { } // 评论点击跳转 function comment({ discussId: id, id: postID }) { - router.push({ path: "discussdetail", query: { id, type, pName, sName, postID, postName:state.info.discussDtoList[0].discussName } }); + router.push({ path: "discussdetail", query: { id, type, pName, sName, postID, postName:state.info.discussDtoList[0].discussName, discussSettings:discussSettings.value } }); } // 帖子点赞 function like(d) { diff --git a/src/views/discussdetail/DiscussDetail.vue b/src/views/discussdetail/DiscussDetail.vue index e687a7f..1c901c6 100644 --- a/src/views/discussdetail/DiscussDetail.vue +++ b/src/views/discussdetail/DiscussDetail.vue @@ -47,7 +47,7 @@
{{ postName }}
- +
@@ -97,7 +97,7 @@
-
+
{ }; const { - query: { id, discussSubmitId, type, pName, sName, postID, postName }, + query: { id, discussSubmitId, type, pName, sName, postID, postName, discussSettings }, } = useRoute(); // 编辑器实例，必须用 shallowRef diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index cb165bb..1ebfd12 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -187,7 +187,7 @@
-
+
{{ data.workDto?.workName }}
@@ -283,7 +283,7 @@
- +
{{ data.planDto?.teacher }} @@ -323,7 +323,7 @@ const { data } = useRequest(STU_OFFCOURSE_DETAIL, { usePermission: true, }); const teacherInfo = useUserInfo(computed(() => data.value?.planDto?.teacherId)); -const isAllowSign = computed(() => dayjs().isBetween(dayjs(data.value.planDto?.beginTime).subtract(data.value.beforeStart || 0, "minute"), dayjs(data.value.afterStart ? data.value.planDto?.beginTime : data.value.planDto?.endTime).add(data.value.afterStart || 0, "minute"))); +const isAllowSign = computed(() => dayjs().isBetween(dayjs(data.value.planDto?.beginTime).subtract(data.value.planDto?.beforeStart || 0, "minute"), dayjs(data.value.planDto?.afterStart ? data.value.planDto?.beginTime : data.value.planDto?.endTime).add(data.value.planDto?.afterStart || 0, "minute"))); const handleClick = (tab, event) => { console.log("附件", tab, event); @@ -395,7 +395,7 @@ function toWork() { path: "/homeworkpage", query: { courseId: data.value.planDto.homeWorkId, - id: taskId, + // id: taskId, infoId: data.value.planDto.id, chapterOrStageId: 0, type:3, @@ -434,11 +434,6 @@ function toExamItem(obj) { } } -onUnmounted(() => { - if (timer) { - clearInterval(timer); - } -}); diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index e757533..3668133 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -524,7 +524,7 @@ const showFileList = computed(() => { }); const handleClick = () => { - console.log(fileList.value, uploadRef.value); + console.log(fileList.value, uploadRef.value,sbValue.value.content); // 判断当前学员作业成绩是否已经导入，如果已经导入成绩，则不允许其再次上传作业 if(submitScore.value){ ElMessage.warning("您的作业成绩已出，不能重复上传"); @@ -532,11 +532,10 @@ const handleClick = () => { } if (!sbValue.value.content) { - if (fileList.value.length === 0) { - return ElMessage.warning("请输入作业内容"); - } + ElMessage.warning("请输入作业内容"); + return } - + loading.value = ElLoading.service({ lock: true, text: "Loading", @@ -549,10 +548,14 @@ const handleClick = () => { workId, type, taskId: taskId || infoId, + workScore: -1 }).then((res) => { - console.log(res); - submitList.value.unshift(res.data); + submitList.value.length!==0&&submitList.value.unshift(res.data); open(); + submitList.value = useRequest(TASK_WORK_SUBMIT_LIST, { + workerId: workId, + type + }).data; sbValue.value.content = ""; fileList.value = []; remove(0); diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 8be5f21..38df403 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -73,11 +73,11 @@
{{ value.statusName || (data.unlockMode === 1 ? TASK_TYPES.toName[value.type] : '未解锁') }}
-