From 837143f60ccbd28cbb235e91df012095def5c6e1 Mon Sep 17 00:00:00 2001
From: Pengxiansen <2422914688@qq.com>
Date: Tue, 25 Feb 2025 09:28:42 +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

---
 src/views/growth/growthList.vue | 82 ++++++++++++++-------------------
 vite.config.js                  |  2 +-
 2 files changed, 36 insertions(+), 48 deletions(-)

diff --git a/src/views/growth/growthList.vue b/src/views/growth/growthList.vue
index fb9abaf..64566ad 100644
--- a/src/views/growth/growthList.vue
+++ b/src/views/growth/growthList.vue
@@ -108,19 +108,30 @@
                         <el-progress
                           :percentage="parseInt(value.progress)"
                           :show-text="false"
-                          :stroke-width="4"
-                          :color="value.progress == 100 ? '#0077EC' : '#F2903D'"
+                          :stroke-width="6"
+                          :color="value.progress == 100 ? '#8BC34A' : '#F2903D'"
                         />
                       </div>
                       <div class="item-time">
                         <template v-if="value.completionStatus === '0'">
                           <div style="color: #999999">未开始</div>
                         </template>
-                        <template v-else>
-                          <div>
+                        <template v-else-if="value.completionStatus === '1'">
+                          <div style="color: #8bc34a">
                             {{ `已完成 ${value.progress}%` }}
                           </div>
                         </template>
+                        <template v-else-if="value.completionStatus === '2'">
+                          <div style="color: #f2903d">
+                            {{ `进行中 ${value.progress}%` }}
+                          </div>
+                        </template>
+                        <template v-if="value.completionStatus === '3'">
+                          <div style="color: #999999">已结束</div>
+                        </template>
+                        <template v-if="value.completionStatus === '10'">
+                          <div style="color: #999999">未解锁</div>
+                        </template>
 
                         <div style="color: #999999">
                           {{ `${value.createTime} 更新` }}
@@ -129,34 +140,19 @@
                     </div>
                   </div>
                   <div class="item-button">
-                    <template v-if="value.completionStatus === '10'">
-                      <div @click="toFinish(value)" style="background: #999">
-                        未解锁
-                      </div>
-                    </template>
-                    <template v-if="value.completionStatus === '0'">
-                      <div
-                        @click="toFinish(value)"
-                        :style="{
-                          background: value.canLearn ? '#f2903d' : '#999',
-                        }"
-                      >
-                        未开始
-                      </div>
-                    </template>
-                    <template v-if="value.completionStatus === '2'">
+                    <template
+                      v-if="
+                        value.completionStatus === '2' ||
+                        (value.completionStatus === '0' && value.canLearn)
+                      "
+                    >
                       <div @click="toFinish(value)" style="background: #f2903d">
                         {{ TASK_TYPES.toName[value.courseType] }}
                       </div>
                     </template>
                     <template v-if="value.completionStatus === '1'">
-                      <div @click="toFinish(value)" style="background: #2478ff">
-                        已完成
-                      </div>
-                    </template>
-                    <template v-if="value.completionStatus === '3'">
-                      <div @click="toFinish(value)" style="background: #999">
-                        已结束
+                      <div @click="toFinish(value)" style="background: #f2903d">
+                        继续学习
                       </div>
                     </template>
                   </div>
@@ -226,7 +222,7 @@
                           :percentage="totalProgress"
                           :show-text="false"
                           :stroke-width="8"
-                          :color="totalProgress == 100 ? '#0077EC' : '#F2903D'"
+                          :color="totalProgress == 100 ? '#8BC34A' : '#EB5D00'"
                         />
                       </div>
                       <div
@@ -251,16 +247,13 @@
                           :percentage="requiredProgress"
                           :show-text="false"
                           :stroke-width="8"
-                          :color="
-                            requiredProgress == 100 ? '#0077EC' : '#F2903D'
-                          "
+                          color="#FE9100"
                         />
                       </div>
                       <div
                         style="
                           font-size: 14px;
                           font-weight: 500;
-                          color: #277aff;
                           margin-left: 10px;
                           color: #677d86;
                         "
@@ -279,16 +272,13 @@
                           :percentage="electiveProgress"
                           :show-text="false"
                           :stroke-width="8"
-                          :color="
-                            electiveProgress == 100 ? '#0077EC' : '#F2903D'
-                          "
+                          color="#FEC200"
                         />
                       </div>
                       <div
                         style="
                           font-size: 14px;
                           font-weight: 500;
-                          color: #277aff;
                           margin-left: 10px;
                           color: #677d86;
                         "
@@ -634,14 +624,6 @@ async function toFinish(d) {
       openCourseList.value = d.offcoursePlanList;
       openCourseVisible.value = true;
       return;
-    } else if (d.offcoursePlanList && d.offcoursePlanList.length == 1) {
-      let date1 = new Date(d.offcoursePlanList[0].endTime).getTime();
-      let date2 = new Date().getTime();
-      if (date1 < date2) {
-        dialogVisibleTip.value = "当前课程已结束";
-        dialogVisible.value = true;
-        return
-      }
     }
   }
 
@@ -652,7 +634,7 @@ async function toFinish(d) {
     if (date1 < date2) {
       dialogVisibleTip.value = "当前作业已结束";
       dialogVisible.value = true;
-      return
+      return;
     }
   }
   // 直播结束时间
@@ -662,7 +644,7 @@ async function toFinish(d) {
     if (date1 < date2) {
       dialogVisibleTip.value = "当前直播已结束";
       dialogVisible.value = true;
-      return
+      return;
     }
   }
   // 考试 停用
@@ -709,7 +691,7 @@ async function toFinish(d) {
     if (date1 < date2) {
       dialogVisibleTip.value = "当前活动已结束";
       dialogVisible.value = true;
-      return
+      return;
     }
   }
 
@@ -857,6 +839,12 @@ async function toFinish(d) {
 }
 
 function toOffcoursePlanPage(item) {
+  let date1 = new Date(item.endTime).getTime();
+  let date2 = new Date().getTime();
+  if (date1 < date2) {
+    ElMessage.warning(`当前开课已结束`);
+    return;
+  }
   window.open(
     `${location.protocol}//${location.host}${
       import.meta.env.VITE_BASE_API
diff --git a/vite.config.js b/vite.config.js
index 71c6422..f6e1dbc 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -41,7 +41,7 @@ export default defineConfig(({ command, mode }) =>
 			"/professional": {
 				// target: 'http://192.168.16.195:32002',
 				// target: 'http://192.168.150.97:32002',
-				target: 'http://192.168.31.211:32002',
+				target: 'http://192.168.38.211:32002',
 				changeOrigin: true,
 			  },
 			// '/growth': {