From 93bce4b298da1f8d86acb3256dbafd1f2e472f0a Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 19:12:31 +0800 Subject: [PATCH 001/100] init --- src/views/roadmap/PathDetails.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index f7274e8..183fa37 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -572,6 +572,10 @@ function toFinish(d) { ElMessage.error('暂时未开放') return } + if (d.type === 1) { + //配置文件 + window.parent.location.href = `https://u-pre.boe.com/pc/course/studyindex?id=${d.targetId}` + } router.push({path: types.value.path[d.type], query: {id: d.routerTaskId, type: 1, courseId: d.courseId}}) } From ac263c77e2467722cc03f39c213c910021ac3566 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 19:12:57 +0800 Subject: [PATCH 002/100] init --- src/views/roadmap/PathDetails.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 183fa37..02fa39f 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -575,6 +575,7 @@ function toFinish(d) { if (d.type === 1) { //配置文件 window.parent.location.href = `https://u-pre.boe.com/pc/course/studyindex?id=${d.targetId}` + return; } router.push({path: types.value.path[d.type], query: {id: d.routerTaskId, type: 1, courseId: d.courseId}}) } From ffafa08e32a825e77adeb32c419ed416013e72bc Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 19:17:46 +0800 Subject: [PATCH 003/100] init --- .env | 1 + .env.boe | 1 + .env.prod | 1 + .gitignore | 2 +- src/views/roadmap/PathDetails.vue | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .env create mode 100644 .env.boe create mode 100644 .env.prod diff --git a/.env b/.env new file mode 100644 index 0000000..8480f87 --- /dev/null +++ b/.env @@ -0,0 +1 @@ +VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= \ No newline at end of file diff --git a/.env.boe b/.env.boe new file mode 100644 index 0000000..8480f87 --- /dev/null +++ b/.env.boe @@ -0,0 +1 @@ +VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= \ No newline at end of file diff --git a/.env.prod b/.env.prod new file mode 100644 index 0000000..a569f60 --- /dev/null +++ b/.env.prod @@ -0,0 +1 @@ +VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc/course/studyindex?id= \ No newline at end of file diff --git a/.gitignore b/.gitignore index 102b516..48c6b17 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ node_modules # local env files -.env.local +.env.test .env.*.local # Log files diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 02fa39f..8fbd9ce 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -574,7 +574,7 @@ function toFinish(d) { } if (d.type === 1) { //配置文件 - window.parent.location.href = `https://u-pre.boe.com/pc/course/studyindex?id=${d.targetId}` + window.parent.location.href = import.meta.env.VITE_BOE_ONLINE_CLASS_URL return; } router.push({path: types.value.path[d.type], query: {id: d.routerTaskId, type: 1, courseId: d.courseId}}) From 60d6ffd55da6e7044d496b20a8c330b86db796f3 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 19:31:46 +0800 Subject: [PATCH 004/100] init --- .env | 6 +++++- .env.boe | 5 ++++- .env.prod | 5 ++++- package.json | 2 +- src/api/api.js | 2 -- src/api/request.js | 2 +- src/views/roadmap/LearnPath.vue | 1 - src/views/roadmap/PathDetails.vue | 2 +- 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 8480f87..5b00c2e 100644 --- a/.env +++ b/.env @@ -1 +1,5 @@ -VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= \ No newline at end of file +VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= +VITE_BASE=/fe-student +VITE_BASE_API= +VITE_PROXY_URL=123 + diff --git a/.env.boe b/.env.boe index 8480f87..621f91b 100644 --- a/.env.boe +++ b/.env.boe @@ -1 +1,4 @@ -VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= \ No newline at end of file +VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= +VITE_BASE=/fe-student +VITE_BASE_API=/manageApi +VITE_PROXY_URL= \ No newline at end of file diff --git a/.env.prod b/.env.prod index a569f60..4ec2b73 100644 --- a/.env.prod +++ b/.env.prod @@ -1 +1,4 @@ -VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc/course/studyindex?id= \ No newline at end of file +VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc/course/studyindex?id= +VITE_BASE=/fe-student +VITE_BASE_API=/manageApi +VITE_PROXY_URL= \ No newline at end of file diff --git a/package.json b/package.json index c29cd5f..630e404 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "vite", "server": "vite build && vite preview", - "build": "vite build" + "build": "vite build --mode prod" }, "dependencies": { "axios": "^1.1.3", diff --git a/src/api/api.js b/src/api/api.js index 3210c64..0be5890 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -6,8 +6,6 @@ * @FilePath: /fe-stu/src/api/api.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ -export const BASE = import.meta.env.DEV ? '' : '/manageApi' -export const BASE_URL = import.meta.env.DEV ? '' : 'https://u-pre.boe.com/fe-student' export const LOGIN = '/admin/CheckUser/userLogin post' // export const FILE_UPLOAD = 'http://111.231.196.214:30001/file/upload' export const FILE_UPLOAD = '/file/upload' diff --git a/src/api/request.js b/src/api/request.js index f6ab42e..fff20e0 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -89,7 +89,7 @@ export async function request(_url, params) { 'X-Token': localStorage.getItem('token'), ...method !== 'get' ? {'Content-Type': 'application/json'} : {} }, - baseURL: BASE, + baseURL: import.meta.env.VITE_BASE_API, ...method !== 'get' ? {data: JSON.stringify(body)} : {} }).then(resp => resp.data).then(response => { if (response.code !== 200 && response.code !== 0) { diff --git a/src/views/roadmap/LearnPath.vue b/src/views/roadmap/LearnPath.vue index a6df89c..cc9db99 100644 --- a/src/views/roadmap/LearnPath.vue +++ b/src/views/roadmap/LearnPath.vue @@ -146,7 +146,6 @@ import completed from "../../assets/image/completed.png"; import ongoing from "../../assets/image/ongoing.png"; import {boeRequest, request, usePage, useRequest} from "@/api/request"; import { - BASE_URL, ROUTER_CHAPTER_LIST, ROUTER_LIST, ROUTER_UNCOMPLETE_LIST, diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 8fbd9ce..ece92ae 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -317,7 +317,7 @@ import medal2 from '@/assets/image/medal/medal2.png' import medal3 from '@/assets/image/medal/medal3.png' import img from '@/assets/image/uploadimg.png' import {boeRequest, useRequest} from "@/api/request"; -import {BASE_URL, ROUTER_PROCESS} from "@/api/api"; +import {ROUTER_PROCESS} from "@/api/api"; import {useRoute, useRouter} from "vue-router"; import {ElMessage} from 'element-plus' import {useUserInfo} from "@/api/utils"; From 36c134af47c1f8b1751c9f76ea84f5c0253d3471 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 19:35:40 +0800 Subject: [PATCH 005/100] init --- package.json | 2 +- src/api/request.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 630e404..6f1ccff 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "scripts": { - "dev": "vite", + "dev": "vite --mode test", "server": "vite build && vite preview", "build": "vite build --mode prod" }, diff --git a/src/api/request.js b/src/api/request.js index fff20e0..5528111 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -2,7 +2,6 @@ import router from "@/router"; import {reactive, ref, toRefs, watch} from "vue"; import axios from 'axios'; import {getCookie} from "@/api/utils"; -import {BASE} from "@/api/api"; export function usePage(_url, param) { From fa1848f90bb9efd874edaf26a530adbd7a3c2429 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 19:43:09 +0800 Subject: [PATCH 006/100] init --- .env | 10 ++++++++-- .env.prod | 8 ++++++-- .env.release | 8 ++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 .env.release diff --git a/.env b/.env index 5b00c2e..5121d38 100644 --- a/.env +++ b/.env @@ -1,5 +1,11 @@ -VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= VITE_BASE=/fe-student VITE_BASE_API= -VITE_PROXY_URL=123 +VITE_PROXY_URL= +VITE_BOE_API=https://u-pre.boe.com + +VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= +VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id= +VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId= + + diff --git a/.env.prod b/.env.prod index 4ec2b73..1cbab01 100644 --- a/.env.prod +++ b/.env.prod @@ -1,4 +1,8 @@ -VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc/course/studyindex?id= VITE_BASE=/fe-student VITE_BASE_API=/manageApi -VITE_PROXY_URL= \ No newline at end of file +VITE_PROXY_URL= + + +VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id= +VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id= +VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId= \ No newline at end of file diff --git a/.env.release b/.env.release new file mode 100644 index 0000000..a550afe --- /dev/null +++ b/.env.release @@ -0,0 +1,8 @@ +VITE_BASE=/fe-student +VITE_BASE_API=/manageApi +VITE_PROXY_URL= + + +VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id= +VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id= +VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId= \ No newline at end of file From ac233fe98d848981fb2bae17ae9d740b50554947 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 19:43:30 +0800 Subject: [PATCH 007/100] init --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f1ccff..6c190e3 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "vite --mode test", "server": "vite build && vite preview", - "build": "vite build --mode prod" + "build": "vite build --mode release" }, "dependencies": { "axios": "^1.1.3", From 7843084fa676d6dd4d43fa171c21bd6a42a1e676 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 19:48:24 +0800 Subject: [PATCH 008/100] init --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6c190e3..7b097c7 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "scripts": { - "dev": "vite --mode test", + "dev": "vite", "server": "vite build && vite preview", "build": "vite build --mode release" }, From 2a99b50819f8159e0b76bca7b81d17031d135ce5 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 19:48:58 +0800 Subject: [PATCH 009/100] init --- .env | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.env b/.env index 5121d38..6a4dca2 100644 --- a/.env +++ b/.env @@ -1,11 +1,7 @@ VITE_BASE=/fe-student -VITE_BASE_API= -VITE_PROXY_URL= -VITE_BOE_API=https://u-pre.boe.com +VITE_BASE_API=/ + VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id= -VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId= - - - +VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId= \ No newline at end of file From 379cac7f10d87dea7a73e4d9ab960a7653e39d30 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 19:53:11 +0800 Subject: [PATCH 010/100] init --- src/views/roadmap/PathDetails.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index ece92ae..f24d83c 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -551,11 +551,11 @@ const types = ref({ 13: '去完成', }, path: { - 1: '', + 1: import.meta.env.VITE_BOE_ONLINE_CLASS_URL, 2: '/faceteach', - 3: '', + 3: import.meta.env.VITE_BOE_CASS_DETAIL_URL, 4: '/homeworkpage', - 5: '', + 5: import.meta.env.VITE_BOE_TEST_DETAIL_URL, 6: '/livebroadcast', 7: '', 8: '/discusspage', @@ -572,9 +572,9 @@ function toFinish(d) { ElMessage.error('暂时未开放') return } - if (d.type === 1) { + if (types.value.path[d.type] && types.value.path[d.type].startWith('http')) { //配置文件 - window.parent.location.href = import.meta.env.VITE_BOE_ONLINE_CLASS_URL + window.parent.location.href = types.value.path[d.type] return; } router.push({path: types.value.path[d.type], query: {id: d.routerTaskId, type: 1, courseId: d.courseId}}) From 2834fda007994829878d9e220d7997a2e39a8701 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 19:54:26 +0800 Subject: [PATCH 011/100] init --- src/views/roadmap/PathDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index f24d83c..d5bf58e 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -574,7 +574,7 @@ function toFinish(d) { } if (types.value.path[d.type] && types.value.path[d.type].startWith('http')) { //配置文件 - window.parent.location.href = types.value.path[d.type] + import.meta.env.DEV ? window.location.href : window.parent.location.href = types.value.path[d.type] return; } router.push({path: types.value.path[d.type], query: {id: d.routerTaskId, type: 1, courseId: d.courseId}}) From 159146f66ba13b2140a706112cd2343a632782f2 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 20:06:50 +0800 Subject: [PATCH 012/100] init --- .env.release | 5 ++--- src/views/roadmap/PathDetails.vue | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env.release b/.env.release index a550afe..17f063f 100644 --- a/.env.release +++ b/.env.release @@ -1,6 +1,5 @@ -VITE_BASE=/fe-student -VITE_BASE_API=/manageApi -VITE_PROXY_URL= +VITE_BASE=/fe-student-release +VITE_BASE_API=/manageApi-release VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id= diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index d5bf58e..d059a94 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -572,9 +572,10 @@ function toFinish(d) { ElMessage.error('暂时未开放') return } - if (types.value.path[d.type] && types.value.path[d.type].startWith('http')) { + if (types.value.path[d.type] && types.value.path[d.type].startsWith('http')) { //配置文件 - import.meta.env.DEV ? window.location.href : window.parent.location.href = types.value.path[d.type] + const url = types.value.path[d.type] + (d.type === 1 ? d.targetId : d.courseId) + import.meta.env.DEV ? (window.location.href = url) : (window.parent.location.href = url) return; } router.push({path: types.value.path[d.type], query: {id: d.routerTaskId, type: 1, courseId: d.courseId}}) From f14deb5d502846dfe651f9503c04ff206bc29af1 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 20:11:54 +0800 Subject: [PATCH 013/100] init --- .env.boe | 6 ++++-- package.json | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.env.boe b/.env.boe index 621f91b..9c58f21 100644 --- a/.env.boe +++ b/.env.boe @@ -1,4 +1,6 @@ -VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= VITE_BASE=/fe-student VITE_BASE_API=/manageApi -VITE_PROXY_URL= \ No newline at end of file + +VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= +VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id= +VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId= diff --git a/package.json b/package.json index 7b097c7..74b8dd9 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "scripts": { "dev": "vite", - "server": "vite build && vite preview", + "server": "vite build --mode boe && vite preview ", "build": "vite build --mode release" }, "dependencies": { From bda248a386207a9e0ac38ea2c75078c32d74a14f Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 20:22:44 +0800 Subject: [PATCH 014/100] init --- .env.prod | 10 ++++------ .env.release | 1 - vite.config.js | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.env.prod b/.env.prod index 1cbab01..fc74ee5 100644 --- a/.env.prod +++ b/.env.prod @@ -1,8 +1,6 @@ -VITE_BASE=/fe-student -VITE_BASE_API=/manageApi -VITE_PROXY_URL= - +VITE_BASE=/fe-student-release +VITE_BASE_API=/manageApi-release VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id= -VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id= -VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId= \ No newline at end of file +VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id= +VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId= \ No newline at end of file diff --git a/.env.release b/.env.release index 17f063f..fc74ee5 100644 --- a/.env.release +++ b/.env.release @@ -1,7 +1,6 @@ VITE_BASE=/fe-student-release VITE_BASE_API=/manageApi-release - VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id= VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id= VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId= \ No newline at end of file diff --git a/vite.config.js b/vite.config.js index dc900f0..d458419 100644 --- a/vite.config.js +++ b/vite.config.js @@ -13,8 +13,8 @@ import { viteMockServe } from 'vite-plugin-mock' import topLevelAwait from "vite-plugin-top-level-await"; const path = require('path') -// const url = 'http://localhost:30001' -const url = 'http://111.231.196.214:12013/manageApi' +const url = 'http://localhost:30001' +// const url = 'http://111.231.196.214:12013/manageApi' export default defineConfig(({ command }) => ({ base: '/fe-student', From 8da17de11a2182fdf1c79ef9dee18a1d6fc78866 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 20:24:08 +0800 Subject: [PATCH 015/100] init --- .env | 4 +++- .env.boe | 2 ++ .env.prod | 4 +++- .env.release | 4 +++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 6a4dca2..326836e 100644 --- a/.env +++ b/.env @@ -4,4 +4,6 @@ VITE_BASE_API=/ VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id= -VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId= \ No newline at end of file +VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId= + +VITE_BOE_API_URL=https://u-pre.boe.com \ No newline at end of file diff --git a/.env.boe b/.env.boe index 9c58f21..2065680 100644 --- a/.env.boe +++ b/.env.boe @@ -4,3 +4,5 @@ VITE_BASE_API=/manageApi VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id= VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId= + +VITE_BOE_API_URL=https://u-pre.boe.com \ No newline at end of file diff --git a/.env.prod b/.env.prod index fc74ee5..6671831 100644 --- a/.env.prod +++ b/.env.prod @@ -3,4 +3,6 @@ VITE_BASE_API=/manageApi-release VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id= VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id= -VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId= \ No newline at end of file +VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId= + +VITE_BOE_API_URL=https://u.boe.com \ No newline at end of file diff --git a/.env.release b/.env.release index fc74ee5..6671831 100644 --- a/.env.release +++ b/.env.release @@ -3,4 +3,6 @@ VITE_BASE_API=/manageApi-release VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id= VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id= -VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId= \ No newline at end of file +VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId= + +VITE_BOE_API_URL=https://u.boe.com \ No newline at end of file From 41be0f952a59e6550976b855e3e22741d124c534 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 20:40:47 +0800 Subject: [PATCH 016/100] init --- .env | 1 + .env.release | 1 + 2 files changed, 2 insertions(+) diff --git a/.env b/.env index 326836e..5fa1525 100644 --- a/.env +++ b/.env @@ -1,5 +1,6 @@ VITE_BASE=/fe-student VITE_BASE_API=/ +VITE_BASE_LOGIN_URL=https://u-pre.boe.com/web/ VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= diff --git a/.env.release b/.env.release index 6671831..dd1bc2d 100644 --- a/.env.release +++ b/.env.release @@ -1,5 +1,6 @@ VITE_BASE=/fe-student-release VITE_BASE_API=/manageApi-release +VITE_BASE_LOGIN_URL=https://u.boe.com/web/ VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id= VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id= From e49155be1a4208b087a5a8da2a6c9e34fe37a629 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 20:58:39 +0800 Subject: [PATCH 017/100] init --- package.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 74b8dd9..618a527 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,11 @@ "scripts": { "dev": "vite", "server": "vite build --mode boe && vite preview ", - "build": "vite build --mode release" + "build": "vite build --mode release", + "build:boe": "vite build --mode boe", + "build:prod": "vite build --mode prod", + "build:release": "vite build --mode release", + "build:test": "vite build --mode test" }, "dependencies": { "axios": "^1.1.3", From 8d130384903588cea07f12977ece674b03259945 Mon Sep 17 00:00:00 2001 From: lixg Date: Wed, 14 Dec 2022 22:07:26 +0800 Subject: [PATCH 018/100] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/roadmap/PathDetails.vue | 398 ++++++++++++++++-------------- 1 file changed, 213 insertions(+), 185 deletions(-) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index f7274e8..ec85ac8 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -14,36 +14,44 @@
{{ i.chapterName }}
-
- +
+
进行中
- +
未开始
{{ value.name }}
-
必修
-
选修
-
{{ - types.typeName[value.type] || '' - }} +
+ 必修 +
+
+ 选修 +
+
+ {{ types.typeName[value.type] || "" }}
@@ -56,45 +64,44 @@
当前进度
{{ value.currentRatio }}% @@ -102,11 +109,14 @@
-
- {{ - types.path[value.type] ? types.toName[value.type] : '未开放' - }} +
+ {{ types.path[value.type] ? types.toName[value.type] : "未开放" }}
@@ -135,29 +145,29 @@
请各位选课的同学提前阅读本课程的 “教学大纲与计划”“课程考核要求”与“学习要求” - ，并按给定的中学化学教学主题分好小组
- 每位同学在网上学习的活动轨迹都会自动被系统记录将作为大家个人线上参与的评价依据；
+ ，并按给定的中学化学教学主题分好小组
+ 每位同学在网上学习的活动轨迹都会自动被系统记录将作为大家个人线上参与的评价依据；
请大家务必在规定的时间内提交作业，否则会被系统自动记录为“迟交”或“未交”则会影响线上参与的平时成 - 绩；
+ 绩；
- +
{{ value.name }}
下载
@@ -172,23 +182,25 @@
个人信息
- +
-
{{ data.userInfoBo?.userName }}
+
+ {{ data.userInfoBo?.userName }} +
- +
{{ data.userInfoBo?.introduce }}
@@ -198,8 +210,8 @@
学习进度
@@ -214,39 +226,49 @@
- {{ parseInt(data.currentChapterCnt / data.totalChapterCnt * 100) }}% + {{ + parseInt( + (data.currentChapterCnt / data.totalChapterCnt) * 100 + ) + }}%
@@ -257,41 +279,44 @@
- {{ parseInt(data.currentReqCnt / data.totalReqCnt * 100) }}% + {{ + parseInt((data.currentReqCnt / data.totalReqCnt) * 100) + }}%
@@ -306,26 +331,30 @@ From 0ff2368ac56416522d3ab23e4db756ba7fd00a75 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 15 Dec 2022 00:30:21 +0800 Subject: [PATCH 019/100] init --- .env | 1 + vite.config.js | 40 ++++++++++++++++++---------------------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/.env b/.env index 5fa1525..4548d94 100644 --- a/.env +++ b/.env @@ -1,6 +1,7 @@ VITE_BASE=/fe-student VITE_BASE_API=/ VITE_BASE_LOGIN_URL=https://u-pre.boe.com/web/ +VITE_PROXY_URL=http://111.231.196.214:30001 VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= diff --git a/vite.config.js b/vite.config.js index d458419..bae4160 100644 --- a/vite.config.js +++ b/vite.config.js @@ -6,18 +6,14 @@ * @FilePath: /fe-stu/vite.config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ -import { defineConfig } from 'vite' +import {defineConfig, loadEnv} from 'vite' import vue from '@vitejs/plugin-vue' -import legacy from '@vitejs/plugin-legacy' -import { viteMockServe } from 'vite-plugin-mock' import topLevelAwait from "vite-plugin-top-level-await"; - const path = require('path') -const url = 'http://localhost:30001' -// const url = 'http://111.231.196.214:12013/manageApi' -export default defineConfig(({ command }) => + +export default defineConfig(({ command,mode }) => ({ - base: '/fe-student', + base: loadEnv(mode, process.cwd()).VITE_BASE, plugins: [ vue(), // legacy({ @@ -39,54 +35,54 @@ export default defineConfig(({ command }) => server: { proxy: { '/file/upload': { - target: 'http://111.231.196.214:30001', + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, }, '/stu': { - target: url, + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, }, '/queryVoteSubmitDetailById': { - target: url, + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, }, '/work': { - target: url, + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, }, '/discuss': { - target: url, + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, }, '/discussSubmit': { - target: url, + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, }, '/comment': { - target: url, + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, }, '/vote': { - target: url, + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, }, '/admin': { - target: url, + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, }, '/activity': { - target: url, + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, }, '/liveBroadcast': { - target: url, + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, }, '/examination': { - target: url, + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, }, '/assessment': { - target: url, + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, }, '/workSubmit': { - target: url, + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, }, '/userbasic': { target: 'https://u-pre.boe.com', From 7091f153c8ca8693a60861f3a62f3730ee625d5f Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 15 Dec 2022 02:49:47 +0800 Subject: [PATCH 020/100] init --- src/api/api.js | 6 +- src/views/liveBroadcast/LiveBroadcast.vue | 111 +++++++++++---------- src/views/survey/SurveyDetail.vue | 115 +++++++++++----------- 3 files changed, 118 insertions(+), 114 deletions(-) diff --git a/src/api/api.js b/src/api/api.js index 0be5890..a060ef9 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -19,7 +19,7 @@ export const TAS_ACTIVITY_DETAIL = '/activity' export const TASK_ACTIVITY_SIGN = '/activitySubmit/updateActivitySignInStatus post' export const TASK_BROADCAST_COMMIT = '/stu/task/broadcast/commit' export const TASK_BROADCAST_DETAIL = '/liveBroadcast' -export const TASK_BROADCAST_SIGN = '/stu/task/broadcast/sign' +export const TASK_BROADCAST_SIGN = '/stu/task/broadcast/sign post' export const TASK_VOTE_COMMIT = '/stu/task/vote/commit' export const TASK_VOTE_DETAIL = '/stu/task/vote/detail' export const TASK_WORK_COMMIT = '/workSubmit/submitStudentWorkDetail post' @@ -47,7 +47,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 => `/assessment/queryAssessmentDetailById?assessmentId=${assessmentId} post` -export const ASSESSMENT_SUBMIT = '/assessmentSubmit/submitAssessmentDetail' +export const ASSESSMENT_QUERY = assessmentId => `/stu/task/evaluate/get` +export const ASSESSMENT_SUBMIT = '/stu/task/evaluate/commit post' export const ACTIVITY = '/activity' \ No newline at end of file diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index 56cb837..413b8ae 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -23,15 +23,15 @@
【直播】{{ data?.liveName }}
{{ data?.liveStartTime }}
大族广场
@@ -39,20 +39,19 @@
观看 + class="btn" + style="background: rgb(59, 191, 252)" + @click="showClick" + >观看 签到 + class="btn" + :style="{background:`${data.signFlag?'#999':'rgb(57, 146, 249)'}`}" + @click="signClick" + >{{ data.signFlag ? '已签到' : '签到' }} - 评估 + {{ data.isSurvery ? '已评估' : '评估' }}
@@ -65,8 +64,8 @@
课前预习
@@ -74,21 +73,21 @@
- 通过对各级人员的软件平台培训，使其能够了解如何运用乾元坤和智能信息管理系统来提升企业管理水平，最大限度发挥软件产品在企业中的作用;
+ 通过对各级人员的软件平台培训，使其能够了解如何运用乾元坤和智能信息管理系统来提升企业管理水平，最大限度发挥软件产品在企业中的作用;
● 培训目标 -
1.使企业不同部门人员掌握便捷、有效的系统平台操作方法;
- 2.通过系统平台的培训提高员工对企业的管理理念认识与提升。
+
1.使企业不同部门人员掌握便捷、有效的系统平台操作方法;
+ 2.通过系统平台的培训提高员工对企业的管理理念认识与提升。
3.通过系统平台培训加强沟通，统一部署，协同工作，提高效率。 -
- ●培训对象
- 集团领导、各相关部门领导、总经理、车间主管、车间操作员等;
+
+ ●培训对象
+ 集团领导、各相关部门领导、总经理、车间主管、车间操作员等;
课后作业
@@ -97,9 +96,9 @@
网易有道词典现有功能结构拆解+问题分析
- 查找资料，介绍一种国外（日本、美国、欧洲）道路（公路、铁路、城市道路、地铁）设计规范的演变过程，可以一种或几种主要技术指标为例，并说明其原因。
+ >网易有道词典现有功能结构拆解+问题分析
+ 查找资料，介绍一种国外（日本、美国、欧洲）道路（公路、铁路、城市道路、地铁）设计规范的演变过程，可以一种或几种主要技术指标为例，并说明其原因。
@@ -109,8 +108,8 @@
直播公告
@@ -120,18 +119,18 @@
直播讲师
- +
{{ data.userInfoBo?.userName }} @@ -148,23 +147,24 @@ diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 7fb08dc..4197b29 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -116,7 +116,7 @@ :style="{ background: `${types.path[value.type] ? '#2478ff' : '#999'}`, }" - @click="toFinish(value, i.chapterName)" + @click="toFinish(value, i.chapterName, i.chapterId)" > {{ value.status === 1 @@ -329,7 +329,7 @@ import medal2 from "@/assets/image/medal/medal2.png"; import medal3 from "@/assets/image/medal/medal3.png"; import img from "@/assets/image/uploadimg.png"; import { boeRequest, useRequest, request } from "@/api/request"; -import { ROUTER_PROCESS, LINK_DETAILS } from "@/api/api"; +import { ROUTER_PROCESS, LINK_DETAILS, STUDY_RECORD } from "@/api/api"; import { useRoute, useRouter } from "vue-router"; import { ElMessage } from "element-plus"; import { useUserInfo } from "@/api/utils"; @@ -345,7 +345,7 @@ const returnclick = () => { const { data } = useRequest(ROUTER_PROCESS, { routerId }); console.log("data", data); const userInfo = computed(() => store.state.userInfo); - +console.log("userInfo", userInfo); const activeName = ref("first"); const handleClick = (tab, event) => { @@ -409,14 +409,23 @@ const types = ref({ }, }); -function toFinish(d, sName) { +function toFinish(d, sName, chapterId) { if (!types.value.path[d.type]) { ElMessage.error("暂时未开放"); return; } - + if (d.type == 3 || d.type == 7) { + request(STUDY_RECORD, { + studentId: data.value.userInfoBo.userId, + targetId: data.value.routerId, + logo: 1, + stageOrChapterId: chapterId, + taskId: d.routerTaskId, + }); + } if (typeof types.value.path[d.type] === "string") { - // console.log("dddddd", d); + console.log("dddddd", d); + types.value.path[d.type] && types.value.path[d.type].startsWith("http") && window.open(types.value.path[d.type] + d.targetId); From b9900c895a00f7c3f7cce17e173603b4839661af Mon Sep 17 00:00:00 2001 From: zhangyc Date: Sun, 18 Dec 2022 22:37:03 +0800 Subject: [PATCH 073/100] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 292 +++++++++++++++++++++++++++- package.json | 1 + src/views/homework/HomeworkPage.vue | 72 ++++++- src/views/survey/SurveyDetail.vue | 86 ++++++-- 4 files changed, 416 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index d25e6bd..49a0f93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "jdfstudy", "version": "0.1.0", "dependencies": { + "ant-design-vue": "^3.2.15", "axios": "^1.1.3", "core-js": "^3.26.0", "dayjs": "^1.11.6", @@ -66,6 +67,31 @@ "node": ">=6.0.0" } }, + "node_modules/@ant-design/colors": { + "version": "6.0.0", + "resolved": "https://registry.npmmirror.com/@ant-design/colors/-/colors-6.0.0.tgz", + "integrity": "sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ==", + "dependencies": { + "@ctrl/tinycolor": "^3.4.0" + } + }, + "node_modules/@ant-design/icons-svg": { + "version": "4.2.1", + "resolved": "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz", + "integrity": "sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw==" + }, + "node_modules/@ant-design/icons-vue": { + "version": "6.1.0", + "resolved": "https://registry.npmmirror.com/@ant-design/icons-vue/-/icons-vue-6.1.0.tgz", + "integrity": "sha512-EX6bYm56V+ZrKN7+3MT/ubDkvJ5rK/O2t380WFRflDcVFgsvl3NLH7Wxeau6R8DbrO5jWR6DSTC3B6gYFp77AA==", + "dependencies": { + "@ant-design/colors": "^6.0.0", + "@ant-design/icons-svg": "^4.2.1" + }, + "peerDependencies": { + "vue": ">=3.0.3" + } + }, "node_modules/@babel/code-frame": { "version": "7.18.6", "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.18.6.tgz", @@ -1677,7 +1703,6 @@ "version": "7.19.0", "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.19.0.tgz", "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==", - "dev": true, "dependencies": { "regenerator-runtime": "^0.13.4" }, @@ -2125,6 +2150,15 @@ "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==", "dev": true }, + "node_modules/@simonwep/pickr": { + "version": "1.8.2", + "resolved": "https://registry.npmmirror.com/@simonwep/pickr/-/pickr-1.8.2.tgz", + "integrity": "sha512-/l5w8BIkrpP6n1xsetx9MWPWlU6OblN5YgZZphxan0Tq4BByTCETL6lyIeY8lagalS2Nbt4F2W034KHLIiunKA==", + "dependencies": { + "core-js": "^3.15.1", + "nanopop": "^2.1.0" + } + }, "node_modules/@soda/friendly-errors-webpack-plugin": { "version": "1.8.1", "resolved": "https://registry.npmmirror.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz", @@ -3753,6 +3787,36 @@ "node": ">=4" } }, + "node_modules/ant-design-vue": { + "version": "3.2.15", + "resolved": "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-3.2.15.tgz", + "integrity": "sha512-sJfE7LWimSdAPe4dzNyQBrmVMnOTNQTkG9oOyr+7W8qIYrX8sYWyC68Nn1uum4KBJUSZUa/BU6dohvTG0urBhA==", + "dependencies": { + "@ant-design/colors": "^6.0.0", + "@ant-design/icons-vue": "^6.1.0", + "@babel/runtime": "^7.10.5", + "@ctrl/tinycolor": "^3.4.0", + "@simonwep/pickr": "~1.8.0", + "array-tree-filter": "^2.1.0", + "async-validator": "^4.0.0", + "dayjs": "^1.10.5", + "dom-align": "^1.12.1", + "dom-scroll-into-view": "^2.0.0", + "lodash": "^4.17.21", + "lodash-es": "^4.17.15", + "resize-observer-polyfill": "^1.5.1", + "scroll-into-view-if-needed": "^2.2.25", + "shallow-equal": "^1.0.0", + "vue-types": "^3.0.0", + "warning": "^4.0.0" + }, + "engines": { + "node": ">=12.22.0" + }, + "peerDependencies": { + "vue": ">=3.2.0" + } + }, "node_modules/any-promise": { "version": "1.3.0", "resolved": "https://registry.npmmirror.com/any-promise/-/any-promise-1.3.0.tgz", @@ -3790,6 +3854,11 @@ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, + "node_modules/array-tree-filter": { + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/array-tree-filter/-/array-tree-filter-2.1.0.tgz", + "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw==" + }, "node_modules/array-union": { "version": "2.1.0", "resolved": "https://registry.npmmirror.com/array-union/-/array-union-2.1.0.tgz", @@ -4556,6 +4625,11 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, + "node_modules/compute-scroll-into-view": { + "version": "1.0.20", + "resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz", + "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==" + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz", @@ -5363,6 +5437,11 @@ "node": ">=6.0.0" } }, + "node_modules/dom-align": { + "version": "1.12.4", + "resolved": "https://registry.npmmirror.com/dom-align/-/dom-align-1.12.4.tgz", + "integrity": "sha512-R8LUSEay/68zE5c8/3BDxiTEvgb4xZTF0RKmAHfiEVN3klfIpXfi2/QCoiWPccVQ0J/ZGdz9OjzL4uJEP/MRAw==" + }, "node_modules/dom-converter": { "version": "0.2.0", "resolved": "https://registry.npmmirror.com/dom-converter/-/dom-converter-0.2.0.tgz", @@ -5372,6 +5451,11 @@ "utila": "~0.4" } }, + "node_modules/dom-scroll-into-view": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/dom-scroll-into-view/-/dom-scroll-into-view-2.0.1.tgz", + "integrity": "sha512-bvVTQe1lfaUr1oFzZX80ce9KLDlZ3iU+XGNE/bz9HnGdklTieqsbmsLHe+rT2XWqopvL0PckkYqN7ksmm5pe3w==" + }, "node_modules/dom-serializer": { "version": "1.4.1", "resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-1.4.1.tgz", @@ -7655,8 +7739,7 @@ "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "node_modules/js-yaml": { "version": "4.1.0", @@ -8097,6 +8180,17 @@ "node": ">=4" } }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmmirror.com/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, "node_modules/lower-case": { "version": "2.0.2", "resolved": "https://registry.npmmirror.com/lower-case/-/lower-case-2.0.2.tgz", @@ -8420,6 +8514,11 @@ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, + "node_modules/nanopop": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/nanopop/-/nanopop-2.2.0.tgz", + "integrity": "sha512-E9JaHcxh3ere8/BEZHAcnuD10RluTSPyTToBvoFWS9/7DcCx6gyKjbn7M7Bx7E1veCxCuY1iO6h4+gdAf1j73Q==" + }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz", @@ -9803,8 +9902,7 @@ "node_modules/regenerator-runtime": { "version": "0.13.11", "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", - "dev": true + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, "node_modules/regenerator-transform": { "version": "0.15.0", @@ -9914,6 +10012,11 @@ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", "dev": true }, + "node_modules/resize-observer-polyfill": { + "version": "1.5.1", + "resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", + "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" + }, "node_modules/resolve": { "version": "1.22.1", "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.1.tgz", @@ -10109,6 +10212,14 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, + "node_modules/scroll-into-view-if-needed": { + "version": "2.2.31", + "resolved": "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz", + "integrity": "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==", + "dependencies": { + "compute-scroll-into-view": "^1.0.20" + } + }, "node_modules/select-hose": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz", @@ -10312,6 +10423,11 @@ "node": ">=8" } }, + "node_modules/shallow-equal": { + "version": "1.2.1", + "resolved": "https://registry.npmmirror.com/shallow-equal/-/shallow-equal-1.2.1.tgz", + "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA==" + }, "node_modules/shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-1.2.0.tgz", @@ -11637,6 +11753,28 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "node_modules/vue-types": { + "version": "3.0.2", + "resolved": "https://registry.npmmirror.com/vue-types/-/vue-types-3.0.2.tgz", + "integrity": "sha512-IwUC0Aq2zwaXqy74h4WCvFCUtoV0iSWr0snWnE9TnU18S66GAQyqQbRf2qfJtUuiFsBf6qp0MEwdonlwznlcrw==", + "dependencies": { + "is-plain-object": "3.0.1" + }, + "engines": { + "node": ">=10.15.0" + }, + "peerDependencies": { + "vue": "^3.0.0" + } + }, + "node_modules/vue-types/node_modules/is-plain-object": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-3.0.1.tgz", + "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/vuex": { "version": "4.1.0", "resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.1.0.tgz", @@ -11648,6 +11786,14 @@ "vue": "^3.2.0" } }, + "node_modules/warning": { + "version": "4.0.3", + "resolved": "https://registry.npmmirror.com/warning/-/warning-4.0.3.tgz", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", + "dependencies": { + "loose-envify": "^1.0.0" + } + }, "node_modules/watchpack": { "version": "2.4.0", "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.0.tgz", @@ -12365,6 +12511,28 @@ "@jridgewell/trace-mapping": "^0.3.9" } }, + "@ant-design/colors": { + "version": "6.0.0", + "resolved": "https://registry.npmmirror.com/@ant-design/colors/-/colors-6.0.0.tgz", + "integrity": "sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ==", + "requires": { + "@ctrl/tinycolor": "^3.4.0" + } + }, + "@ant-design/icons-svg": { + "version": "4.2.1", + "resolved": "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz", + "integrity": "sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw==" + }, + "@ant-design/icons-vue": { + "version": "6.1.0", + "resolved": "https://registry.npmmirror.com/@ant-design/icons-vue/-/icons-vue-6.1.0.tgz", + "integrity": "sha512-EX6bYm56V+ZrKN7+3MT/ubDkvJ5rK/O2t380WFRflDcVFgsvl3NLH7Wxeau6R8DbrO5jWR6DSTC3B6gYFp77AA==", + "requires": { + "@ant-design/colors": "^6.0.0", + "@ant-design/icons-svg": "^4.2.1" + } + }, "@babel/code-frame": { "version": "7.18.6", "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.18.6.tgz", @@ -13476,7 +13644,6 @@ "version": "7.19.0", "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.19.0.tgz", "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==", - "dev": true, "requires": { "regenerator-runtime": "^0.13.4" } @@ -13839,6 +14006,15 @@ "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==", "dev": true }, + "@simonwep/pickr": { + "version": "1.8.2", + "resolved": "https://registry.npmmirror.com/@simonwep/pickr/-/pickr-1.8.2.tgz", + "integrity": "sha512-/l5w8BIkrpP6n1xsetx9MWPWlU6OblN5YgZZphxan0Tq4BByTCETL6lyIeY8lagalS2Nbt4F2W034KHLIiunKA==", + "requires": { + "core-js": "^3.15.1", + "nanopop": "^2.1.0" + } + }, "@soda/friendly-errors-webpack-plugin": { "version": "1.8.1", "resolved": "https://registry.npmmirror.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz", @@ -15133,6 +15309,30 @@ "color-convert": "^1.9.0" } }, + "ant-design-vue": { + "version": "3.2.15", + "resolved": "https://registry.npmmirror.com/ant-design-vue/-/ant-design-vue-3.2.15.tgz", + "integrity": "sha512-sJfE7LWimSdAPe4dzNyQBrmVMnOTNQTkG9oOyr+7W8qIYrX8sYWyC68Nn1uum4KBJUSZUa/BU6dohvTG0urBhA==", + "requires": { + "@ant-design/colors": "^6.0.0", + "@ant-design/icons-vue": "^6.1.0", + "@babel/runtime": "^7.10.5", + "@ctrl/tinycolor": "^3.4.0", + "@simonwep/pickr": "~1.8.0", + "array-tree-filter": "^2.1.0", + "async-validator": "^4.0.0", + "dayjs": "^1.10.5", + "dom-align": "^1.12.1", + "dom-scroll-into-view": "^2.0.0", + "lodash": "^4.17.21", + "lodash-es": "^4.17.15", + "resize-observer-polyfill": "^1.5.1", + "scroll-into-view-if-needed": "^2.2.25", + "shallow-equal": "^1.0.0", + "vue-types": "^3.0.0", + "warning": "^4.0.0" + } + }, "any-promise": { "version": "1.3.0", "resolved": "https://registry.npmmirror.com/any-promise/-/any-promise-1.3.0.tgz", @@ -15167,6 +15367,11 @@ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, + "array-tree-filter": { + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/array-tree-filter/-/array-tree-filter-2.1.0.tgz", + "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw==" + }, "array-union": { "version": "2.1.0", "resolved": "https://registry.npmmirror.com/array-union/-/array-union-2.1.0.tgz", @@ -15806,6 +16011,11 @@ } } }, + "compute-scroll-into-view": { + "version": "1.0.20", + "resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz", + "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz", @@ -16434,6 +16644,11 @@ "esutils": "^2.0.2" } }, + "dom-align": { + "version": "1.12.4", + "resolved": "https://registry.npmmirror.com/dom-align/-/dom-align-1.12.4.tgz", + "integrity": "sha512-R8LUSEay/68zE5c8/3BDxiTEvgb4xZTF0RKmAHfiEVN3klfIpXfi2/QCoiWPccVQ0J/ZGdz9OjzL4uJEP/MRAw==" + }, "dom-converter": { "version": "0.2.0", "resolved": "https://registry.npmmirror.com/dom-converter/-/dom-converter-0.2.0.tgz", @@ -16443,6 +16658,11 @@ "utila": "~0.4" } }, + "dom-scroll-into-view": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/dom-scroll-into-view/-/dom-scroll-into-view-2.0.1.tgz", + "integrity": "sha512-bvVTQe1lfaUr1oFzZX80ce9KLDlZ3iU+XGNE/bz9HnGdklTieqsbmsLHe+rT2XWqopvL0PckkYqN7ksmm5pe3w==" + }, "dom-serializer": { "version": "1.4.1", "resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-1.4.1.tgz", @@ -18163,8 +18383,7 @@ "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "js-yaml": { "version": "4.1.0", @@ -18518,6 +18737,14 @@ } } }, + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmmirror.com/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } + }, "lower-case": { "version": "2.0.2", "resolved": "https://registry.npmmirror.com/lower-case/-/lower-case-2.0.2.tgz", @@ -18771,6 +18998,11 @@ "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz", "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==" }, + "nanopop": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/nanopop/-/nanopop-2.2.0.tgz", + "integrity": "sha512-E9JaHcxh3ere8/BEZHAcnuD10RluTSPyTToBvoFWS9/7DcCx6gyKjbn7M7Bx7E1veCxCuY1iO6h4+gdAf1j73Q==" + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz", @@ -19798,8 +20030,7 @@ "regenerator-runtime": { "version": "0.13.11", "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", - "dev": true + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, "regenerator-transform": { "version": "0.15.0", @@ -19890,6 +20121,11 @@ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", "dev": true }, + "resize-observer-polyfill": { + "version": "1.5.1", + "resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", + "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" + }, "resolve": { "version": "1.22.1", "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.1.tgz", @@ -20027,6 +20263,14 @@ } } }, + "scroll-into-view-if-needed": { + "version": "2.2.31", + "resolved": "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz", + "integrity": "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==", + "requires": { + "compute-scroll-into-view": "^1.0.20" + } + }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz", @@ -20209,6 +20453,11 @@ "kind-of": "^6.0.2" } }, + "shallow-equal": { + "version": "1.2.1", + "resolved": "https://registry.npmmirror.com/shallow-equal/-/shallow-equal-1.2.1.tgz", + "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA==" + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-1.2.0.tgz", @@ -21250,6 +21499,21 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "vue-types": { + "version": "3.0.2", + "resolved": "https://registry.npmmirror.com/vue-types/-/vue-types-3.0.2.tgz", + "integrity": "sha512-IwUC0Aq2zwaXqy74h4WCvFCUtoV0iSWr0snWnE9TnU18S66GAQyqQbRf2qfJtUuiFsBf6qp0MEwdonlwznlcrw==", + "requires": { + "is-plain-object": "3.0.1" + }, + "dependencies": { + "is-plain-object": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-3.0.1.tgz", + "integrity": "sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==" + } + } + }, "vuex": { "version": "4.1.0", "resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.1.0.tgz", @@ -21258,6 +21522,14 @@ "@vue/devtools-api": "^6.0.0-beta.11" } }, + "warning": { + "version": "4.0.3", + "resolved": "https://registry.npmmirror.com/warning/-/warning-4.0.3.tgz", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", + "requires": { + "loose-envify": "^1.0.0" + } + }, "watchpack": { "version": "2.4.0", "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.0.tgz", diff --git a/package.json b/package.json index 618a527..aac54b2 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "build:test": "vite build --mode test" }, "dependencies": { + "ant-design-vue": "^3.2.15", "axios": "^1.1.3", "core-js": "^3.26.0", "dayjs": "^1.11.6", diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index f9cc33e..a65bd05 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -69,7 +69,7 @@
-
- +
+
-
- +
+
+ +
@@ -255,6 +257,20 @@
+ + +
+ 提交成功 +
+ + From a3f25a055f37e009d49854c64b10192bd1fef29b Mon Sep 17 00:00:00 2001 From: wuyx Date: Wed, 21 Dec 2022 11:34:08 +0800 Subject: [PATCH 082/100] =?UTF-8?q?fix:=E4=BD=9C=E4=B8=9A=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=E5=80=BC=E6=9C=AA?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=EF=BC=8C=E4=BD=9C=E4=B8=9A=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=8F=8A=E4=BD=9C=E4=B8=9A=E9=99=84=E4=BB=B6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9C=89=E4=B8=80=E5=8D=B3=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/img/UploadImg.vue | 86 +- src/views/homework/HomeworkPage.vue | 1720 +++++++++++++-------------- 2 files changed, 879 insertions(+), 927 deletions(-) diff --git a/src/components/img/UploadImg.vue b/src/components/img/UploadImg.vue index c5f9b39..bd99e07 100644 --- a/src/components/img/UploadImg.vue +++ b/src/components/img/UploadImg.vue @@ -1,32 +1,24 @@ diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index 114db2d..27a4c16 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -1,13 +1,13 @@ From d1fb89ac147226d946d260d53626dc114a548058 Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 21 Dec 2022 13:50:52 +0800 Subject: [PATCH 083/100] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=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/project/ProjectDetails.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 2b10205..906fba7 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -12,7 +12,8 @@
-
+
+
{{ i.stageName }}
@@ -28,7 +29,9 @@
+
store.state.userInfo); const activeName = ref("first"); From 40cf3a8bff0a97a5160fa42f464b63bf779f6c1c Mon Sep 17 00:00:00 2001 From: lixg Date: Wed, 21 Dec 2022 16:12:28 +0800 Subject: [PATCH 084/100] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=98=B6=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/favicon.ico | Bin 4286 -> 25974 bytes src/views/project/ProjectDetails.vue | 198 ++++++++++++++------------- 2 files changed, 103 insertions(+), 95 deletions(-) diff --git a/public/favicon.ico b/public/favicon.ico index df36fcfb72584e00488330b560ebcf34a41c64c2..87c93eb8f756f8c3d4bb0bdc539395a01c2f46f7 100644 GIT binary patch literal 25974 zcmeI2K~md55Jku3g?E7!RoMhpWs{{(5Of241Z9yuH^8aNo*TqR;0S^fa0ELih?guV zCjXn6FtmDPNkFiRcB)ZN&!6t;r;!X*ac+cvr>71-3s-%2?#Ma!1%{CO1!J6_pWikY z`(Xr(fDtePM!*Od0V7}pjDQg^0!F|H7y%<-1dM!tWw)KlTLw@)AgLMn;u`PFQ4(r$-SuJ60^*K*nYY%B1Xvw54XP>#&{$8L? z-Ltm}db01+1NF0%QO<{MpV*PX4Q%V#fMx;f!%S)yIc71A{BOywM*W;ETY7Kp3+on{ zwT$yDPT4=NVVu=RPTCb~B|DzkdZ2Cgq}5>zIelt5U5rD^cNKfpo;&sIL3;*!QU_!9 zQ^dU5mGeO-*Pdy5#-J}@slLu>pBoo-eAj%+9=YFAu1AdhOU|ulRLQYGj+6)U6;j7B z;yceS?DIzS)Hn~AmwjJqJ#UL4&!woP@`q+$*eyjrvy=hm_E3QaEZ2_~@3c=*C#~7n*Umtl=9hgA8K?Q+*D?oUl3m|E zsBh$zbvPD#8B&L9D&~?O?jgzFIG0l2Wt`+wd&K-cv76_57VLaZ*C)Q??08mkmVVFi zzDFyy{xQEuG}Inyx~?&<7x^0BJ(!p0j(e_qS|hKvN3oZ!XCv&5@88IcSM~jXxcn}z zv^{izBZtC+BnLvLCll?QtC9I6P^vZac zm$g{G?LJ9%)VKANn^X5C_9*u@WZb2W_T0r<*5@7bl3lFP_c~8GX+CQ8 z%_;SjmRF0R7SCTjuqM}K&s(eq%|5VWFRf=F_9L%YSHYGr-@&M>WRBbz+W*OJj(UBJ zeHXdC_lYA9zXvX0ybtj?<&|T`XMOTfi!}wTPd_^k oc5-#%+$Yu@-#PZO@h9j4J#PHKVdJ0p)xksj9iF$X=cfykzYGaftpET3 literal 4286 zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56 zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei z@g6Xq-pDoPl=MANPiR7%172VA%r)kevtV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp= zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8 zx!=3<4seY*%=OlbCbcae?5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3 z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD zsW0Ab)ZK@0cIW%W7z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6 z={Xwx{TKxD#iCLfl2vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 2b10205..e48bcb2 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -12,114 +12,122 @@
-
-
{{ i.stageName }}
-
- -
进行中
-
-
- -
- 未开始 -
-
-
-
-
-
{{ value.name }}
-
-
- 必修 -
-
- {{ types.typeName[value.type] || "" }} -
- - - - - - - - - +
+
+
{{ i.stageName }}
+
+ +
进行中
-
当前进度
-
-
- +
+ 未开始 +
+
+
+
+
+
{{ value.name }}
+
+
+ 必修 +
+
+ {{ types.typeName[value.type] || "" }} +
+ + + + + + + + + +
+
+
当前进度
+
+
+ +
+
-
-
- {{ value.currentRatio }}% + }[parseInt(value.currentRatio / 20)], + }" + > + {{ value.currentRatio }}% +
+
+ {{ + value.status === 1 + ? "已完成" + : types.path[value.type] + ? types.toName[value.type] + : "未开放" + }} +
+ + + + + + + + + + +
-
- {{ - value.status === 1 - ? "已完成" - : types.path[value.type] - ? types.toName[value.type] - : "未开放" - }} -
- - - - - - - - - - -
\ No newline at end of file From 960d4bf4c16e06b1d4d8949b49ffc28319712705 Mon Sep 17 00:00:00 2001 From: wuyx Date: Thu, 22 Dec 2022 11:41:06 +0800 Subject: [PATCH 090/100] =?UTF-8?q?fix:=E4=BD=9C=E4=B8=9A=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/img/UploadImg.vue | 5 ++++- src/views/homework/HomeworkPage.vue | 11 ++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/components/img/UploadImg.vue b/src/components/img/UploadImg.vue index bd99e07..ad26f76 100644 --- a/src/components/img/UploadImg.vue +++ b/src/components/img/UploadImg.vue @@ -51,6 +51,9 @@ function handleChange(e) { function remove(i) { files.value.splice(i, 1) console.log(imageRef) +} + +function clearFiles() { imageRef.value.clearFiles(); } @@ -69,6 +72,6 @@ function abort(i) { } -defineExpose({ reUpload, remove }) +defineExpose({ reUpload, remove, clearFiles }) diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index 27a4c16..a907609 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -290,12 +290,17 @@ const handleClick = () => { console.log(res); submitList.value.unshift(res.data); open(); + sbValue.value.content = ""; + fileList.value = []; + remove(0); + clearFiles(); }); - sbValue.value.content = ""; - fileList.value = []; - remove(0); }; +function clearFiles() { + uploadRef.value.clearFiles(); +} + function remove(i) { uploadRef.value.remove(i); } From 393f7ddcddc02f84bb64f620bd9d067a40dd6a01 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 22 Dec 2022 12:45:39 +0800 Subject: [PATCH 091/100] =?UTF-8?q?--=20=E8=B7=AF=E5=BE=84=E5=9B=BE?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/roadmap/LearnPath.vue | 532 +++++++++++++++--------------- src/views/roadmap/PathDetails.vue | 201 ++++++----- 2 files changed, 366 insertions(+), 367 deletions(-) diff --git a/src/views/roadmap/LearnPath.vue b/src/views/roadmap/LearnPath.vue index aea809f..b1de201 100644 --- a/src/views/roadmap/LearnPath.vue +++ b/src/views/roadmap/LearnPath.vue @@ -1,79 +1,79 @@ diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 210ce6f..e7e9747 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -11,44 +11,38 @@
-
+
-
{{ i.chapterName }}
+
{{ data.currentStageName }}
- -
进行中
-
-
- -
- 未开始 + +
+ {{ data.currentChapterCnt ? '进行中' : '未开始' }}
{{ value.name }}
必修
选修
@@ -66,17 +60,17 @@
当前进度
{{ value.status === 1 - ? "已完成" - : types.path[value.type] - ? types.toName[value.type] - : "未开放" + ? "已完成" + : types.path[value.type] + ? types.toName[value.type] + : "未开放" }}
@@ -186,18 +180,18 @@
个人信息
- +
@@ -214,8 +208,8 @@
学习进度
@@ -231,10 +225,10 @@
- {{ parseInt(data.totalProgress * 100) }}% + {{ parseInt(data.currentChapterCnt/data.totalChapterCnt * 100) }}%
@@ -270,10 +264,10 @@
- {{ parseInt(data.compulsoryProgress * 100) }}% + {{ parseInt(data.currentReqCnt/data.totalReqCnt * 100) }}%
@@ -318,40 +312,31 @@