From ac623801fbb8c1d1ff964a660eed1f6ca1849a18 Mon Sep 17 00:00:00 2001 From: YCA001 <2915341988@qq.com> Date: Sat, 28 Oct 2023 19:57:34 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/shared/components/OAnchor.vue | 50 ++++++++++++++++---------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/packages/shared/components/OAnchor.vue b/packages/shared/components/OAnchor.vue index b56a66d..85da092 100644 --- a/packages/shared/components/OAnchor.vue +++ b/packages/shared/components/OAnchor.vue @@ -1,19 +1,19 @@ @@ -119,7 +133,7 @@ const btnInfo = () => { background: #ffffff; box-shadow: 0px 1px 5px 0px rgba(45, 47, 51, 0.1); margin-top: 400px; - background-image: url("../../euler/src/assets/edit.png"); + background-image: url('../../euler/src/assets/edit.png'); background-repeat: no-repeat; background-position: 50%; position: fixed; @@ -161,7 +175,7 @@ const btnInfo = () => { background: #ffffff; box-shadow: 0px 1px 5px 0px rgba(45, 47, 51, 0.1); margin-top: 4px; - background-image: url("../../euler/src/assets/download.png"); + background-image: url('../../euler/src/assets/download.png'); background-repeat: no-repeat; background-position: 50%; position: fixed; -- Gitee From 4dcd2011f11e3d94daf9725c6ad38d130827847b Mon Sep 17 00:00:00 2001 From: YCA001 <2915341988@qq.com> Date: Wed, 6 Dec 2023 15:00:41 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=AA=E4=BA=BAComme?= =?UTF-8?q?nt=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/euler/src/stores/personal.ts | 33 ++- .../euler/src/views/contributors/Index.vue | 227 +++++++++++------- 2 files changed, 162 insertions(+), 98 deletions(-) diff --git a/packages/euler/src/stores/personal.ts b/packages/euler/src/stores/personal.ts index 38d1387..ef03b4c 100644 --- a/packages/euler/src/stores/personal.ts +++ b/packages/euler/src/stores/personal.ts @@ -15,6 +15,7 @@ export const usePersonalStore = defineStore('personal', { contributeType: 'pr', timeRange: 'lastonemonth', } as Form, + checkedComment: [] as any, }), actions: { async getPersonalData() { @@ -26,10 +27,32 @@ export const usePersonalStore = defineStore('personal', { try { const res = await queryUserContribute(params); if (res.code === 200) { - const { data } = res; - const userList = data.sort(sortExp('contribute', false)); - this.personalData = userList.slice(0, 20); - this.personalMaxNum = userList[0].contribute; + if (this.personalForm.contributeType === 'comment') { + const { data } = res; + if ( + JSON.stringify(this.checkedComment) === + JSON.stringify(['General']) + ) { + const GeneralList = data.sort(sortExp('valid_comment', false)); + this.personalData = GeneralList.slice(0, 20); + this.personalMaxNum = GeneralList[0].valid_comment; + } else if ( + JSON.stringify(this.checkedComment) === JSON.stringify(['Order']) + ) { + const OrderList = data.sort(sortExp('invalid_comment', false)); + this.personalData = OrderList.slice(0, 20); + this.personalMaxNum = OrderList[0].invalid_comment; + } else { + const List = data.sort(sortExp('contribute', false)); + this.personalData = List.slice(0, 20); + this.personalMaxNum = List[0].contribute; + } + } else { + const { data } = res; + const userList = data.sort(sortExp('contribute', false)); + this.personalData = userList.slice(0, 20); + this.personalMaxNum = userList[0].contribute; + } } } catch (error) { console.log(error); @@ -46,4 +69,4 @@ export const usePersonalStore = defineStore('personal', { return state.personalData.slice(10, 20); }, }, -}); +}); \ No newline at end of file diff --git a/packages/euler/src/views/contributors/Index.vue b/packages/euler/src/views/contributors/Index.vue index 69970e0..d140e2b 100644 --- a/packages/euler/src/views/contributors/Index.vue +++ b/packages/euler/src/views/contributors/Index.vue @@ -1,55 +1,54 @@ @@ -145,7 +158,7 @@ const goToUser = (data: IObject) => {
@@ -153,17 +166,17 @@ const goToUser = (data: IObject) => {

- {{ t("companyContributor") }} + {{ t('companyContributor') }}

404 -

{{ t("searchTips") }}

+

{{ t('searchTips') }}

{{ - t("viewOrganizationDetail") + t('viewOrganizationDetail') }} {
-

{{ t("userContributor") }}

+

{{ t('userContributor') }}

{

Top 1-10

- + {
- + + @@ -227,7 +255,11 @@ const goToUser = (data: IObject) => {

Top 11-20

- + {
- + + @@ -270,9 +314,6 @@ const goToUser = (data: IObject) => {
-