From ba28a9c690f955a9fb68cd772d8c7a8529b8a57f Mon Sep 17 00:00:00 2001 From: yixiudong <827231259@qq.com> Date: Wed, 20 Aug 2025 10:52:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E6=A6=9C-=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/charts/index.vue | 78 +++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 27 deletions(-) diff --git a/src/pages/charts/index.vue b/src/pages/charts/index.vue index 47921944..efb9cd42 100644 --- a/src/pages/charts/index.vue +++ b/src/pages/charts/index.vue @@ -25,7 +25,8 @@ - + + top·2 {{chartsList[1].userName}} {{chartsList[1].score}} @@ -33,7 +34,8 @@ - + + top·1 {{chartsList[0].userName}} {{chartsList[0].score}} @@ -41,7 +43,8 @@ - + + top·3 {{chartsList[2].userName}} {{chartsList[2].score}} @@ -113,17 +116,18 @@ @@ -142,11 +146,12 @@ @@ -169,6 +174,7 @@ getLeaderBoardCrsCntApi } from "@/api/leaderBoard.js" // 我的排行榜 + import { getUserInfo } from '@/common/common'; import { reactive, ref, @@ -178,7 +184,7 @@ watch } from 'vue'; import common from '@/common/common'; - const userId = ("USER001"); + const userId = ref(""); const itemIndex = ref(0); const learnTimeList = ref([]) const practCntList = ref([]) @@ -215,30 +221,33 @@ itemIndex.value = 0; tabAct.value = index; tableLastName.value = item.name; - if (tableLastName.value == '学习时长') { + if (tableLastName.value.includes('学习时长') ) { tableLastName.value = '学习时长(h)' } - if (tableLastName.value == '学习时长') { + if (tableLastName.value.includes('学习时长')) { allChartsList.value = learnTimeList.value; - chartsList.value = learnTimeList.value.annual.list || []; + chartsList.value = learnTimeList.value.annual?learnTimeList.value.annual.list:[]; myselfObj.value = allChartsList.value.annual?allChartsList.value.annual.self:{}; - myselfObj.value.score = allChartsList.value.annual.self.annlStdyTmLen; + myselfObj.value.score = allChartsList.value.annual?allChartsList.value.annual.self.annlStdyTmLen:""; chartsList.value.forEach(item => item.score = item.annlStdyTmLen) - } else if (tableLastName.value == '练习次数') { + } else if (tableLastName.value == '练习次数') { allChartsList.value = practCntList.value; - chartsList.value = practCntList.value.annual.list || []; + chartsList.value = practCntList.value.annual?practCntList.value.annual.list:[]; myselfObj.value = allChartsList.value.annual?allChartsList.value.annual.self:{}; - myselfObj.value.score = allChartsList.value.annual.self.annlPractCnt; + myselfObj.value.score = allChartsList.value.annual?allChartsList.value.annual.self.annlPractCnt:""; + chartsList.value.forEach(item => item.score = item.annlPractCnt); } else if (tableLastName.value == '考试次数') { allChartsList.value = examCntList.value; - chartsList.value = examCntList.value.annual.list || []; + chartsList.value = examCntList.value.annual?examCntList.value.annual.list:[]; myselfObj.value = allChartsList.value.annual?allChartsList.value.annual.self:{}; - myselfObj.value.score = allChartsList.value.annual.self.annlExamCnt; + myselfObj.value.score = allChartsList.value.annual?allChartsList.value.annual.self.annlExamCnt:""; + chartsList.value.forEach(item => item.score = item.annlExamCnt); } else if (tableLastName.value == '通关课程数') { allChartsList.value = crsCntList.value; - chartsList.value = crsCntList.value.annual.list || []; + chartsList.value = crsCntList.value.annual?crsCntList.value.annual.list:[]; myselfObj.value = allChartsList.value.annual?allChartsList.value.annual.self:{}; - myselfObj.value.score = allChartsList.value.annual.self.annlCrsCnt; + myselfObj.value.score = allChartsList.value.annual?allChartsList.value.annual.self.annlCrsCnt:""; + chartsList.value.forEach(item => item.score = item.annlCrsCnt); } if (chartsList.value.length > 3) { newChartsList.value = chartsList.value.slice(3).concat(); @@ -266,11 +275,16 @@ myselfObj.value.score = myselfObj.value.annlCrsCnt; } } else if (item.value == 'month') { + console.log('month') chartsList.value = allChartsList.value.month ? allChartsList.value.month.list : []; myselfObj.value = allChartsList.value.month ? allChartsList.value.month.self : {}; - if (tableLastName.value == '学习时长') { + console.log(chartsList.value,'chartsList.value') + console.log(myselfObj.value,'myselfObj.value') + if (tableLastName.value.includes('学习时长')) { chartsList.value.forEach(item => item.score = item.thisMonthStdyTmLen); myselfObj.value.score = myselfObj.value.thisMonthStdyTmLen; + console.log(chartsList.value,'chartsList.valueMonth') + console.log(myselfObj.value,'myselfObj.valueMonth') } else if (tableLastName.value == '练习次数') { chartsList.value.forEach(item => item.score = item.thisMonthPractCnt); myselfObj.value.score = myselfObj.value.thisMonthPractCnt; @@ -284,9 +298,11 @@ } else if (item.value == 'week') { chartsList.value = allChartsList.value.week ? allChartsList.value.week.list : []; myselfObj.value = allChartsList.value.week ? allChartsList.value.week.self : {}; - if (tableLastName.value == '学习时长') { + if (tableLastName.value.includes('学习时长')) { chartsList.value.forEach(item => item.score = item.thisWeekStdyTmLen); myselfObj.value.score = myselfObj.value.thisWeekStdyTmLen; + console.log(chartsList.value,'chartsList.valueWeek') + console.log(myselfObj.value,'myselfObj.valueWeek') } else if (tableLastName.value == '练习次数') { chartsList.value.forEach(item => item.score = item.thisWeekPractCnt); myselfObj.value.score = myselfObj.value.thisWeekPractCnt; @@ -298,7 +314,15 @@ myselfObj.value.score = myselfObj.value.thisWeekCrsCnt; } } + if (chartsList.value.length > 3) { + newChartsList.value = chartsList.value.slice(3).concat(); + } else { + newChartsList.value = chartsList.value; + } } + const userInfo = computed(() => getUserInfo()) + userId.value = userInfo.value.userId; + console.log(userId.value,'userId') onMounted(() => { //挡板数据代码 @@ -381,8 +405,8 @@ allChartsList.value = learnTimeList.value; chartsList.value = allChartsList.value.annual?allChartsList.value.annual.list:[]; myselfObj.value = allChartsList.value.annual?allChartsList.value.annual.self:{}; - // chartsList.value[0].dept = "吉林银行吉林分行" - // myselfObj.value.dept = "吉林银行吉林分行" + chartsList.value[0].dept = "吉林银行吉林分行" + myselfObj.value.dept = "吉林银行吉林分行" console.log(chartsList.value,'chartsList.value') console.log(myselfObj.value,myselfObj.value,'myselfObj.value') chartsList.value.forEach(item => item.score = item.annlStdyTmLen); @@ -862,7 +886,7 @@ color: #0066FF; font-style: italic; font-weight: 600; - margin-top: 15rpx + margin-top: 20rpx } .my-rank-name { From 804c4f9cc3265a66ce93b4027793d6911760e2da Mon Sep 17 00:00:00 2001 From: yixiudong <827231259@qq.com> Date: Wed, 20 Aug 2025 11:01:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?pageB=E5=A2=9E=E5=8A=A0=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 9 +++++++++ src/pagesB.json | 11 ++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/pages.json b/src/pages.json index 5ca9f8a9..bd277d37 100644 --- a/src/pages.json +++ b/src/pages.json @@ -261,6 +261,15 @@ "titleNView": false } } + }, + { + "path": "pages/charts/index", + "style": { + "navigationBarTitleText": "", + "app-plus": { + "titleNView": false + } + } } ], "tabBar": { diff --git a/src/pagesB.json b/src/pagesB.json index c578ab53..bba0f995 100644 --- a/src/pagesB.json +++ b/src/pagesB.json @@ -17,6 +17,15 @@ "titleNView": false } } - } + }, + { + "path": "pages/charts/index", + "style": { + "navigationBarTitleText": "", + "app-plus": { + "titleNView": false + } + } + }, ] } \ No newline at end of file From d496b8bfd16017816a699cdde553876fe57bf2fa Mon Sep 17 00:00:00 2001 From: yixiudong <827231259@qq.com> Date: Wed, 20 Aug 2025 11:10:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=A1=E6=9D=BF?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/charts/index.vue | 75 -------------------------------------- 1 file changed, 75 deletions(-) diff --git a/src/pages/charts/index.vue b/src/pages/charts/index.vue index efb9cd42..a88a0cc2 100644 --- a/src/pages/charts/index.vue +++ b/src/pages/charts/index.vue @@ -324,81 +324,6 @@ userId.value = userInfo.value.userId; console.log(userId.value,'userId') onMounted(() => { - - //挡板数据代码 - // let tempList = { - // annual: [{ - // userName: "江心", - // score: 94, - // dept: "吉林银行吉林分行", - // userId: "USER001", - // imgAddr: "/static/images/charts/avator.png" - // }, - // { - // userName: "李婉儿", - // score: 98, - // dept: "吉林银行吉林分行" - // }, - // { - // userName: "百里里", - // score: 88, - // dept: "吉林银行吉林分行" - // }, - // { - // userName: "黎明", - // score: 94, - // dept: "吉林银行吉林分行", - // imgAddr: "/static/images/charts/avator.png" - // }, - // { - // userName: "张伟", - // score: 91, - // dept: "吉林银行吉林分行" - // }, - // { - // userName: "俞小凡", - // score: 89, - // dept: "吉林银行吉林分行", - // imgAddr: "/static/images/charts/avator.png" - // }, - // { - // userName: "黎明", - // score: 94, - // dept: "吉林银行吉林分行" - // }, - // { - // userName: "张伟", - // score: 91, - // dept: "吉林银行吉林分行" - // }, - // { - // userName: "俞小凡", - // score: 89, - // dept: "吉林银行吉林分行" - // }, - // { - // userName: "江月心", - // score: 10, - // dept: "吉林银行吉林分行" - // } - // ] - // } - // learnTimeList.value = tempList; - // allChartsList.value = learnTimeList.value; - // chartsList.value = tempList.annual; - // console.log(chartsList.value, '1111111') - // chartsList.value.score = learnTimeList.value.annual.annlStdyTmLen; - // console.log(chartsList.value, '222222') - // myselfObj.value = chartsList.value.filter(item => item.userId == userId) - // console.log(myselfObj.value, '3333') - // if (chartsList.value.length > 3) { - // newChartsList.value = chartsList.value.slice(3).concat(); - // } else { - // newChartsList.value = chartsList.value; - // } - // console.log(learnTimeList.value, 'learnTimeList') - //挡板数据代码 - console.log(myselfObj.value,'78787878') getLeaderBoardStdyTmApi().then(res => { console.log(res, 'getLeaderBoardStdyTmApi') learnTimeList.value = res.body || [];