From 8c80dedc5ccaeff616000344d21116b766459045 Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 22 Feb 2023 22:13:54 +0800 Subject: [PATCH 01/16] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=EF=BC=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=8F=8A=E8=B7=B3=E8=BD=AC=E6=B5=8B=E8=AF=84=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 3 + src/views/project/ProjectDetails.vue | 131 +++++++++++++++++---------- src/views/roadmap/PathDetails.vue | 101 +++++++++++++++++---- vite.config.js | 3 + 4 files changed, 174 insertions(+), 64 deletions(-) diff --git a/src/api/api.js b/src/api/api.js index 59f229b..fcdc88d 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -120,6 +120,9 @@ export const GetMoreComments = `/statement/getMoreComments` // 查询讨论下的帖子 export const PostList = `/statement/list` +// 查询单个测评的状态 +export const QueryEvaluationTaskStatusOne = `/evaluation/queryEvaluationTaskStatusOne` + diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 66eb797..ed76acc 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -406,7 +406,7 @@ import {computed, onMounted, ref, watch} from "vue"; import {ElLoading, ElMessage} from 'element-plus' import {request} from "@/api/request"; -import {CompletionList, EvaluationToLearn, PointList, STUDY_RECORD, SubmitExternalExam} from "@/api/api"; +import {CompletionList, EvaluationToLearn, PointList, STUDY_RECORD, SubmitExternalExam, QueryEvaluationTaskStatusOne} from "@/api/api"; import {useRoute, useRouter} from "vue-router"; import {PROJECT, TASK_TYPES} from "@/api/CONST"; import FileTypeImg from "@/components/FileTypeImg.vue"; @@ -681,52 +681,89 @@ async function toFinish(d, sName, chapterOrStageId) { } // 测评模块 请求接口跳转新的页面 - 新增 暂时未调试 目前无测评数据 2023-02-04 if (d.type == 10) { - // 此处判断测评跳转详情界面 - router.push({ - path: '/evaluation', - query: { - id: d.id, - type: PROJECT, - infoId: data.value.projectId, - courseId: d.courseId, - pName: data.value.name, - sName, - chapterOrStageId, - exname: d.name, // 测评名称 - btype: 1 // 1项目 2 路径图 - }, - }); - return - - // 调用接口 跳转页面 - console.log('我是查询测评跳转链接所传递得参数', { - "businessType": "project", - "chapterId": chapterOrStageId, - "courseId": d.courseId, - "quizKid": d.targetId, - "routerOrProjectId": projectId, - "studentId": userInfo.value.projectId, - "studentName": userInfo.value.realName - }) - request(EvaluationToLearn, { - "businessType": "project", - "chapterId": chapterOrStageId, - "courseId": d.courseId, - "quizKid": d.targetId, - "routerOrProjectId": projectId, - "studentId": userInfo.value.projectId, - "studentName": userInfo.value.realName - }).then(res => { - console.log(res) - if (res.code == 200) { - let jumpUrl = res.data.quizUrl - // 此处写跳转url - window.open(jumpUrl, '_top') - } - }).catch(err => { - console.log(err) - }) - return + if(d.quizTaskId==null){ + // 肯定没有完成测评 + // 调用接口 跳转页面 + console.log('我是查询测评跳转链接所传递得参数', { + "businessType": "project", + "chapterId": chapterOrStageId, + "courseId": d.courseId, + "quizKid": d.targetId, + "routerOrProjectId": projectId, + "studentId": userInfo.value.projectId, + "studentName": userInfo.value.realName + }) + request(EvaluationToLearn, { + "businessType": "project", + "chapterId": chapterOrStageId, + "courseId": d.courseId, + "quizKid": d.targetId, + "routerOrProjectId": projectId, + "studentId": userInfo.value.projectId, + "studentName": userInfo.value.realName + }).then(res => { + console.log(res) + if (res.code == 200) { + let jumpUrl = res.data.quizUrl + // 此处写跳转url + window.open(jumpUrl, '_top') + } + }).catch(err => { + console.log(err) + }) + return + }else{ + // 进行中 或者 已完成 + // 调用接口 判断当前测评状态 跳转页面 + console.log('我是查询测评跳转链接所传递得参数', { + "quizTaskId": d.quizTaskId + }) + request(QueryEvaluationTaskStatusOne, { + "quizTaskId": d.quizTaskId + }).then(res => { + console.log(res) + if (res.code == 200) { + if(res.data.complete_status==2){ + ElMessage.error("您已完成测评") + return + }else{ + // 重新查询跳转 + // 调用接口 跳转页面 + console.log('我是查询测评跳转链接所传递得参数', { + "businessType": "project", + "chapterId": chapterOrStageId, + "courseId": d.courseId, + "quizKid": d.targetId, + "routerOrProjectId": projectId, + "studentId": userInfo.value.projectId, + "studentName": userInfo.value.realName + }) + request(EvaluationToLearn, { + "businessType": "project", + "chapterId": chapterOrStageId, + "courseId": d.courseId, + "quizKid": d.targetId, + "routerOrProjectId": projectId, + "studentId": userInfo.value.projectId, + "studentName": userInfo.value.realName + }).then(res => { + console.log(res) + if (res.code == 200) { + let jumpUrl = res.data.quizUrl + // 此处写跳转url + window.open(jumpUrl, '_top') + } + }).catch(err => { + console.log(err) + }) + return + } + } + }).catch(err => { + console.log(err) + }) + return + } } if (!TASK_TYPES.path[d.type]) { diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 7487335..7b300f7 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -280,7 +280,7 @@ import {computed, onMounted, ref} from "vue"; import circle from '@/assets/image/pathdetails/circle.png'; import circle2 from '@/assets/image/pathdetails/circle2.png'; import {request} from "@/api/request"; -import {STUDY_RECORD, UPDATE_CURRENT_TASK} from "@/api/api"; +import {STUDY_RECORD, UPDATE_CURRENT_TASK, QueryEvaluationTaskStatusOne, EvaluationToLearn} from "@/api/api"; import {useRoute, useRouter} from "vue-router"; import {ElMessage} from "element-plus"; import {ROUTER, TASK_TYPES} from "@/api/CONST"; @@ -445,22 +445,89 @@ async function toFinish(d) { // 测评模块 请求接口跳转新的页面 - 新增 暂时未调试 目前无测评数据 2023-02-04 if (d.type == 10) { - // 此处判断测评跳转详情界面 - router.push({ - path: '/evaluation', - query: { - id: d.id, - type: ROUTER, - infoId: routerId, - courseId: d.courseId, - pName: data.value.name, - sName: data.value.currentStageName, - chapterOrStageId: data.value.currentStageId, - exname: d.name, // 测评名称 - btype: 2 // 1项目 2 路径图 - }, - }); - return + if(d.quizTaskId==null){ + // 肯定没有完成测评 + // 调用接口 跳转页面 + console.log('我是查询测评跳转链接所传递得参数', { + "businessType": "learningpath", + "chapterId": data.value.currentStageId, + "courseId": d.courseId, + "quizKid": d.targetId, + "routerOrProjectId": routerId, + "studentId": userInfo.value.id, + "studentName": userInfo.value.realName + }) + request(EvaluationToLearn, { + "businessType": "learningpath", + "chapterId": data.value.currentStageId, + "courseId": d.courseId, + "quizKid": d.targetId, + "routerOrProjectId": routerId, + "studentId": userInfo.value.id, + "studentName": userInfo.value.realName + }).then(res => { + console.log(res) + if (res.code == 200) { + let jumpUrl = res.data.quizUrl + // 此处写跳转url + window.open(jumpUrl, '_top') + } + }).catch(err => { + console.log(err) + }) + return + }else{ + // 进行中 或者 已完成 + // 调用接口 判断当前测评状态 跳转页面 + console.log('我是查询测评跳转链接所传递得参数', { + "quizTaskId": d.quizTaskId + }) + request(QueryEvaluationTaskStatusOne, { + "quizTaskId": d.quizTaskId + }).then(res => { + console.log(res) + if (res.code == 200) { + if(res.data.complete_status==2){ + ElMessage.error("您已完成测评") + return + }else{ + // 重新查询跳转 + // 调用接口 跳转页面 + console.log('我是查询测评跳转链接所传递得参数', { + "businessType": "learningpath", + "chapterId": data.value.currentStageId, + "courseId": d.courseId, + "quizKid": d.targetId, + "routerOrProjectId": routerId, + "studentId": userInfo.value.id, + "studentName": userInfo.value.realName + }) + request(EvaluationToLearn, { + "businessType": "learningpath", + "chapterId": data.value.currentStageId, + "courseId": d.courseId, + "quizKid": d.targetId, + "routerOrProjectId": routerId, + "studentId": userInfo.value.id, + "studentName": userInfo.value.realName + }).then(res => { + console.log(res) + if (res.code == 200) { + let jumpUrl = res.data.quizUrl + // 此处写跳转url + window.open(jumpUrl, '_top') + } + }).catch(err => { + console.log(err) + }) + return + } + } + }).catch(err => { + console.log(err) + }) + return + } } // 项目任务 直接跳转项目详情 diff --git a/vite.config.js b/vite.config.js index 92dd288..274d938 100644 --- a/vite.config.js +++ b/vite.config.js @@ -161,6 +161,9 @@ export default defineConfig(({ command, mode }) => },'/vote/queryVoteById': { target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, + },'/evaluation/queryEvaluationTaskStatusOne': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, } } } From 423d8002b02a84a58bdfb09445ae7204ae6f2775 Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 22 Feb 2023 22:32:15 +0800 Subject: [PATCH 02/16] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=BF=85=E4=BF=AE?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=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 | 2 +- src/views/roadmap/PathDetails.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index ed76acc..158a934 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -228,7 +228,7 @@ font-weight: 500; color: #277aff; margin-left: 10px;color:#677d86;"> - {{ parseInt(data.compulsoryProgress * 100) }}% + {{ parseInt(data.compulsoryProgress?data.compulsoryProgress:0 * 100) }}% diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 7b300f7..43847b2 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -251,7 +251,7 @@ 5: 'rgba(57, 219, 183, 1)', }[parseInt((data.currentReqCnt / data.totalReqCnt * 100) / 20)], }"> - {{ parseInt(data.currentReqCnt / data.totalReqCnt * 100) }}% + {{ parseInt(data.currentReqCnt?data.currentReqCnt:0 / data.totalReqCnt?data.totalReqCnt:0 * 100) }}% From 3fd341b5ae52240e47b49947156f0d5809e3c05d Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 23 Feb 2023 00:59:03 +0800 Subject: [PATCH 03/16] =?UTF-8?q?fix=20--=20=E6=8A=95=E7=A5=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ballot/BallotPage.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/views/ballot/BallotPage.vue b/src/views/ballot/BallotPage.vue index 59bc93e..78071e5 100644 --- a/src/views/ballot/BallotPage.vue +++ b/src/views/ballot/BallotPage.vue @@ -104,7 +104,7 @@ :src="value.optionPictureAddress" /> -->
-
- {{ types.typeName[value.type] || "" }} + {{ TASK_TYPES.typeName[value.type] || "" }}
@@ -91,7 +91,7 @@
- {{ value.statusName || (data.unlockMode === 1 ? types.toName[value.type] : '未解锁') }} + {{ value.statusName || (data.unlockMode === 1 ? TASK_TYPES.toName[value.type] : '未解锁') }}
@@ -479,58 +479,6 @@ const handleClick = (tab, event) => { console.log(tab, event); }; const path = {1: "path"}; -const types = ref({ - typeName: { - 1: "在线", - 2: "面授", - 3: "案例", - 4: "作业", - 5: "考试", - 6: "直播", - 7: "外链", - 8: "讨论", - 9: "活动", - 10: "测评", - 11: "评估", - 12: "投票", - 13: "项目", - }, - toName: { - 1: "去上课", - 2: "去上课", - 3: "去阅读", - 4: "去完成", - 5: "去完成", - 6: "去观看", - 7: "去查看", - 8: "去讨论", - 9: "去签到", - 10: "去完成", - 11: "去完成", - 12: "去投票", - 13: "去完成", - }, - path: { - 1: window.location.protocol + import.meta.env.VITE_BOE_ONLINE_CLASS_URL, //在线 - 2: ({courseId}) => window.open(`${location.protocol}//${location.host}${import.meta.env.VITE_BASE_API}/stu/project/redirectDetail?courseId=${courseId}`, '_top'), - 3: window.location.protocol + import.meta.env.VITE_BOE_CASS_DETAIL_URL, //案例 - 4: "/homeworkpage", - 5: window.location.protocol + import.meta.env.VITE_BOE_EXAM_DETAIL_URL, //考试 - 6: "/livebroadcast", - 7: ({targetId}) => window.open(targetId, '_top'), - 8: "/discusspage", - 9: "/moreactive", - 10: ({evaType, targetId}) => - window.open( - evaType == 0 - ? window.location.protocol + import.meta.env.VITE_BOE_TEST_DETAIL_URL + targetId - : window.location.protocol + import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL + targetId + `&quizTaskKid=${projectId}&channelCode=project` - , '_top'), //测评 - 11: "/surveydetail", - 12: "/ballotpage", - 13: "/projectdetails", - }, -}); const dialogVisible = ref(false); const dialogVisibleTip = ref('该任务无法学习，请联系管理员进行替换！'); From 4c282f209eb03883ba190842727d0ca79bf398cc Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 23 Feb 2023 01:34:50 +0800 Subject: [PATCH 05/16] =?UTF-8?q?fix=20--=20=E5=AE=8C=E6=88=90=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index ad6729a..6787a00 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -14,7 +14,7 @@
-
+
{{ i.stageName }}
@@ -24,14 +24,8 @@ {{ i.statusName || (data.unlockMode === 1 ? '未开始' : '未解锁') }}
-
-
+
- {{ parseInt(data.compulsoryProgress?data.compulsoryProgress:0 * 100) }}% + {{ parseInt(data.compulsoryProgress * 100) }}%
From c0448c5dec41a86af72992466fe16c6f50b1eb60 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 23 Feb 2023 01:41:06 +0800 Subject: [PATCH 07/16] =?UTF-8?q?fix=20--=20=E5=AE=8C=E6=88=90=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 6070e67..2c55353 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -714,32 +714,16 @@ async function toFinish(d, sName, chapterOrStageId) { } //更新学员当前任务 await request(UPDATE_CURRENT_TASK, {id: d.id, type: PROJECT, pid: projectId, name: d.name}) - if (d.type == 3 || d.type == 7) { + if (d.type == 3 || d.type == 7 || (d.type === 5 && d.examType === 2)) { d.status !== 1 && await request(STUDY_RECORD, { studentId: userInfo.value.projectId, targetId: data.value.routerId, logo: PROJECT, + type: PROJECT, stageOrChapterId: chapterOrStageId, taskId: d.id, taskType: d.type, }); - // 此处判断外链跳转详情界面 - if (d.type == 7) { - router.push({ - path: '/outerchain', - query: { - id: d.id, - type: PROJECT, - infoId: data.value.projectId, - courseId: d.courseId, - pName: data.value.name, - sName, - chapterOrStageId, - exname: d.name, // 外链名称 - }, - }); - return - } } if (typeof TASK_TYPES.path[d.type] === "string") { From f467e209f811812a39bbec57f74413ae54b826e4 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 23 Feb 2023 01:55:00 +0800 Subject: [PATCH 08/16] =?UTF-8?q?fix=20--=20=E5=AE=8C=E6=88=90=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 2c55353..760b51e 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -632,7 +632,7 @@ async function toFinish(d, sName, chapterOrStageId) { "courseId": d.courseId, "quizKid": d.targetId, "routerOrProjectId": projectId, - "studentId": userInfo.value.projectId, + "studentId": userInfo.value.id, "studentName": userInfo.value.realName }) request(EvaluationToLearn, { @@ -641,7 +641,7 @@ async function toFinish(d, sName, chapterOrStageId) { "courseId": d.courseId, "quizKid": d.targetId, "routerOrProjectId": projectId, - "studentId": userInfo.value.projectId, + "studentId": userInfo.value.id, "studentName": userInfo.value.realName }).then(res => { console.log(res) @@ -677,7 +677,7 @@ async function toFinish(d, sName, chapterOrStageId) { "courseId": d.courseId, "quizKid": d.targetId, "routerOrProjectId": projectId, - "studentId": userInfo.value.projectId, + "studentId": userInfo.value.id, "studentName": userInfo.value.realName }) request(EvaluationToLearn, { @@ -686,7 +686,7 @@ async function toFinish(d, sName, chapterOrStageId) { "courseId": d.courseId, "quizKid": d.targetId, "routerOrProjectId": projectId, - "studentId": userInfo.value.projectId, + "studentId": userInfo.value.id, "studentName": userInfo.value.realName }).then(res => { console.log(res) @@ -716,7 +716,7 @@ async function toFinish(d, sName, chapterOrStageId) { await request(UPDATE_CURRENT_TASK, {id: d.id, type: PROJECT, pid: projectId, name: d.name}) if (d.type == 3 || d.type == 7 || (d.type === 5 && d.examType === 2)) { d.status !== 1 && await request(STUDY_RECORD, { - studentId: userInfo.value.projectId, + studentId: userInfo.value.id, targetId: data.value.routerId, logo: PROJECT, type: PROJECT, From 629b04d89e8af5eff4e5e590947381dc24eed7b1 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Thu, 23 Feb 2023 02:01:04 +0800 Subject: [PATCH 09/16] fix -- bug --- src/api/CONST.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/CONST.js b/src/api/CONST.js index c14b27b..1cb13e8 100644 --- a/src/api/CONST.js +++ b/src/api/CONST.js @@ -34,7 +34,7 @@ export const TASK_TYPES = { 13: "去完成", }, path: { - 1: window.location.protocol + import.meta.env.VITE_BOE_ONLINE_CLASS_URL, //在线 + 1: ({courseId}) => window.open(window.location.protocol + import.meta.env.VITE_BOE_ONLINE_CLASS_URL + courseId), //在线 2: ({courseId}) => window.open(`${location.protocol}//${location.host}${import.meta.env.VITE_BASE_API}/stu/project/redirectDetail?courseId=${courseId}`, '_top'), 3: ({courseId}) => window.open(window.location.protocol + import.meta.env.VITE_BOE_CASS_DETAIL_URL + courseId), //案例 4: "/homeworkpage", From 2167b33c2f93ebcc3c5fc387cee266d6d937f7ed Mon Sep 17 00:00:00 2001 From: wuyx Date: Thu, 23 Feb 2023 11:25:19 +0800 Subject: [PATCH 10/16] =?UTF-8?q?fix:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84/?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE-=E6=80=BB=E8=BF=9B=E5=BA=A6=E3=80=81?= =?UTF-8?q?=E5=BF=85=E4=BF=AE=E8=BF=9B=E5=BA=A6=E6=95=B0=E5=80=BC=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=8F=8A=E8=B0=83=E6=95=B4=EF=BC=8C=E8=B6=85=E5=87=BA?= =?UTF-8?q?=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 | 301 +++++++++++---------------- src/views/roadmap/PathDetails.vue | 256 +++++++++++------------ 2 files changed, 253 insertions(+), 304 deletions(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 760b51e..8c2e0a3 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -5,7 +5,7 @@
{{ data.name }} + :content="data.remark">
@@ -18,19 +18,17 @@
{{ i.stageName }}
- +
+ :style="(i.statusName === '已完成' || i.statusName === '进行中') ? 'color:#0060ff' : 'color:#999'"> {{ i.statusName || (data.unlockMode === 1 ? '未开始' : '未解锁') }}
-
+
@@ -62,20 +60,16 @@
当前进度
- +
{{ parseInt(value.currentRatio) }}% @@ -84,7 +78,7 @@
+ :style="{ background: (value.statusName !== '已结束' && (value.statusName || data.unlockMode === 1)) ? '#2478ff' : '#999' }"> {{ value.statusName || (data.unlockMode === 1 ? TASK_TYPES.toName[value.type] : '未解锁') }}
@@ -119,23 +113,17 @@
-
+
+ :v-model="value.name ? value.name : value.slice(value.lastIndexOf('/') + 1, value.indexOf('-')) + value.slice(value.lastIndexOf('.'))" + :style="{ width: '22px', height: '26px' }">
{{ value.name }}
- +
下载
@@ -148,13 +136,13 @@
- +
个人信息
- +
@@ -167,7 +155,7 @@
- +
学习进度
@@ -182,20 +170,20 @@
总进度
- +
- {{ parseInt(data.totalProgress * 100) }}% + {{ parseInt(data.totalProgress ? data.totalProgress > 1 ? 1 : data.totalProgress : 0 * 100) }}%
@@ -205,24 +193,26 @@
必修进度
- +
- {{ parseInt(data.compulsoryProgress * 100) }}% + font-size: 14px; + font-weight: 500; + color: #277aff; + margin-left: 10px;color:#677d86;"> + {{ + parseInt(((data.compulsoryProgress ? data.compulsoryProgress : 0) > 1 ? 1 : (data.compulsoryProgress ? data.compulsoryProgress : 0)) + * 100) }}%
@@ -234,35 +224,22 @@
-
积分排行榜 + style="display:flex;justify-content: space-between;align-items: center;height: 56px;padding-left: 27px;padding-right: 27px;"> +
积分排行榜
- - + +
-
+
-
+
+
@@ -278,11 +255,11 @@
+ style="display: flex;padding-top: 30px;padding-bottom: 100px;background: linear-gradient(0deg, rgba(36,120,255,0) 0%, rgba(36,120,255,0.15) 100%);">
排名
+ style="margin-left: 110px;margin-right: 110px;font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;"> 名称
@@ -292,86 +269,60 @@
-
+
+ style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:30%;display: flex;justify-content: center;align-items: center;position: relative;"> {{ i + 1 == 1 || i + 1 == 2 || i + 1 == 3 ? '' : i + 1 }} - - - - + + + +
- + style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:34%;display: flex;justify-content: center;align-items: center;"> + {{ item.name }}
+ style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:30%;display: flex;justify-content: center;align-items: center;"> {{ tabValue == 1 ? item?.pointsCount : item?.rateStr }}
-
+
+ style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:30%;display: flex;justify-content: center;align-items: center;"> {{ '...' }}
+ style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:34%;display: flex;justify-content: center;align-items: center;"> {{ '' }}
+ style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:30%;display: flex;justify-content: center;align-items: center;"> {{ '' }}
-
+
+ style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:30%;display: flex;justify-content: center;align-items: center;"> {{ myIndex }} - +
- + style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:34%;display: flex;justify-content: center;align-items: center;"> + {{ tableRankData[myIndex - 1]?.name }}
+ style="font-size: 14px;color:rgba(36, 120, 255, 1);font-weight: 600;width:30%;display: flex;justify-content: center;align-items: center;"> {{ tabValue == 1 ? tableRankData[myIndex - 1]?.pointsCount : tableRankData[myIndex - 1]?.rateStr }}
@@ -386,37 +337,37 @@ + style="display:flex;justify-content:center;align-items:center;height: 283px;padding:0;border-radius: 4px;" + width="502px">
{{ dialogVisibleTip }}
- 取消 - 确定 - + 取消 + 确定 +