diff --git a/code/web/task_schedule/src/assets/css/public/color.scss b/code/web/task_schedule/src/assets/css/public/color.scss index ed31f38..7bc31ed 100644 --- a/code/web/task_schedule/src/assets/css/public/color.scss +++ b/code/web/task_schedule/src/assets/css/public/color.scss @@ -5,4 +5,5 @@ $color-bg-03: #f27620; $color-bg-04: #da3703; $color-bg-05: #ba1800; -$color-charts-bg:#ffffff9f; \ No newline at end of file +$color-charts-bg:#ffffff9f; +$color-honorlist-bg: rgba(255, 255, 255, 0.3); \ No newline at end of file diff --git a/code/web/task_schedule/src/components/ArchievementChartComponent.vue b/code/web/task_schedule/src/components/ArchievementChartComponent.vue index 9c92e54..a6a1ea4 100644 --- a/code/web/task_schedule/src/components/ArchievementChartComponent.vue +++ b/code/web/task_schedule/src/components/ArchievementChartComponent.vue @@ -14,7 +14,7 @@ + + \ 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 15fcc53..90f4d71 100644 --- a/code/web/task_schedule/src/views/DesktopArchievement.vue +++ b/code/web/task_schedule/src/views/DesktopArchievement.vue @@ -13,7 +13,7 @@ 对标先进 比学赶超
总业绩 - ¥ {{ getTotalArchievement }} + {{ getTotalArchievement }}
@@ -24,7 +24,9 @@
-
+
+ +
@@ -39,12 +41,14 @@ import { loadStaffInfo } from "@/utils/api/localStorage.js"; import { ElMessage } from "element-plus"; import ArchievementChart from "@/components/ArchievementChartComponent.vue"; import ArchievementCompleteRateComponent from "@/components/ArchievementCompleteRateComponent.vue"; +import HonorListComponent from "@/components/HonorListComponent.vue"; export default { name: "DesktopArchievement", components: { ArchievementChart, ArchievementCompleteRateComponent, + HonorListComponent, }, setup() { @@ -57,7 +61,13 @@ export default { const getTotalArchievement = computed(() => { - const archievement = String(ui.totalArchievement).valueOf(); + const cnyFormat = new Intl.NumberFormat("zh-cn", + { + style: "currency", + currency: "CNY", + minimumFractionDigits: 0, + }); + const archievement = cnyFormat.format(ui.totalArchievement); return archievement; }); @@ -159,10 +169,15 @@ export default { justify-content: center; align-items: stretch; + >*+* { + margin-left: 15px; + } + .total-archievement-rate-wrapper { //业绩比例 - width: 25%; - min-width: 180px; + // width: 20%; + width: 140px; + min-width: 140px; display: flex; flex-direction: column; justify-content: center; @@ -171,7 +186,7 @@ export default { .total-archievement-charts-wrapper { //业绩图表 - width: 75%; + width: 70%; display: flex; justify-content: center; @@ -181,7 +196,8 @@ export default { .reward-wrapper { //奖励部分 - height: 240px; + // height: 280px; + padding: 15px; } }