From 8df53386d4f1d598bcec0405fa6daf3637e8cfe5 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Sun, 1 Jan 2023 19:35:44 +0800 Subject: [PATCH 01/42] =?UTF-8?q?=E6=9C=AA=E5=9C=A8=E6=9C=89=E6=95=88?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeachSignUp.vue | 2 +- src/views/homework/HomeworkPage.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index 914854a..37111e2 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -163,7 +163,7 @@ const download = (url) => { window.open(url); }; const downloads = (url) => { - ElMessage.warning("未到开始时间，请耐心等待！"); + ElMessage.warning("未在有效时间范围内，请耐心等待！"); }; let timer = null; diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index 7a74bc6..cdbecea 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -145,7 +145,7 @@
+ style="background:#999;border-radius: 6px;cursor: not-allowed;">未在有效时间范围内
@@ -162,7 +162,7 @@
+ style="background:#999;border-radius: 6px;cursor: not-allowed;">未在有效时间范围内
From c51ebcfc7b2969855db93bf159156994a1c39a38 Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 9 Jan 2023 18:12:26 +0800 Subject: [PATCH 02/42] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E9=A2=98=E7=9B=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 2 +- src/views/survey/SurveyDetail.vue | 108 +++++++++++++++--------------- 2 files changed, 54 insertions(+), 56 deletions(-) diff --git a/src/api/api.js b/src/api/api.js index 4c49774..6f0f2b0 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -51,7 +51,7 @@ export const COMMENT_PRAISE = '/comment/praise post' export const COMMENT_COLLECTION = '/comment/collection post' export const ASSESSMENT_SUBMIT_QUERY = assessmentId => `/assessmentSubmit/queryAssessmentSubmitDetailById?assessmentSubmitId=${assessmentId} post` -export const ASSESSMENT_QUERY = assessmentId => `/stu/task/evaluate/get` +export const ASSESSMENT_QUERY = assessmentId => `/stu/task/queryAssessmentDetailById` export const ASSESSMENT_SUBMIT = '/stu/task/evaluate/commit post' export const ACTIVITY = '/activity' diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index 4363f44..a09c722 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -44,13 +44,9 @@ return a[0].orderNumber - b[0].orderNumber }) }} --> -
-
-
+
+
+
{{ value.assessmentScTitle }}
完全没用
@@ -84,69 +80,62 @@
-
-
+
+
- {{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }} + {{ value?.singleStemName }}
-
- -
{{ value.singleOptionName }}
+ +
{{ values.singleOptionName }}
-
-
+
+
- {{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }} + {{ value?.multipleStemName }}
-
- -
{{ value.multipleOptionName }}
+ +
{{ values.multipleOptionName }}
-
-
-
{{ item.assessmentQaTitle }}
+
+
+
{{ value.assessmentQaTitle }}
- -
{{ item.content?.length || 0 }}/200
+
{{ value.content?.length || 0 }}/200
@@ -290,12 +279,11 @@
{{ item.content?.length || 0 }}/200
--> -
提交 @@ -347,26 +335,35 @@ const returnclick = () => { router.back(); }; -// 数组去空对象 -function formateArr(arr1) { - console.log(arr1, arr1[0], arr1[0].length) - let newarr = [] - for (let i = 0; i < arr1.length; i++) { - if (arr1[i].length !== 0) { - newarr.push(arr1[i]) - } - } - return newarr -} - 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) -function goHome() { - +// 数组去空对象 +function formateArr(datas) { + let allArr = [] + for(let i=0;i { return a.orderNumber - b.orderNumber}) + console.log('我是排序后的题目', newarr) + return newarr } +const questionList = ref([]) + +const timers = setInterval(() => { + console.log(data) + console.log(data.value.assessmentId) + if(data.value.assessmentId){ + clearInterval(timers) + console.log([data.value.essayQuestionVoList, data.value.multipleStemVoList, data.value.scoringQuestionVoList, data.value.singleStemVoList]) + questionList.value = formateArr([data.value.essayQuestionVoList, data.value.multipleStemVoList, data.value.scoringQuestionVoList, data.value.singleStemVoList]) + } +}, 1000); + const centerDialogVisible = ref(false); const open = () => { centerDialogVisible.value = true @@ -579,3 +576,4 @@ function submit() { } } + From e67dc797aa5233f3dc31192df5a2c4c35a781570 Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 10 Jan 2023 09:13:04 +0800 Subject: [PATCH 03/42] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/survey/SurveyDetail.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index a09c722..56f3180 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -332,6 +332,7 @@ const { } = useRoute(); const router = useRouter(); const returnclick = () => { + clearInterval(timers) router.back(); }; @@ -339,6 +340,12 @@ const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, ch console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 }) console.log('我是需要排序得题目', data) +// 答题时间 +const answerTime = new Date(); + +console.log('录入首次进入页面时间', answerTime) + + // 数组去空对象 function formateArr(datas) { let allArr = [] @@ -364,11 +371,16 @@ const timers = setInterval(() => { } }, 1000); +setTimeout(() => { + clearInterval(timers); +}, 30000); + const centerDialogVisible = ref(false); const open = () => { centerDialogVisible.value = true }; function submit() { + console.log('录入首次进入页面时间', answerTime) if (1 > 0) { console.log(data) console.log('我是提交的数据', { From dabb995a3068fb50731c61a5d8c5cd97f0f89212 Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 10 Jan 2023 10:36:07 +0800 Subject: [PATCH 04/42] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=AD=94=E9=A2=98=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/survey/SurveyDetail.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index 56f3180..bcf60e7 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -326,6 +326,7 @@ import { request, usePage, useRequest } from "@/api/request"; import { ASSESSMENT_QUERY, ASSESSMENT_SUBMIT } from "@/api/api"; import { ElMessage } from "element-plus"; import { ref } from "vue"; +import dayjs from "dayjs"; const { query: { courseId, id: taskId, infoId, type, pName, sName, chapterOrStageId, projectStatus, projectEndTime }, @@ -341,7 +342,7 @@ console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageI console.log('我是需要排序得题目', data) // 答题时间 -const answerTime = new Date(); +const answerTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'); console.log('录入首次进入页面时间', answerTime) @@ -445,6 +446,7 @@ function submit() { taskId: taskId ? taskId : 0, type, result: JSON.stringify(data.value), + beginTime: answerTime }).then(() => { open(); }); From e1e9e7f7214d1685a1a31603ecc79bbcabe0fba8 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 11 Jan 2023 10:19:37 +0800 Subject: [PATCH 05/42] -- bug --- src/App.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 55404fe..74e3feb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -38,8 +38,9 @@ import router from "@/router"; console.log("版本2.0.2------------"); const store = useStore(); +const {path} = useRoute(); onMounted(() => { - getUserInfo(); + path === '/login' || getUserInfo(); }); function getUserInfo() { From aeddb8e4fe5bcef92be9539c43c9a915ef60197b Mon Sep 17 00:00:00 2001 From: zhangyc Date: Wed, 11 Jan 2023 10:23:37 +0800 Subject: [PATCH 06/42] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 55404fe..730766c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -36,7 +36,7 @@ import { useStore } from "vuex"; import { onMounted } from "vue"; import router from "@/router"; -console.log("版本2.0.2------------"); +console.log("版本2.0.4------------"); const store = useStore(); onMounted(() => { getUserInfo(); From 4db7257b57d20a8d739741d30ea633dddaa6279a Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 11 Jan 2023 10:57:04 +0800 Subject: [PATCH 07/42] =?UTF-8?q?--=20=E6=B5=8B=E8=AF=95=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 1 + docker/Dockerfile | 5 +++++ src/App.vue | 2 +- vite.config.js | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 docker/Dockerfile diff --git a/.env b/.env index 8aaa1a9..984fa09 100644 --- a/.env +++ b/.env @@ -1,5 +1,6 @@ VITE_BASE=/fe-student VITE_BASE_API= +VITE_OUTPUT_DIR=./dist VITE_BASE_LOGIN_URL=https://u-pre.boe.com/web/ VITE_PROXY_URL=http://111.231.196.214:30001 diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..2617103 --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,5 @@ +FROM devforth/spa-to-http:latest +WORKDIR / + +ADD ./dist/ . +EXPOSE 8080 diff --git a/src/App.vue b/src/App.vue index 74e3feb..a1f813f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -34,7 +34,7 @@ import { boeRequest } from "@/api/request"; import { GET_USER_INFO } from "@/api/ThirdApi"; import { useStore } from "vuex"; import { onMounted } from "vue"; -import router from "@/router"; +import {useRoute} from "vue-router/dist/vue-router"; console.log("版本2.0.2------------"); const store = useStore(); diff --git a/vite.config.js b/vite.config.js index f6d6081..57bd0e3 100644 --- a/vite.config.js +++ b/vite.config.js @@ -14,6 +14,9 @@ const path = require('path') export default defineConfig(({ command, mode }) => ({ base: loadEnv(mode, process.cwd()).VITE_BASE, + build:{ + outDir: loadEnv(mode, process.cwd()).VITE_OUTPUT_DIR, + }, plugins: [ vue(), // legacy({ From b1ee2e6cdee5ac35fc634fd3a306a4b8899f925a Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 11 Jan 2023 15:36:03 +0800 Subject: [PATCH 08/42] =?UTF-8?q?style:=E9=A1=B9=E7=9B=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=B7=B2=E5=AE=8C=E6=88=90=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectManage.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/project/ProjectManage.vue b/src/views/project/ProjectManage.vue index 9bcc651..c705b44 100644 --- a/src/views/project/ProjectManage.vue +++ b/src/views/project/ProjectManage.vue @@ -344,6 +344,7 @@ const goProjectDetails = (value) => { font-weight: 400; color: #ffffff; line-height: 22px; + margin-right: 120px; cursor: pointer; } } From 3e2b53f53dc1f476e9661d73a5a7a484bfb605c5 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 11 Jan 2023 16:37:39 +0800 Subject: [PATCH 09/42] =?UTF-8?q?--=20=E6=B5=8B=E8=AF=95=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 984fa09..cc2a4e9 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ VITE_BASE=/fe-student VITE_BASE_API= VITE_OUTPUT_DIR=./dist VITE_BASE_LOGIN_URL=https://u-pre.boe.com/web/ -VITE_PROXY_URL=http://111.231.196.214:30001 +VITE_PROXY_URL=http://111.231.196.214/manageApi VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= From 5727abcafafc3987e3c19ac468f642bf2a05a312 Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 11 Jan 2023 22:34:56 +0800 Subject: [PATCH 10/42] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AF=84=E5=88=86?= =?UTF-8?q?=E9=A2=98=E7=9B=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/survey/SurveyDetail.vue | 58 ++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index bcf60e7..0b6edf5 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -51,27 +51,32 @@
完全没用
-
+ +
{{ item + 1 }}
@@ -376,6 +381,17 @@ setTimeout(() => { clearInterval(timers); }, 30000); +// 生成数组 +function orderArr(a,b) { + let arrs = [] + for(let i=0;i<10;i++){ + if((i+1)>=a && (i+1)<=b){ + arrs.push(i) + } + } + return arrs; +} + const centerDialogVisible = ref(false); const open = () => { centerDialogVisible.value = true From ef537422568dff5c6ce9f3fab120faa7de05c272 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 12 Jan 2023 09:42:17 +0800 Subject: [PATCH 11/42] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 804d940..aa071c2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -36,7 +36,7 @@ import { useStore } from "vuex"; import { onMounted } from "vue"; import {useRoute} from "vue-router/dist/vue-router"; -console.log("版本2.0.4------------"); +console.log("版本2.0.5------------"); const store = useStore(); const {path} = useRoute(); onMounted(() => { From f751b60d5593981aeba16bb32d2bfea8bcdd07b9 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 12 Jan 2023 15:02:27 +0800 Subject: [PATCH 12/42] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E8=AF=BE=E8=AF=BE=E7=A8=8B=E9=99=84=E4=BB=B6=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeach.vue | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 8b39129..789b1c3 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -96,8 +96,8 @@
- -
{{ el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.')) }}
+ +
{{ el.name? el.name : el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.')) }}
@@ -108,7 +108,7 @@
-
+
下载
@@ -239,9 +239,14 @@ const downloads = (url) => { }; function formateArr(strs) { - let arrs = strs.split(',') - console.log('112233', arrs) - return arrs + let newArr = []; + try{ + newArr = JSON.parse(strs) + } catch { + newArr = strs.split(',') + } + console.log('112233', newArr) + return newArr } let timer = null; From 7c339d51a35fc8d42e38081954330c8caec28daa Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 12 Jan 2023 17:42:49 +0800 Subject: [PATCH 13/42] =?UTF-8?q?style:=E4=BF=AE=E6=94=B9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=9C=AA=E5=BC=80=E5=A7=8B=E5=BC=B9=E6=A1=86=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectManage.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/project/ProjectManage.vue b/src/views/project/ProjectManage.vue index c705b44..f12847d 100644 --- a/src/views/project/ProjectManage.vue +++ b/src/views/project/ProjectManage.vue @@ -119,6 +119,8 @@ import { import { useRouter } from "vue-router"; import store from "@/store"; import { toDate } from "../../api/method"; +import { ElMessage } from "element-plus"; + const projectClassify = []; const studyProgress = []; const projectList = ref([]); //项目列表 @@ -189,7 +191,8 @@ const resetClick = () => { const router = useRouter(); const goProjectDetails = (value) => { if(value.status===2){ - dialogVisible.value=true + // dialogVisible.value=true + ElMessage.error('当前项目未到开始时间'); return } import.meta.env.MODE === "development" From 68d1733cd55bbef68818125fa2007a22e6bb957f Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 12 Jan 2023 17:46:30 +0800 Subject: [PATCH 14/42] =?UTF-8?q?--=20=E6=B5=8B=E8=AF=95=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 17 ++++++++++++----- src/api/api.js | 1 + src/components/PathDetailImage.vue | 2 +- src/views/project/ProjectManage.vue | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/App.vue b/src/App.vue index aa071c2..b2ffa30 100644 --- a/src/App.vue +++ b/src/App.vue @@ -30,11 +30,12 @@
From dc919756c544a015c32af0ecfba17c462eba56fa Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 16 Jan 2023 10:15:53 +0800 Subject: [PATCH 24/42] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index df3ab3b..e1a9c7f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -37,7 +37,7 @@ import { onMounted } from "vue"; import {useRoute} from "vue-router/dist/vue-router"; import {USER_INFO} from "@/api/api"; -console.log("版本2.0.7------------"); +console.log("版本2.1.0------------"); const store = useStore(); const {path} = useRoute(); onMounted(() => { From 685a12bdc01fcca606c07fc7d2a7657518d4b536 Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 16 Jan 2023 15:38:51 +0800 Subject: [PATCH 25/42] =?UTF-8?q?fix:=E8=B7=AF=E5=BE=84=E5=9B=BE=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E6=8C=89=E9=92=AE=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeach.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 9910f15..20ca5cd 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -134,6 +134,12 @@ class="submit" @click="toWork"> 交作业
+
+ 交作业 +
From 864d0637afb303f1459c26a0e24d1921e38eb8d0 Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 16 Jan 2023 16:10:40 +0800 Subject: [PATCH 26/42] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE=E8=B7=B3=E8=BD=AC=E9=9D=A2=E6=8E=88=E8=AF=BE=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectManage.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/project/ProjectManage.vue b/src/views/project/ProjectManage.vue index cf97031..e95c576 100644 --- a/src/views/project/ProjectManage.vue +++ b/src/views/project/ProjectManage.vue @@ -129,6 +129,7 @@ import { toDate } from "../../api/method"; import { ElMessage } from "element-plus"; import { ElLoading } from 'element-plus'; +const router = useRouter(); const projectClassify = []; const studyProgress = []; const projectList = ref([]); //项目列表 @@ -208,7 +209,7 @@ const resetClick = () => { console.log("点击重置"); }; //搜索--------------end----------------------------------------- -const router = useRouter(); + const goProjectDetails = (value) => { if(value.status===2){ // dialogVisible.value=true @@ -216,11 +217,13 @@ const goProjectDetails = (value) => { return } (import.meta.env.MODE === "development" || import.meta.env.MODE === "test") - ? router.push({ + ? + router.push({ path: "/projectdetails", query: { projectId: value.projectId }, }) - : window.open( + : + window.open( `${import.meta.env.VITE_BOE_PATH_DETAIL_URL}/projectdetails¶ms=${encodeURIComponent( `projectId=${value.projectId}` ,'_top')}` From fe2ea2fdb966b2b040cb1e9141615bf1f1a7ecc7 Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 16 Jan 2023 17:29:23 +0800 Subject: [PATCH 27/42] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BEloading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request.js | 3 ++- src/views/roadmap/LearnPath.vue | 21 +++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/api/request.js b/src/api/request.js index 1d8d2a3..9192e02 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -4,7 +4,7 @@ import axios from 'axios'; import { getCookie } from "@/api/utils"; import JSONBigInt from 'json-bigint'; const JSONBigIntStr = JSONBigInt({ storeAsString: true }); -export function usePage(_url, param) { +export function usePage(_url, param, callback) { const state = reactive({ data: {}, @@ -28,6 +28,7 @@ export function usePage(_url, param) { state.total = r.data.total state.current = r.data.current state.loading = false + callback(r) }) } diff --git a/src/views/roadmap/LearnPath.vue b/src/views/roadmap/LearnPath.vue index ca9c46d..7b195a1 100644 --- a/src/views/roadmap/LearnPath.vue +++ b/src/views/roadmap/LearnPath.vue @@ -56,7 +56,11 @@
-
+
+ +
+
+ {{ loading.close() }}
@@ -107,17 +111,30 @@ import {ROUTER_LIST,} from "@/api/api"; import {useRouter} from "vue-router"; import store from "@/store"; import PathDetailImage from "@/components/PathDetailImage.vue"; +import { ElLoading } from 'element-plus'; const detail = ref(); const showmapdetail = ref(false); const currentStageId = ref(); const userInfo = computed(() => store.state.userInfo); -const {data} = usePage(ROUTER_LIST, {pageSize: 60}); +const loading = ref(false); +const isLoading = ref(true); +loading.value = ElLoading.service({ + lock: true, + text: 'Loading', + background: 'rgba(0, 0, 0, 0.7)' +}) + +const {data} = usePage(ROUTER_LIST, {pageSize: 60}, (e)=>{ + console.log('我请求成功了吗', e) + isLoading.value = false; +}); const router = useRouter(); const returnclick = () => { router.back(); }; + // const {unCompleteTaskList} = useRequest(ROUTER_UNCOMPLETE_LIST, {}); const returnfun = () => { From 7c6b9a7c430d29dc0444fae3e881b3550b2cfd86 Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 16 Jan 2023 18:58:18 +0800 Subject: [PATCH 28/42] =?UTF-8?q?style:=E9=A1=B9=E7=9B=AE=E5=85=AC?= =?UTF-8?q?=E5=91=8A=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index b1f44a8..fd6fe30 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -130,9 +130,7 @@
-
- {{ data.notice || "暂无公告" }} -
+ 
{{ data.notice || "暂无公告" }}
 - {{ data.isSurvery ? "已评估" : "评估" }} - -
-
-
+
- + {{ data.signFlag ? "已签到" : "签到" }} @@ -99,50 +83,39 @@
{{ el.name? el.name : el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.')) }}
-
+
下载
-
- -
- 下载 -
-
+ + + + + +
-
-
-
{{ data.workDto?.workName }}
-
-
必修
-
作业
-
-
- - -
- 交作业 -
-
- 交作业 -
+
+
{{ data.workDto?.workName }}
+
+
必修
+
作业
+
+
+
+ 交作业 +
-
+
此课程无作业
@@ -160,9 +133,7 @@
考试
-
去考试 @@ -218,12 +189,10 @@ const returnclick = () => { router.back(); }; const { - query: { courseId, type, id: taskId, projectStatus, projectEndTime }, + query: { courseId, type, id: taskId }, } = useRoute(); -const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId }); -console.log("datadatadatadatadatadatadata", data); -console.log("项目状态字段传递", projectStatus, projectEndTime); +const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId,usePermission:true }); const teacherInfo = useUserInfo( computed(() => data.value?.planDto?.teacherId) ); @@ -249,7 +218,7 @@ function formateArr(strs) { try{ newArr = JSON.parse(strs) } catch { - newArr = strs.split(',') + newArr = strs?.split(',') } console.log('112233', newArr) return newArr @@ -330,11 +299,7 @@ const signClick = () => { data.value.signFlag = 1; ElMessage.warning("签到成功"); - if (taskId) { - request(TASK_OFFCOURSE_SIGN, { courseId: courseId, taskId, type }); - } else { - request(TASK_OFFCOURSE_NOTASK_SIGN, { courseId: courseId }); - } + request(TASK_OFFCOURSE_NOTASK_SIGN, { courseId: courseId }); }; function toSurvery() { @@ -379,7 +344,7 @@ function toWork() { query: { courseId: data.value.workDto.workId, id: taskId, - infoId: data.value.offcourseDto.offcourseId, + infoId: data.value.planDto.offcoursePlanId, chapterOrStageId: 0, type, pName: "面授课", diff --git a/src/views/faceteach/FaceTeachNoCommon.vue b/src/views/faceteach/FaceTeachNoCommon.vue index 979db7e..5c92105 100644 --- a/src/views/faceteach/FaceTeachNoCommon.vue +++ b/src/views/faceteach/FaceTeachNoCommon.vue @@ -126,9 +126,6 @@ import FileTypeImg from "@/components/FileTypeImg.vue"; import {request, useRequest} from "@/api/request"; import { STU_OFFCOURSE_DETAIL, - TASK_OFFCOURSE_NOTASK_SIGN, - TASK_OFFCOURSE_SIGN, - TASK_BROADCAST_SIGN, FACETEACH_SIGNUP } from "@/api/api"; import {useRoute, useRouter} from "vue-router"; diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index 3e5b6e9..795530d 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -22,7 +22,7 @@
+ :src="data.offcourseDto?.picUrl" alt="">
【面授课】{{ data.planDto?.name }}
@@ -39,7 +39,7 @@
{{ data.planDto?.address }}
- {{data.isSignUp?'已报名':'立即报名'}} + {{data.isSignUp?'已报名':'立即报名'}}
@@ -126,9 +126,6 @@ import FileTypeImg from "@/components/FileTypeImg.vue"; import {request, useRequest} from "@/api/request"; import { STU_OFFCOURSE_DETAIL, - TASK_OFFCOURSE_NOTASK_SIGN, - TASK_OFFCOURSE_SIGN, - TASK_BROADCAST_SIGN, FACETEACH_SIGNUP } from "@/api/api"; import {useRoute, useRouter} from "vue-router"; @@ -144,7 +141,7 @@ const { query: {courseId, type, id: taskId}, } = useRoute(); -const {data} = useRequest(STU_OFFCOURSE_DETAIL, {courseId}); +const {data = {}} = useRequest(STU_OFFCOURSE_DETAIL, {courseId}); const teacherInfo = useUserInfo( computed(() => data.value?.planDto?.teacherId) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index fd6fe30..ff69fd3 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -117,7 +117,7 @@
@@ -299,7 +299,7 @@ const { data } = useRequest(PROJECT_PROCESS, { console.log("datadata", data); const loading = ref(false); -loading.value = ElLoading.service({ +loading.value = ElLoading.service({ lock: true, text: 'Loading', background: 'rgba(0, 0, 0, 0.7)' @@ -361,7 +361,7 @@ const types = ref({ }, path: { 1: import.meta.env.VITE_BOE_ONLINE_CLASS_URL, //在线 - 2: "/faceteach", + 2: ({ courseId }) => window.open(`${location.protocol}//${location.host}${import.meta.env.VITE_BASE_API}/stu/project/redirectDetail?courseId=${courseId}`, '_top'), 3: import.meta.env.VITE_BOE_CASS_DETAIL_URL, //案例 4: "/homeworkpage", 5: import.meta.env.VITE_BOE_EXAM_DETAIL_URL, //考试 @@ -526,8 +526,6 @@ function toFinish(d, sName, chapterOrStageId) { pName: data.value.name, sName, chapterOrStageId, - projectStatus: data.value.status?data.value.status:0, // 项目状态 -- 用于判断当前项目是否已经结束 - projectEndTime: data.value.endTime?data.value.endTime:0 // 项目结束 -- 用于判断当前项目是否已经结束 }, }); } else if (typeof types.value.path[d.type] === "function") { diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index b0477e3..1ec9a45 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -339,8 +339,8 @@ const types = ref({ }, path: { 1: import.meta.env.VITE_BOE_ONLINE_CLASS_URL, //在线 - 2: "/faceteach", - 3: import.meta.env.VITE_BOE_CASS_DETAIL_URL, //案例 + 2: ({ courseId }) => window.open(`${location.protocol}//${location.host}${import.meta.env.VITE_BASE_API}/stu/project/redirectDetail?courseId=${courseId}`, '_top'), + 3: import.meta.env.VITE_BOE_CASS_DETAIL_URL, //案例 4: "/homeworkpage", 5: import.meta.env.VITE_BOE_EXAM_DETAIL_URL, //考试 6: "/livebroadcast", From 4ed861126674b2d73596c7ee888c9c481c6a652e Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 17 Jan 2023 09:17:03 +0800 Subject: [PATCH 31/42] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 72285da..1a67bb1 100644 --- a/src/App.vue +++ b/src/App.vue @@ -37,7 +37,7 @@ import { onMounted } from "vue"; import {useRoute} from "vue-router/dist/vue-router"; import {USER_INFO} from "@/api/api"; -console.log("版本2.1.1------------"); +console.log("版本2.1.2------------"); const store = useStore(); const {path} = useRoute(); onMounted(() => { From da68614353583b635e53eccc24e2a5068ef6b619 Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 17 Jan 2023 10:41:39 +0800 Subject: [PATCH 32/42] =?UTF-8?q?fix:=E5=AD=A6=E5=91=98=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BA=BA=E7=89=A9=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index ff69fd3..7e26294 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -43,7 +43,7 @@
-
From 04e7a5346b1540b27add8081c73b9b0b97d8d589 Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 17 Jan 2023 16:17:10 +0800 Subject: [PATCH 33/42] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=E9=A2=9C=E8=89=B2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/liveBroadcast/LiveBroadcast.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index 161f3e0..ce780b6 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -78,14 +78,16 @@
- 观看 - {{ data.signFlag ? "已签到" : "签到" }} + + {{ data.signFlag ? "已签到" : "签到" }} ', state.isAllowSign) // console.log( // "isAllowSign", // state.isAllowSign, From 04f4c6dbd0f7fdf65f66d5e6bd8daabe2b4fc350 Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 17 Jan 2023 17:08:28 +0800 Subject: [PATCH 34/42] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E8=83=BD=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeach.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 9f66a63..88890f2 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -90,12 +90,12 @@ 下载
- - - - - - +
+ +
+ 下载 +
+
From 540cdf1fce8263ed28a027f0408eed9a9fb96c5b Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 17 Jan 2023 17:25:34 +0800 Subject: [PATCH 35/42] =?UTF-8?q?style:=E9=A1=B9=E7=9B=AE=E5=85=AC?= =?UTF-8?q?=E5=91=8A=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 7e26294..1a71003 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -130,7 +130,8 @@
- 
{{ data.notice || "暂无公告" }}
+ +
{{ data.notice || "暂无公告" }}
 +
+
课程列表
+
/
+
课程报名
+ + +
+
+ 返回 + +
+
+
+ + + +
+
+ +
+
【面授课】{{ data.planDto?.name }}
+
+ +
+ {{ + dayjs(data.planDto?.beginTime).format('YYYY-MM-DD HH:MM') + " 至 " + + dayjs(data.planDto?.endTime).format('YYYY-MM-DD HH:MM') + }} +
+
+
+ +
{{ data.planDto?.address }}
+
+
+ 当前任务暂未开放，请联系管理员 +
+
+
+
+
+
+ + + +
+
+
+ + +
+ {{ data.offcourseDto?.intro || "暂无课程介绍" }} +
+ + +
+
+
+ + + +
+ 此课程无附件 +
+
+
+
+ +
{{ el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.')) }}
+
+ + + + + + + +
+
+ + +
+
+
+
+ +
面授课讲师
+
+
+ +
+ +
+
+ {{ data.planDto?.teacher }} +
+
{{ data.planDto?.bandDesc }}
+
+ +
+
+
+ +
+ + + + + + From 67e7d3e8be51d95ae4504a70012af244b81f4f73 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 18 Jan 2023 01:56:09 +0800 Subject: [PATCH 39/42] =?UTF-8?q?--=20fix=20=E9=9D=A2=E6=8E=88=E6=97=A0?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeachNoCourse.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/faceteach/FaceTeachNoCourse.vue b/src/views/faceteach/FaceTeachNoCourse.vue index b1a2beb..cf8f46c 100644 --- a/src/views/faceteach/FaceTeachNoCourse.vue +++ b/src/views/faceteach/FaceTeachNoCourse.vue @@ -39,7 +39,7 @@
{{ data.planDto?.address }}
- 当前任务暂未开放，请联系管理员 + 当前任务暂未开放，请联系管理员
From fe76bccf0e3ca6459a20800ad31cd9f0533ef3d7 Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 18 Jan 2023 08:51:52 +0800 Subject: [PATCH 40/42] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 09086cc..248e431 100644 --- a/src/App.vue +++ b/src/App.vue @@ -37,7 +37,7 @@ import { onMounted } from "vue"; import {useRoute} from "vue-router/dist/vue-router"; import {USER_INFO} from "@/api/api"; -console.log("版本2.1.3------------"); +console.log("版本2.1.4------------"); const store = useStore(); const {path} = useRoute(); onMounted(() => { From 4e24202bb28f0fd78a91eb328d23bab3969a1670 Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 18 Jan 2023 16:39:22 +0800 Subject: [PATCH 41/42] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 248e431..4003506 100644 --- a/src/App.vue +++ b/src/App.vue @@ -37,7 +37,7 @@ import { onMounted } from "vue"; import {useRoute} from "vue-router/dist/vue-router"; import {USER_INFO} from "@/api/api"; -console.log("版本2.1.4------------"); +console.log("版本2.1.5------------"); const store = useStore(); const {path} = useRoute(); onMounted(() => { From f9e488145034cf7c38c1799d29e4b5510dc7f0c9 Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 18 Jan 2023 18:21:40 +0800 Subject: [PATCH 42/42] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 4003506..198d299 100644 --- a/src/App.vue +++ b/src/App.vue @@ -37,7 +37,7 @@ import { onMounted } from "vue"; import {useRoute} from "vue-router/dist/vue-router"; import {USER_INFO} from "@/api/api"; -console.log("版本2.1.5------------"); +console.log("版本1.2.0------------"); const store = useStore(); const {path} = useRoute(); onMounted(() => {