diff --git a/code/db/常用语句.sql b/code/db/常用语句.sql index 723230e..517040e 100644 --- a/code/db/常用语句.sql +++ b/code/db/常用语句.sql @@ -1,3 +1,9 @@ SELECT * FROM reward_gainers - FOR UPDATE + FOR UPDATE; + +SELECT b.reward_name, + a.* + FROM reward_gainers a, + reward_projects b + WHERE a.reward_index = b.reward_index; diff --git a/code/web/task_schedule/src/components/ArchievementChartComponent.vue b/code/web/task_schedule/src/components/ArchievementChartComponent.vue index 115df9d..56e3433 100644 --- a/code/web/task_schedule/src/components/ArchievementChartComponent.vue +++ b/code/web/task_schedule/src/components/ArchievementChartComponent.vue @@ -67,8 +67,6 @@ export default { initCharts(); }); - console.log(props); - return { ui, initCharts, props, }; }, }; diff --git a/code/web/task_schedule/src/components/HonorListComponent.vue b/code/web/task_schedule/src/components/HonorListComponent.vue index 3069ec5..17915bd 100644 --- a/code/web/task_schedule/src/components/HonorListComponent.vue +++ b/code/web/task_schedule/src/components/HonorListComponent.vue @@ -43,14 +43,14 @@ export default { default: () => "本", }, leadingReward: { - type: String, + type: Array, require: true, - default: () => "", + default: () => ["",], }, advanceReward: { - type: String, + type: Array, require: true, - default: () => "", + default: () => ["",], }, }, setup() diff --git a/code/web/task_schedule/src/utils/archievement.ts b/code/web/task_schedule/src/utils/archievement.ts index 095b3e6..b77d070 100644 --- a/code/web/task_schedule/src/utils/archievement.ts +++ b/code/web/task_schedule/src/utils/archievement.ts @@ -16,7 +16,7 @@ interface Archievement success: boolean; message: string; total_archievement: number; - mensual_archievement_list: string[]; + mensual_archievement_list: number[]; insurance_renewal_rate: string; attaching_rate: string; leading_reward_gainers: string[]; diff --git a/code/web/task_schedule/src/views/DesktopArchievement.vue b/code/web/task_schedule/src/views/DesktopArchievement.vue index 56f6e45..d9d7dc3 100644 --- a/code/web/task_schedule/src/views/DesktopArchievement.vue +++ b/code/web/task_schedule/src/views/DesktopArchievement.vue @@ -8,7 +8,10 @@ * Copyright (c) ${2022} by Kane, All Rights Reserved. -->