From 67ceada31d59fb921fc48686a9e0668cf7119de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Mon, 24 Feb 2025 15:55:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=8E=A5=E5=8F=A3=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dashboard/project.js                      |  8 --------
 src/utils/enums.js                                |  1 +
 src/views/dashboard/ProjectRateChart.vue          | 15 +++++++++++----
 .../user/view/components/UserStatistics.vue       |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/api/dashboard/project.js b/src/api/dashboard/project.js
index a1468bb..855dd25 100644
--- a/src/api/dashboard/project.js
+++ b/src/api/dashboard/project.js
@@ -1,13 +1,5 @@
 import request from '@/utils/request'
 
-// 获取项目比率
-export function getDashboardProjectRate() {
-  return request({
-    url: '/dashboard/project/rate',
-    method: 'get'
-  })
-}
-
 // 获取每月项目进度概览
 export function getMonthProject(params) {
   return request({
diff --git a/src/utils/enums.js b/src/utils/enums.js
index 37b1cfa..58cbe04 100644
--- a/src/utils/enums.js
+++ b/src/utils/enums.js
@@ -115,6 +115,7 @@ export const BriefKeys = {
   // 项目
   PROJECT_STATUS: "projectStatus", // 项目状态
   PROJECT_DEV_COMPLETED: "projectDevCompleted", // 项目开发完成
+  PROJECT_DEV_ON_TIME_COMPLETED: "projectDevOnTimeCompleted", // 项目正常开发完成
   PROJECT_OVERDUE_DEV_UNCOMPLETED: "projectOverdueDevUncompleted", // 项目逾期开发未完成
   PROJECT_OVERDUE_DEV_COMPLETED: "projectOverdueDevCompleted", // 项目逾期开发完成
   PROJECT_DEV_OVERDUE: "projectDevOverdue", // 项目开发逾期
diff --git a/src/views/dashboard/ProjectRateChart.vue b/src/views/dashboard/ProjectRateChart.vue
index 0121af4..bee9ff9 100644
--- a/src/views/dashboard/ProjectRateChart.vue
+++ b/src/views/dashboard/ProjectRateChart.vue
@@ -5,8 +5,9 @@
 </template>
 
 <script>
-import { getDashboardProjectRate } from '@/api/dashboard/project';
 import * as echarts from 'echarts';
+import { getBrief } from '@/api/dashboard/dashboard';
+import { BriefKeys } from '@/utils/enums';
 
 export default {
   name: 'ProjectRateChart',
@@ -34,8 +35,14 @@ export default {
   methods: {
     getProjectRate() {
       this.loading = true;
-      getDashboardProjectRate().then(res => {
-        this.data = res.data;
+      getBrief({
+        keys: [
+          BriefKeys.PROJECT_STATUS,
+          BriefKeys.PROJECT_DEV_COMPLETED,
+          BriefKeys.PROJECT_DEV_OVERDUE
+        ]
+      }).then(res => {
+        this.data = res.data.project;
         this.updateChart();
       }).finally(() => {
         this.loading = false;
@@ -53,7 +60,7 @@ export default {
       let completionRate = 0;
       let overdueRate = 0;
       if (this.data != null && this.data.total != null && this.data.total != 0) {
-        completionRate = (this.data.completed / this.data.total * 100).toFixed(1);
+        completionRate = (this.data.devCompleted / this.data.total * 100).toFixed(1);
         overdueRate = (this.data.devOverdue / this.data.total * 100).toFixed(1);
       }
 
diff --git a/src/views/system/user/view/components/UserStatistics.vue b/src/views/system/user/view/components/UserStatistics.vue
index 2f15cc7..9f1df9a 100644
--- a/src/views/system/user/view/components/UserStatistics.vue
+++ b/src/views/system/user/view/components/UserStatistics.vue
@@ -57,7 +57,7 @@
       />
       <statistics-card
         style="flex: 1"
-        :value="project.devCompleted"
+        :value="project.devOnTimeCompleted"
         label="正常开发完成"
         icon="el-icon-circle-check"
         start-color="#67C23A"
@@ -115,7 +115,7 @@ export default {
       this.loading = true
       getBrief({ joinUserId: this.userId, keys: [
         BriefKeys.PROJECT_STATUS,
-        BriefKeys.PROJECT_DEV_COMPLETED,
+        BriefKeys.PROJECT_DEV_ON_TIME_COMPLETED,
         BriefKeys.PROJECT_OVERDUE_DEV_UNCOMPLETED,
         BriefKeys.PROJECT_OVERDUE_DEV_COMPLETED,
         BriefKeys.TASK_STATUS,