diff --git a/code/web/task_schedule/src/assets/img/ranking/copper_medal.png b/code/web/task_schedule/src/assets/img/ranking/copper_medal.png index a642175..2c296cf 100644 Binary files a/code/web/task_schedule/src/assets/img/ranking/copper_medal.png and b/code/web/task_schedule/src/assets/img/ranking/copper_medal.png differ diff --git a/code/web/task_schedule/src/assets/img/ranking/medal.png b/code/web/task_schedule/src/assets/img/ranking/medal.png index 2dd95d6..7c463a1 100644 Binary files a/code/web/task_schedule/src/assets/img/ranking/medal.png and b/code/web/task_schedule/src/assets/img/ranking/medal.png differ diff --git a/code/web/task_schedule/src/assets/img/ranking/stop.png b/code/web/task_schedule/src/assets/img/ranking/stop.png index 299e3ac..dfb1875 100644 Binary files a/code/web/task_schedule/src/assets/img/ranking/stop.png and b/code/web/task_schedule/src/assets/img/ranking/stop.png differ diff --git a/code/web/task_schedule/src/components/DishonorListComponent.vue b/code/web/task_schedule/src/components/DishonorListComponent.vue new file mode 100644 index 0000000..f6ce3d2 --- /dev/null +++ b/code/web/task_schedule/src/components/DishonorListComponent.vue @@ -0,0 +1,75 @@ + + + + + + \ No newline at end of file diff --git a/code/web/task_schedule/src/components/HonorListComponent.vue b/code/web/task_schedule/src/components/HonorListComponent.vue index 76e01f9..4de1b90 100644 --- a/code/web/task_schedule/src/components/HonorListComponent.vue +++ b/code/web/task_schedule/src/components/HonorListComponent.vue @@ -10,6 +10,20 @@ @@ -46,10 +60,10 @@ export default { background-color: $color-honorlist-bg; backdrop-filter: blur(10px); - padding: 15px; + padding: 10px; >*+* { - margin-top: 15px; + margin-top: 10px; } .title { @@ -63,5 +77,52 @@ export default { color: goldenrod; } + + .reward-wrapper { + width: 100%; + + display: flex; + justify-content: center; + align-items: stretch; + + >*+* { + margin-left: 10px; + } + + .leading-reward-wrapper { + width: 165px; + height: 100%; + + + } + + .advance-reward-wrapper { + width: 165px; + height: 100%; + } + + .banner-wrapper { + display: flex; + justify-content: center; + align-items: center; + + img { + width: 30px; + height: 30px; + } + + span { + display: inline-block; + text-align: center; + color: #fff; + + font: { + size: 1.5rem; + family: "FZ-ZHUOHEI"; + weight: 100; + } + } + } + } } \ No newline at end of file diff --git a/code/web/task_schedule/src/views/DesktopArchievement.vue b/code/web/task_schedule/src/views/DesktopArchievement.vue index 90f4d71..ce3f4f2 100644 --- a/code/web/task_schedule/src/views/DesktopArchievement.vue +++ b/code/web/task_schedule/src/views/DesktopArchievement.vue @@ -17,8 +17,8 @@
- - + +
@@ -26,6 +26,7 @@
+
@@ -42,6 +43,7 @@ import { ElMessage } from "element-plus"; import ArchievementChart from "@/components/ArchievementChartComponent.vue"; import ArchievementCompleteRateComponent from "@/components/ArchievementCompleteRateComponent.vue"; import HonorListComponent from "@/components/HonorListComponent.vue"; +import DishonorListComponent from "@/components/DishonorListComponent.vue"; export default { name: "DesktopArchievement", @@ -49,6 +51,7 @@ export default { ArchievementChart, ArchievementCompleteRateComponent, HonorListComponent, + DishonorListComponent, }, setup() { @@ -56,7 +59,8 @@ export default { const staffInfo = loadStaffInfo(); const ui = reactive({ chartData: [200, 230, 224, 218, 135, 147, 260, 800,], - totalArchievement: 456778, + totalArchievement: 120000000, + dishonorPersons: ["张三", "李四",], }); const getTotalArchievement = computed(() => @@ -100,11 +104,6 @@ export default { display: flex; justify-content: end; align-items: stretch; - - div { - // border: 1px solid red; - box-sizing: border-box; - } } .left-wrapper { @@ -198,6 +197,14 @@ export default { //奖励部分 // height: 280px; padding: 15px; + + display: flex; + justify-content: center; + align-items: center; + + >*+* { + margin-left: 15px; + } } } @@ -216,4 +223,9 @@ body { $color-bg-05, $color-bg-05); } + +div { + // border: 1px solid red; + box-sizing: border-box; +} \ No newline at end of file