Merge remote-tracking branch 'yx/250207-growth-prod-master_1202-zp' into test20250220

src/views/growth/index.vue

@@ -45,14 +45,12 @@
         <div class="progress-content">
           <div class="f-j-b" style="margin-bottom: 10px">
             <div class="f-a-c">
-              <div style=" font-size: 16px; color: #333333">
+              <div style="font-size: 16px; color: #333333">必修进度</div>
-                必修进度
-              </div>
               <div style="font-size: 18px; color: #999999; margin-left: 12px">
                 {{ item.requiredTaskCompletedNum }}/{{ item.requiredTaskNum }}
               </div>
             </div>
-            <div style=" font-size: 18px; color: #0077ec">
+            <div style="font-size: 18px; color: #0077ec">
               {{ requiredTaskCompletionRate(item) }}%
             </div>
           </div>
@@ -63,41 +61,39 @@
             color="#0077EC"
           ></el-progress>
         </div>
-        <div class="progress-content">
+        <template v-if="item.electiveTaskNum !== 0">
-          <div class="f-j-b" style="margin-bottom: 10px">
+          <div class="progress-content">
-            <div class="f-a-c">
+            <div class="f-j-b" style="margin-bottom: 10px">
-              <div style="font-size: 16px; color: #333333">
+              <div class="f-a-c">
-                选修进度
+                <div style="font-size: 16px; color: #333333">选修进度</div>
+                <div style="font-size: 18px; color: #999999; margin-left: 12px">
+                  {{ item.electiveTaskCompletedNum }}/{{ item.electiveTaskNum }}
+                </div>
+                <el-tooltip
+                  class="item"
+                  effect="light"
+                  :content="`还需完成${item.electivePoorNum}个选修任务`"
+                  placement="top-start"
+                >
+                  <i class="el-icon-question"></i>
+                </el-tooltip>
               </div>
-              <div style="font-size: 18px; color: #999999; margin-left: 12px">
+              <div style="font-size: 18px; color: #0077ec">
-                {{ item.electiveTaskCompletedNum }}/{{ item.electiveTaskNum }}
+                {{ electiveTaskCompletionRate(item) }}%
               </div>
-              <el-tooltip
-                class="item"
-                effect="light"
-                :content="`还需完成${item.electivePoorNum}个选修任务`"
-                placement="top-start"
-              >
-                <i class="el-icon-question"></i>
-              </el-tooltip>
-            </div>
-            <div style=" font-size: 18px; color: #0077ec">
-              {{ electiveTaskCompletionRate(item) }}%
             </div>
+            <el-progress
+              :stroke-width="6"
+              :show-text="false"
+              color="#0077EC"
+              :percentage="electiveTaskCompletionRate(item)"
+            ></el-progress>
           </div>
-          <el-progress
+        </template>
-            :stroke-width="6"
-            :show-text="false"
-            color="#0077EC"
-            :percentage="electiveTaskCompletionRate(item)"
-          ></el-progress>
-        </div>
         <div class="progress-content">
           <div class="f-j-b" style="margin-bottom: 10px">
             <div class="f-a-c">
-              <div style=" font-size: 16px; color: #333333">
+              <div style="font-size: 16px; color: #333333">总进度</div>
-                总进度
-              </div>
               <div style="font-size: 18px; color: #999999; margin-left: 12px">
                 {{ item.totalTaskCompletedNum }}/{{ item.totalTaskNum }}
               </div>
@@ -174,6 +170,8 @@ export default {
           num = num * 100;
           num = num.toFixed(0);
           return Number(num);
+        } else if (item.electiveTaskNum == 0) {
+          return 100;
         } else {
           return 0;
         }
@@ -245,7 +243,7 @@ export default {
   justify-content: center;
 }
 .growth {
-  .empty{
+  .empty {
     height: 600px;
     display: flex;
     justify-content: center;