From 315b01999db59aee0909d487b1e0772a423151f2 Mon Sep 17 00:00:00 2001
From: Pengxiansen <2422914688@qq.com>
Date: Fri, 14 Feb 2025 14:41:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development             |  1 +
 .env.preview                 |  1 +
 .env.production              |  1 +
 .env.testing                 |  1 +
 src/api/growth/growthpath.js |  4 +-
 src/views/growth/index.vue   | 75 ++++++++++++++++++++++++------------
 6 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/.env.development b/.env.development
index 104cf70a..bd03f4bf 100644
--- a/.env.development
+++ b/.env.development
@@ -41,6 +41,7 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
+VUE_APP_GROWTH_API_PATH=''
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.preview b/.env.preview
index bedbe676..efbfebd1 100644
--- a/.env.preview
+++ b/.env.preview
@@ -37,6 +37,7 @@ VUE_APP_PUBLIC_PATH='/pc-release'
 VUE_APP_MANAGER_PATH='/manage-release'
 VUE_APP_STUDENT_PATH='/fe-student-release'
 VUE_APP_MANAGER_API_PATH='/manageApi-release'
+VUE_APP_GROWTH_API_PATH='/growth'
 
 # 登录地址
 VUE_APP_LOGIN_URL='https://u.boe.com/web-release/'
diff --git a/.env.production b/.env.production
index 195e48a9..c63a65a8 100644
--- a/.env.production
+++ b/.env.production
@@ -37,6 +37,7 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
+VUE_APP_GROWTH_API_PATH='/growth'
 
 # 登录地址
 VUE_APP_LOGIN_URL='https://u.boe.com/web/'
diff --git a/.env.testing b/.env.testing
index d6c3ac9f..b0e73f37 100644
--- a/.env.testing
+++ b/.env.testing
@@ -36,6 +36,7 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
+VUE_APP_GROWTH_API_PATH='/growth'
 
 # 登录地址
 VUE_APP_LOGIN_URL='https://u-pre.boe.com/web/'
diff --git a/src/api/growth/growthpath.js b/src/api/growth/growthpath.js
index 793e7e15..c6bb7390 100644
--- a/src/api/growth/growthpath.js
+++ b/src/api/growth/growthpath.js
@@ -1,6 +1,6 @@
 // import ajax from '@/utils/xajax.js'
 import ajax from '../ajax';
-// const baseURL = '';
-const baseURL = '/growth';
+const baseURL = process.env.VUE_APP_GROWTH_API_PATH;
+// const baseURL = '/growth';
 // 查询专业力必修列表
 export const listData = (obj) => ajax.get(baseURL, '/professional/student/studentGrowthList', { params: obj })
diff --git a/src/views/growth/index.vue b/src/views/growth/index.vue
index 8c90c826..ffe3c54c 100644
--- a/src/views/growth/index.vue
+++ b/src/views/growth/index.vue
@@ -41,7 +41,44 @@
 
     <section class="container">
       <template v-if="list.length">
-        <div class="title">{{ selectData.growthName }}</div>
+        <div class="title">
+          <div style="font-size: 20px">
+            {{ selectData.growthName }}
+          </div>
+          <div style="display: flex; align-items: center">
+            <div style="display: flex">
+              <div style="font-size: 18px; color: #333">学习状态：</div>
+              <div
+                style="font-size: 18px"
+                :style="{
+                  color:
+                    selectData.learningState === 0
+                      ? '#fe9400'
+                      : selectData.learningState === 1
+                      ? '#6ba158'
+                      : '#0079ee',
+                }"
+              >
+                {{
+                  selectData.learningState === 0
+                    ? "未开始"
+                    : selectData.learningState === 1
+                    ? "已完成"
+                    : "进行中"
+                }}
+              </div>
+            </div>
+            <div class="learning f-j-c">
+              <el-button
+                style="width: 100px; margin-left: 16px"
+                type="primary"
+                @click="jumpRouter"
+              >
+                学习
+              </el-button>
+            </div>
+          </div>
+        </div>
         <div class="content">
           <div class="tip">
             <div class="tip-title f-a-c">
@@ -66,7 +103,7 @@
                 <div class="item-title">必修进度</div>
                 <div class="item-progress">
                   <el-progress
-                    :stroke-width="12"
+                    :stroke-width="14"
                     :text-inside="true"
                     :percentage="requiredTaskCompletionRate"
                   ></el-progress>
@@ -82,7 +119,7 @@
                 <div class="item-title">选修进度</div>
                 <div class="item-progress">
                   <el-progress
-                    :stroke-width="12"
+                    :stroke-width="14"
                     :text-inside="true"
                     :percentage="electiveTaskCompletionRate"
                   ></el-progress>
@@ -98,7 +135,7 @@
                 <div class="item-title">总进度</div>
                 <div class="item-progress">
                   <el-progress
-                    :stroke-width="12"
+                    :stroke-width="14"
                     :text-inside="true"
                     :percentage="totalTaskCompletionRate"
                   ></el-progress>
@@ -112,11 +149,6 @@
               </div>
             </div>
           </div>
-          <div class="learning f-j-c">
-            <el-button style="width: 100px" type="primary" @click="jumpRouter">
-              学习
-            </el-button>
-          </div>
         </div>
       </template>
       <template v-else>
@@ -188,23 +220,11 @@ export default {
       this.selectData = item;
     },
     jumpRouter() {
-      //location.href=`${this.webBaseUrl}/course/boeframe?id=${item.cmtask_id}`;
-
-      //let urlPre=window.location.protocol+'//'+window.location.host;
       let studentPath = process.env.VUE_APP_STUDENT_PATH;
-      if (this.selectData.template == 1) {
-        //路径图
-        let params = encodeURIComponent("routerId=" + this.selectData.id);
-        this.$router.push(
-          "/forward?to=" + studentPath + "/growthRoadmap&params=" + params
-        );
-      } else if (this.selectData.template == 2) {
-        //任务列表
-        let params = encodeURIComponent("routerId=" + this.selectData.id);
-        this.$router.push(
-          "/forward?to=" + studentPath + "/growthList&params=" + params
-        );
-      }
+      let params = encodeURIComponent("routerId=" + this.selectData.id);
+      this.$router.push(
+        "/forward?to=" + studentPath + "/growthList&params=" + params
+      );
     },
   },
   created() {
@@ -241,6 +261,8 @@ export default {
 }
 .container {
   .title {
+    display: flex;
+    justify-content: space-between;
     margin-top: 30px;
     padding: 25px 40px;
     font-size: 18px;
@@ -289,10 +311,12 @@ export default {
         display: flex;
         justify-content: flex-end;
         margin-right: 20px;
+        font-size: 18px;
       }
       .item-progress {
         width: 400px;
         position: relative;
+        font-size: 18px;
         .mask {
           position: absolute;
           left: 0;
@@ -307,6 +331,7 @@ export default {
       }
       .item-text {
         color: #409eff;
+        margin-left: 8px;
       }
       ::v-deep.el-progress-bar__innerText {
         display: none;