From 84c43b4577d43a583cde72503cbbf9df6ac2d64d Mon Sep 17 00:00:00 2001 From: lixg Date: Sun, 29 Jan 2023 21:30:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- src/api/api.js | 10 +- src/api/request.js | 3 +- src/assets/image/circle.png | Bin 0 -> 736 bytes src/components/img/UploadImg.vue | 6 +- src/mock/mocks/task.js | 19 +- src/views/pathmap/LevelList.vue | 143 ++++++ src/views/pathmap/PathmapPage.vue | 2 +- src/views/projectdetails/ProjectPath.vue | 262 +++++++++++ src/views/projectdetails/projectDetails.vue | 479 +++++++++++++++++--- 10 files changed, 855 insertions(+), 71 deletions(-) create mode 100644 src/assets/image/circle.png create mode 100644 src/views/pathmap/LevelList.vue create mode 100644 src/views/projectdetails/ProjectPath.vue diff --git a/.env b/.env index 2b89436..f47333a 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ VITE_BASE=/fe-student-h5 VITE_BASE_API= VITE_OUTPUT_DIR=./dist VITE_BASE_LOGIN_URL=https://u-pre.boe.com/web?returnUrl= -VITE_PROXY_URL=http://111.231.196.214/manageApi +VITE_PROXY_URL=http://43.143.139.204/manageApi VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= diff --git a/src/api/api.js b/src/api/api.js index ed18516..4213a66 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -2,14 +2,14 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2023-01-13 11:42:48 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-01-18 14:57:44 + * @LastEditTime: 2023-01-29 18:02:48 * @FilePath: /stu_h5/src/api/api.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ export const BASE = 'http://localhost:3000' export const LOGIN = '/admin/CheckUser/userLogin post' export const FILE_UPLOAD = import.meta.env.VITE_BASE_API + '/file/upload' -export const ROUTER_CHAPTER_LIST = '/stu/router/chapterList' +export const ROUTER_CHAPTER_LIST = '/stu/router/chapterList post' export const ROUTER_LIST = '/stu/router/list post' export const ROUTER_PROCESS = '/stu/router/process' export const ROUTER_UNCOMPLETE_LIST = '/stu/router/unCompleteTaskList' @@ -37,4 +37,8 @@ export const TASK_WORK_SUBMIT_LIST = '/workSubmit/queryWorkSubmitDetailById' export const WORK_HISTROY = '/workSubmit/queryWorkDetailListByStuId' export const ASSESSMENT_QUERY = assessmentId => `/stu/task/queryAssessmentDetailById` export const ASSESSMENT_SUBMIT = '/stu/task/evaluate/commit post' -export const FILE_UPLOAD_ANNEX = import.meta.env.VITE_BASE_API + '/file/stuUploadAnnex' +export const FILE_UPLOAD_ANNEX = import.meta.env.VITE_BASE_API + '/file/uploadFile' +export const ROUTER_DETAILS = '/admin/router/detail' +export const TASK_LIST = '/stu/tasks' +export const ONLINE_PROCESS = '/onlineClasses/queryOnlineClassesStudyDetail post' +export const PROJECT_PROCESS = '/stu/project/process' \ No newline at end of file diff --git a/src/api/request.js b/src/api/request.js index 5ff003c..1f1d4a6 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/assets/image/circle.png b/src/assets/image/circle.png new file mode 100644 index 0000000000000000000000000000000000000000..125dede73b71333c80e9d38b90f1942c455e584e GIT binary patch literal 736 zcmV<60w4W}P)Px%nn^@KR5(wyl|4*TQ5c5b@BWmwaDk#FLd24S#yB_{DMBo9U^EQGkQf6-2NM%@ zFq$xQAn_+r2NM^6fM|&6fQ~GJPz2)WV2qYPLjopMO1aRMw)cGIUM&%8QBcl!&U@eU zo%5adxr9O^7?kU)R-1%`R%RR|P%(p7iSR)Z7z!^GhtS?`{O)u5b@KSgh%#r3Twum^ z0DB5<3VbHQjheLQ!E3)i`?GF?sb}nIl_D8~3>-B@L=;g~Wl~X;8J4633E@mS2F0_%&{|%2*IH2txn7VsB$aAU z2v==3^?A9=HLzXNrC6*Zoz9#B<2HHU^t}M%q{C^yscB}nw>NZs*_TYDu7U89yyN|^ z0B$KMc6K{UO5SbH5=gA999~&X^Z+!xLzV8tovwFZqKMo5pSr&z@AP}3`Yr>w`_G9Y zK0njg`Ou1~g*!D8GU>FH>}Rru7LP3kgy8*o**A^zDCH=6tZ8MF1u3P+8&b)&vlgWY zpCm&xZlF}|Z5|jI*qv3=g8-UxJe3uB!ltUTg?I`eq-1PuAN?I)@_3q?urO$w?Ua}T z3{)2ig9#5o9Pp%Tdp9Nj27_QwuB%QqGjl5>90J1*LJ9)!iD+ng-Z56_AN36{T4OQx S$p%mW0000 + + diff --git a/src/views/pathmap/PathmapPage.vue b/src/views/pathmap/PathmapPage.vue index 54e76c6..667d3a3 100644 --- a/src/views/pathmap/PathmapPage.vue +++ b/src/views/pathmap/PathmapPage.vue @@ -708,7 +708,7 @@ function toFinish(d) { display: flex; align-items: center; justify-content: center; - margin-right: 37px; + // margin-right: 37px; cursor: pointer; } // .tag1 { diff --git a/src/views/projectdetails/ProjectPath.vue b/src/views/projectdetails/ProjectPath.vue new file mode 100644 index 0000000..b942172 --- /dev/null +++ b/src/views/projectdetails/ProjectPath.vue @@ -0,0 +1,262 @@ + + + + + + diff --git a/src/views/projectdetails/projectDetails.vue b/src/views/projectdetails/projectDetails.vue index 1e7a55e..6775984 100644 --- a/src/views/projectdetails/projectDetails.vue +++ b/src/views/projectdetails/projectDetails.vue @@ -1,23 +1,24 @@ - +