diff --git a/src/App.vue b/src/App.vue index 25e067f..483bce0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,11 +7,11 @@ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> diff --git a/src/api/useCommon.js b/src/api/useCommon.js index 55bfcda..35f0cbc 100644 --- a/src/api/useCommon.js +++ b/src/api/useCommon.js @@ -1,7 +1,7 @@ import {useRoute, useRouter} from "vue-router/dist/vue-router"; import {useStore} from "vuex"; -import {PROJECT, TASK_TYPES} from "@/api/CONST"; -import {computed, onMounted} from "vue"; +import {TASK_TYPES} from "@/api/CONST"; +import {computed, watchEffect} from "vue"; export function useTaskPage() { const router = useRouter() @@ -16,11 +16,9 @@ export function useTaskPage() { }))) : info.value.taskBoList) const index = computed(() => taskList.value?.findIndex(t => t.id == taskId)) const hasPrev = computed(() => index.value - 1 > 0) - const hasNext = computed(() => taskList.value.length > index) + const hasNext = computed(() => taskList.value.length > index.value) - onMounted(() => { - dispatch('getProjectInfo', {projectId:infoId}) - }) + type == 1 ? dispatch('getProjectInfo', {projectId: infoId}) : dispatch('getRouterInfo', {routerId: infoId}) function nextPage() { toPage(taskList.value[index.value + 1]) @@ -41,7 +39,7 @@ export function useTaskPage() { infoId: info.id, courseId: d.courseId, pName: info.name, - sName:d.stageName, + sName: d.stageName, chapterOrStageId: d.stageId, btype: type }, diff --git a/src/views/ballot/BallotPage.vue b/src/views/ballot/BallotPage.vue index f728667..6788289 100644 --- a/src/views/ballot/BallotPage.vue +++ b/src/views/ballot/BallotPage.vue @@ -7,14 +7,16 @@
{{ sName }}
/
投票详情
-
返回 @@ -195,6 +197,7 @@ import store from "@/store"; import { ElMessage } from "element-plus"; import {useRoute,useRouter} from "vue-router/dist/vue-router"; import {computed, reactive, toRefs} from "vue"; +import {useTaskPage} from "@/api/useCommon"; // const { data } = useRequest(TASK_VOTE_DETAIL, {}); // console.log("datadatadata", data); // const state = reactive({ @@ -204,7 +207,7 @@ import {computed, reactive, toRefs} from "vue"; const { query: {courseId, pName, sName, chapterOrStageId, infoId, id, btype}, } = useRoute(); - +const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() const router = useRouter(); const returnclick = () => { router.back(); diff --git a/src/views/debate/DebatePage.vue b/src/views/debate/DebatePage.vue index 8f1f092..e96d674 100644 --- a/src/views/debate/DebatePage.vue +++ b/src/views/debate/DebatePage.vue @@ -7,13 +7,16 @@
{{ sName }}
/
辩论详情
- + + + 上一个 + + + 下一个 + + +
返回 @@ -89,13 +92,14 @@ import { reactive, toRefs } from "vue"; import { useRequest } from "@/api/request"; import { TASK_VOTE_DETAIL, VOTE_DETAIL } from "@/api/api"; import { useRoute } from "vue-router/dist/vue-router"; +import {useTaskPage} from "@/api/useCommon"; const { query: { id: voteSubmitId, pName, sName }, } = useRoute(); const { data } = useRequest(TASK_VOTE_DETAIL, { voteSubmitId }); const { data: voteDetail } = useRequest(VOTE_DETAIL, { voteSubmitId }); - +const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() const state = reactive({ activeName: "first", }); diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue index b331500..86a9b37 100644 --- a/src/views/discuss/DiscussPage.vue +++ b/src/views/discuss/DiscussPage.vue @@ -11,23 +11,16 @@
/
讨论详情
- +
+ + + 上一个 + + + 下一个 + + +
返回 @@ -167,6 +160,7 @@ import { useRoute, useRouter } from "vue-router"; import store from "@/store"; import { ElMessage } from "element-plus"; import { fileUp } from "../../api/request"; +import {useTaskPage} from "@/api/useCommon"; const userInfo = computed(() => store.state.userInfo); const router = useRouter(); @@ -176,7 +170,7 @@ const returnclick = () => { const { query: { id, type, pName, sName }, } = useRoute(); - +const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() const dialogVisible = ref(false); const titleName = ref(""); diff --git a/src/views/examination/ExamPage.vue b/src/views/examination/ExamPage.vue index da51a2e..53f8d05 100644 --- a/src/views/examination/ExamPage.vue +++ b/src/views/examination/ExamPage.vue @@ -11,23 +11,16 @@
/
考试详情
- +
+ + + 上一个 + + + 下一个 + + +
返回 @@ -123,11 +116,12 @@ import { useRoute } from "vue-router/dist/vue-router"; import { usePage, useRequest } from "@/api/request"; import { COMMENT_LIST, DISCUSS_DETAIL, EXAMINATION_QUERY } from "@/api/api"; +import {useTaskPage} from "@/api/useCommon"; const { query: { id, discussSubmitId, pName, sName }, } = useRoute(); - +const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() const { data } = useRequest(EXAMINATION_QUERY(159), {}); diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index 92ec2ac..6bcda23 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -17,13 +17,16 @@
{{ sName }}
/
作业详情
- + + + 上一个 + + + 下一个 + + +
@@ -451,12 +454,13 @@ import UploadImg from "@/components/img/UploadImg.vue"; import FileTypeImg from "@/components/FileTypeImg.vue"; import { useRoute } from "vue-router/dist/vue-router"; import { ElMessage } from "element-plus"; +import {useTaskPage} from "@/api/useCommon"; //import AlertSuccess from "@/components/alert/AlertSuccess.vue"; const fileList = ref([]); const fielPath = ref(import.meta.env.VITE_FILE_PATH); const uploadRef = ref(); - +const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() const centerDialogVisible = ref(false); const sbValue = ref({ content: "", diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index 03b15b1..48eb0e7 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -196,7 +196,6 @@ import {useRoute} from "vue-router/dist/vue-router"; import {useRouter} from "vue-router"; import {useUserInfo} from "@/api/utils"; import {ElMessage} from "element-plus"; -import dayjs from "dayjs"; import {useTaskPage} from "@/api/useCommon"; const { @@ -255,7 +254,7 @@ let timer = null; function isSignClick() { timer = setInterval(() => { let beginTime = new Date(data.value?.liveStartTime).getTime(); - let endTime = !data.value.afterSignIn || data.value.afterSignIn == '0' + let endTime = !data.value.afterSignIn || data.value?.afterSignIn == '0' ? new Date(data.value.liveEndTime).getTime() : new Date(data.value?.liveStartTime).getTime(); let nowTime = new Date().getTime(); diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue index 6059f34..5bc8ef6 100644 --- a/src/views/moreActive/MoreActive.vue +++ b/src/views/moreActive/MoreActive.vue @@ -8,13 +8,16 @@
{{ sName }}
/
活动详情
- + + + 上一个 + + + 下一个 + + +
返回 @@ -170,6 +173,7 @@ import { useRouter } from "vue-router"; import { useRoute } from "vue-router/dist/vue-router"; import { ElMessage } from "element-plus"; import { reactive, onUnmounted, toRefs} from "vue"; +import {useTaskPage} from "@/api/useCommon"; const router = useRouter(); const returnclick = () => { router.back(); @@ -183,7 +187,7 @@ const state = reactive({ }); const { isAllowSign } = toRefs(state); - +const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() const { data } = useRequest(ACTIVITY, { activityId }); console.log('data', data) const signClick = (tab, event) => { diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index 245b1b5..a5762de 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -10,22 +10,16 @@
/
评估详情
- +
+ + + 上一个 + + + 下一个 + + +
{ clearInterval(timers) router.back(); }; - +const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 }); console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 }) console.log('我是需要排序得题目', data) diff --git a/src/views/testscore/Evaluation.vue b/src/views/testscore/Evaluation.vue index 860baa8..bf1f726 100644 --- a/src/views/testscore/Evaluation.vue +++ b/src/views/testscore/Evaluation.vue @@ -7,14 +7,16 @@
{{ sName }}
/
测评详情
-
返回 @@ -82,11 +84,12 @@ import {reactive,computed} from "vue"; import {useRoute,useRouter} from "vue-router/dist/vue-router"; import store from "@/store"; + import {useTaskPage} from "@/api/useCommon"; const { query: {courseId, pName, sName, chapterOrStageId, infoId, id, exname, btype}, } = useRoute(); - + const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() const router = useRouter(); const returnclick = () => { router.back(); diff --git a/src/views/testscore/ExternalExamination.vue b/src/views/testscore/ExternalExamination.vue index 1b2d253..3acea51 100644 --- a/src/views/testscore/ExternalExamination.vue +++ b/src/views/testscore/ExternalExamination.vue @@ -7,14 +7,16 @@
{{ sName }}
/
考试详情
-
返回 @@ -76,11 +78,12 @@ } from "@/api/api"; import {reactive} from "vue"; import {useRoute,useRouter} from "vue-router/dist/vue-router"; + import {useTaskPage} from "@/api/useCommon"; const { query: {courseId, pName, sName, chapterOrStageId, infoId, id, exname}, } = useRoute(); - + const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() const router = useRouter(); const returnclick = () => { router.back(); diff --git a/src/views/testscore/OuterChain.vue b/src/views/testscore/OuterChain.vue index 250a401..9b7980a 100644 --- a/src/views/testscore/OuterChain.vue +++ b/src/views/testscore/OuterChain.vue @@ -7,14 +7,16 @@
{{ sName }}
/
外链详情
-
返回 @@ -79,11 +81,12 @@ } from "@/api/api"; import {reactive} from "vue"; import {useRoute,useRouter} from "vue-router/dist/vue-router"; + import {useTaskPage} from "@/api/useCommon"; const { query: {courseId, pName, sName, chapterOrStageId, infoId, id, exname}, } = useRoute(); - + const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() const router = useRouter(); const returnclick = () => { router.back();