提交

src/api/api.js

@@ -134,8 +134,8 @@ export const ROUTER_DETAIL_CHAPTER_LIST = `/stu/router/chapterPcList`
 
 
 /**专业力必修模块 */
-let baseUrl = "/growth"
+// let baseUrl = "/growth"
-// let baseUrl = ""
+let baseUrl = ""
 //查询专业力必修详情
 export const PROFESSIONAL_STUDENT_DETAIL = id => `${baseUrl}/professional/student/studentGrowthDetail/${id}`
 //查询专业力必修详情

src/views/growth/components/roadmap2/index.vue

@@ -276,6 +276,13 @@ const stateData = computed(() => {
         bgColor: "rgba(242, 144, 61, 0.2)",
         progressColor: "#F2903D",
       };
+    }else if (item.completionStatus === "3") {
+      return {
+        text: "已结束",
+        color: "#666666",
+        bgColor: "rgba(102, 102, 102, 0.2)",
+        progressColor: "#AEB3B8",
+      };
     }
   };
 });

src/views/growth/growthList.vue

@@ -15,10 +15,11 @@
         <template #dropdown>
           <el-dropdown-menu>
             <el-dropdown-item
+              @click="select(item)"
               :disabled="selectGrowth.id == item.id"
               v-for="item of growthList"
             >
-              <div @click="select(item)">{{ item.growthName }}</div>
+              <div>{{ item.growthName }}</div>
             </el-dropdown-item>
           </el-dropdown-menu>
         </template>
@@ -348,7 +349,6 @@
     <!-- 开课列表弹框 -->
     <el-dialog
       title=""
-      top="347px"
       v-model="openCourseVisible"
       :show-close="false"
       style="
@@ -409,10 +409,10 @@
               width: 320px;
             "
           >
-            {{ item }}
+            {{ item.name }}
           </div>
           <div
-            @click="toOffcoursePlanPage(openCourseIdList[key])"
+            @click="toOffcoursePlanPage(item)"
             style="
               width: 60px;
               height: 30px;
@@ -602,16 +602,11 @@ watch(
 );
 const openCourseVisible = ref(false);
 const openCourseList = ref([]);
-const openCourseIdList = ref([]);
 
 const dialogVisible = ref(false);
 const dialogVisibleTip = ref("该任务无法学习，请联系管理员进行替换！");
 
 async function toFinish(d) {
-  if (!d.canLearn) {
-    ElMessage.warning(`学习任务暂未开始`);
-    return;
-  }
   if (d.completionStatus == 3) {
     ElMessage.warning(`学习任务已结束无法学习`);
     return;
@@ -620,6 +615,11 @@ async function toFinish(d) {
     ElMessage.warning(`请先完成“${d.superTaskName}”的学习任务`);
     return;
   }
+  if (!d.canLearn && d.courseType != 2) {
+    ElMessage.warning(`学习任务暂未开始`);
+    return;
+  }
+
   //更新学员当前任务
   await growthRequest(PROFESSIONAL_STUDENT_LEARN, {
     growthId: routerId,
@@ -631,10 +631,17 @@ async function toFinish(d) {
       return ElMessage.error("还未添加开课,请联系管理员！");
     }
     if (d.targetId.split(",").length > 1) {
-      openCourseList.value = d.targetName?.split(",");
+      openCourseList.value = d.offcoursePlanList;
-      openCourseIdList.value = d.targetId?.split(",");
       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
+      }
     }
   }
 
@@ -645,7 +652,7 @@ async function toFinish(d) {
     if (date1 < date2) {
       dialogVisibleTip.value = "当前作业已结束";
       dialogVisible.value = true;
-      //return
+      return
     }
   }
   // 直播结束时间
@@ -655,7 +662,7 @@ async function toFinish(d) {
     if (date1 < date2) {
       dialogVisibleTip.value = "当前直播已结束";
       dialogVisible.value = true;
-      //return
+      return
     }
   }
   // 考试 停用
@@ -702,7 +709,7 @@ async function toFinish(d) {
     if (date1 < date2) {
       dialogVisibleTip.value = "当前活动已结束";
       dialogVisible.value = true;
-      //return
+      return
     }
   }
 
@@ -849,11 +856,11 @@ async function toFinish(d) {
   }
 }
 
-function toOffcoursePlanPage(id) {
+function toOffcoursePlanPage(item) {
   window.open(
     `${location.protocol}//${location.host}${
       import.meta.env.VITE_BASE_API
-    }/stu/project/redirectDetail?courseId=${id}`,
+    }/stu/project/redirectDetail?courseId=${item.id}`,
     "_top"
   );
 }

src/views/growth/growthRoadmap.vue

@@ -15,10 +15,11 @@
         <template #dropdown>
           <el-dropdown-menu>
             <el-dropdown-item
+              @click="select(item)"
               :disabled="selectGrowth.id == item.id"
               v-for="item of growthList"
             >
-              <div @click="select(item)">{{ item.growthName }}</div>
+              <div>{{ item.growthName }}</div>
             </el-dropdown-item>
           </el-dropdown-menu>
         </template>
@@ -231,7 +232,6 @@
     <!-- 开课列表弹框 -->
     <el-dialog
       title=""
-      top="347px"
       v-model="openCourseVisible"
       :show-close="false"
       style="
@@ -469,10 +469,6 @@ const dialogVisible = ref(false);
 const dialogVisibleTip = ref("该任务无法学习，请联系管理员进行替换！");
 
 async function toFinish(d) {
-  if (d.completionStatus == 0 || !d.canLearn) {
-    ElMessage.warning(`学习任务暂未开始`);
-    return;
-  }
   if (d.completionStatus == 3) {
     ElMessage.warning(`学习任务已结束无法学习`);
     return;
@@ -481,6 +477,10 @@ async function toFinish(d) {
     ElMessage.warning(`请先完成“${d.superTaskName}”的学习任务`);
     return;
   }
+  if (!d.canLearn && d.courseType != 2) {
+    ElMessage.warning(`学习任务暂未开始`);
+    return;
+  }
   //更新学员当前任务
   await growthRequest(PROFESSIONAL_STUDENT_LEARN, {
     growthId: routerId,

vite.config.js

@@ -38,16 +38,16 @@ export default defineConfig(({ command, mode }) =>
 	},
 	server: {
 		proxy: {
-			// "/professional": {
+			"/professional": {
-			// 	// target: 'http://192.168.16.195:32002',
+				// target: 'http://192.168.16.195:32002',
-			// 	// target: 'http://192.168.150.97:32002',
+				// target: 'http://192.168.150.97:32002',
-			// 	target: 'http://192.168.66.211:32002',
+				target: 'http://192.168.31.211:32002',
-			// 	changeOrigin: true,
-			//   },
-			'/growth': {
-				target: 'https://u-pre.boe.com',
 				changeOrigin: true,
-			},
+			  },
+			// '/growth': {
+			// 	target: 'https://u-pre.boe.com',
+			// 	changeOrigin: true,
+			// },
 			'/file/upload': {
 				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
 				changeOrigin: true,