From b70e9714aaf5e68a796900a6e6512e47c99dfb74 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Mon, 6 Mar 2023 23:40:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=9B=BE=E5=BF=85=E4=BF=AE=E8=BF=9B=E5=BA=A6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/roadmap/PathDetails.vue | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index ccf5713..bb4f469 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -219,7 +219,7 @@
                 <div class="progress">
                   <div style="width: 291px">
                     <el-progress
-                      :percentage="parseInt((((data.currentReqCnt || 0) / (data.totalReqCnt || 1)) * 100) / 20)"
+                      :percentage="parseInt((((data.currentReqCnt || 0) / (data.totalReqCnt || 1)) * 100))"
                       :show-text="false" :stroke-width="8" :color="
                         {
                           0: 'rgba(238, 112, 108, 1)',
@@ -231,21 +231,18 @@
                         }[parseInt((((data.currentReqCnt || 0) / (data.totalReqCnt || 1)) * 100) / 20)]
                       "/>
                   </div>
-                  <div style="
-                                      font-size: 14px;
-                                      font-weight: 500;
-                                      color: #277aff;
-                                      margin-left: 10px;
-                                    " :style="{
-                                      color: {
-                                        0: 'rgba(238, 112, 108, 1)',
-                                        1: 'rgba(255, 151, 38, 1)',
-                                        2: 'rgba(39, 122, 255, 1)',
-                                        3: 'rgba(59, 94, 251, 1)',
-                                        4: 'rgba(57, 219, 183, 1)',
-                                        5: 'rgba(57, 219, 183, 1)',
-                                      }[parseInt((((data.currentReqCnt || 0) / (data.totalReqCnt || 1)) * 100) / 20)],
-                                    }">
+                  <div 
+                    style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;" 
+                    :style="{
+                        color: {
+                          0: 'rgba(238, 112, 108, 1)',
+                          1: 'rgba(255, 151, 38, 1)',
+                          2: 'rgba(39, 122, 255, 1)',
+                          3: 'rgba(59, 94, 251, 1)',
+                          4: 'rgba(57, 219, 183, 1)',
+                          5: 'rgba(57, 219, 183, 1)',
+                        }[parseInt((((data.currentReqCnt || 0) / (data.totalReqCnt || 1)) * 100) / 20)],
+                      }">
                     {{ parseInt((data.currentReqCnt || 0) / (data.totalReqCnt || 1) * 100) }}%
                   </div>
                 </div>

From f4f45e58b617f80096b0924492cdc0623b78789a Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Tue, 7 Mar 2023 00:55:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=BA=A6=E5=B0=8F=E7=BB=84=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=BA=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api.js                       | 2 +-
 src/views/project/ProjectDetails.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index 5f5dc6c..e6d384f 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -88,7 +88,7 @@ export const QueryDiscussSubmitDetailByDiscussId = '/discussSubmit/queryDiscussS
 export const EvaluationToLearn = '/evaluation/evaluationToLearn post'
 
 // 个人/小组完成度排行
-export const CompletionList = `/stu/project/rank_list/completion_list`
+export const CompletionList = `/stu/project/rank_list/project_rank_list`
 
 // 积分排行榜
 export const PointList = `/stu/project/rank_list/point_list`
diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index ccc5121..d3ef708 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -229,7 +229,7 @@
               <!-- <div style="font-size: 14px;color: rgba(51, 51, 51, 1);font-weight: 600;">完成度排行榜</div> -->
               <el-select @change="choiceStatus" v-model="stateValue" class="m-2" mode="tags" placeholder="完成度排行榜"
                 style="width: 130px;border: 0px solid red !important; box-shadow:none !important; ">
-                <el-option v-for="item in studyProgress" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="item in studyProgress" :key="item.value" :label="item.label" :value="item.value" :disabled="item.label.includes('小组') && data.groupId==null?true:false" :title="item.label.includes('小组') && data.groupId==null?'当前学员无小组':''"/>
               </el-select>
             </div>
             <!-- line -->