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

src/views/growth/index.vue

@@ -45,19 +45,19 @@
         <div class="progress-content">
           <div class="f-j-b" style="margin-bottom: 10px">
             <div class="f-a-c">
-              <div style="font-weight: 700; font-size: 16px; color: #333333">
+              <div style=" font-size: 16px; color: #333333">
                 必修进度
               </div>
-              <div style="font-size: 20px; color: #999999; margin-left: 12px">
+              <div style="font-size: 18px; color: #999999; margin-left: 12px">
                 {{ item.requiredTaskCompletedNum }}/{{ item.requiredTaskNum }}
               </div>
             </div>
-            <div style="font-weight: bold; font-size: 20px; color: #0077ec">
+            <div style=" font-size: 18px; color: #0077ec">
               {{ requiredTaskCompletionRate(item) }}%
             </div>
           </div>
           <el-progress
-            :stroke-width="8"
+            :stroke-width="6"
             :show-text="false"
             :percentage="requiredTaskCompletionRate(item)"
             color="#0077EC"
@@ -66,27 +66,27 @@
         <div class="progress-content">
           <div class="f-j-b" style="margin-bottom: 10px">
             <div class="f-a-c">
-              <div style="font-weight: 700; font-size: 16px; color: #333333">
+              <div style="font-size: 16px; color: #333333">
                 选修进度
               </div>
-              <div style="font-size: 20px; color: #999999; margin-left: 12px">
+              <div style="font-size: 18px; color: #999999; margin-left: 12px">
                 {{ item.electiveTaskCompletedNum }}/{{ item.electiveTaskNum }}
               </div>
               <el-tooltip
                 class="item"
-                effect="dark"
+                effect="light"
-                :content="`需完成${item.electivesCompletedNum}个选修任务`"
+                :content="`还需完成${item.electivePoorNum}个选修任务`"
                 placement="top-start"
               >
                 <i class="el-icon-question"></i>
               </el-tooltip>
             </div>
-            <div style="font-weight: bold; font-size: 20px; color: #0077ec">
+            <div style=" font-size: 18px; color: #0077ec">
               {{ electiveTaskCompletionRate(item) }}%
             </div>
           </div>
           <el-progress
-            :stroke-width="8"
+            :stroke-width="6"
             :show-text="false"
             color="#0077EC"
             :percentage="electiveTaskCompletionRate(item)"
@@ -95,19 +95,19 @@
         <div class="progress-content">
           <div class="f-j-b" style="margin-bottom: 10px">
             <div class="f-a-c">
-              <div style="font-weight: 700; font-size: 16px; color: #333333">
+              <div style=" font-size: 16px; color: #333333">
                 总进度
               </div>
-              <div style="font-size: 20px; color: #999999; margin-left: 12px">
+              <div style="font-size: 18px; color: #999999; margin-left: 12px">
                 {{ item.totalTaskCompletedNum }}/{{ item.totalTaskNum }}
               </div>
             </div>
-            <div style="font-weight: bold; font-size: 20px; color: #0077ec">
+            <div style="font-size: 18px; color: #0077ec">
               {{ totalTaskCompletionRate(item) }}%
             </div>
           </div>
           <el-progress
-            :stroke-width="8"
+            :stroke-width="6"
             :show-text="false"
             color="#0077EC"
             :percentage="totalTaskCompletionRate(item)"
@@ -117,6 +117,11 @@
           <img src="@/assets/images/growth/growth-bg-icon.png" />
         </div>
       </div>
+      <template v-if="!list.length">
+        <div class="empty">
+          <el-empty :image-size="200"></el-empty>
+        </div>
+      </template>
     </div>
     <!-- <template v-if="!list || list.length < 2">
       <div class="growth-right">
@@ -134,10 +139,6 @@
         </div>
       </div>
     </template> -->
-
-    <template v-if="!list.length">
-      <el-empty :image-size="200"></el-empty>
-    </template>
   </div>
 </template>
 <script>
@@ -244,6 +245,13 @@ export default {
   justify-content: center;
 }
 .growth {
+  .empty{
+    height: 600px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-color: #ffffff;
+  }
   .el-icon-question {
     color: #387df7;
     font-size: 16px;
@@ -269,7 +277,7 @@ export default {
         bottom: 0;
       }
       .progress-title {
-        font-weight: 700;
+        // font-weight: 700;
         font-size: 18px;
         color: #000000;
         margin: 28px 0 20px 0;
@@ -278,15 +286,15 @@ export default {
         margin-bottom: 28px;
       }
       .tip-title {
-        font-weight: 700;
+        // font-weight: 700;
         font-size: 18px;
         color: #000000;
         margin: 30px 0 10px 0;
       }
       .tip-content {
-        font-size: 15px;
+        font-size: 16px;
         color: #333333;
-        line-height: 22px;
+        line-height: 30px;
       }
       .growth-nav {
         display: flex;
@@ -296,7 +304,7 @@ export default {
         border-bottom: 2px solid #f5f5f5;
       }
       .growth-name {
-        font-weight: 500;
+        font-weight: bold;
         font-size: 18px;
         color: #0071ed;
       }
@@ -328,7 +336,7 @@ export default {
       background-size: 100% 100%;
       .nav-title {
         font-weight: 700;
-        font-size: 22px;
+        font-size: 18px;
         margin-right: 10%;
       }
       .nav-total {