Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-stu into release

# Conflicts:
#	vite.config.js

.env

@@ -9,6 +9,7 @@ VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
 VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
 VITE_BOE_TEST_OUT_DETAIL_URL=https://u-pre.boe.com/api/b1/tale/do-quiz?quizKid=
 VITE_BOE_EXAM_DETAIL_URL=https://u-pre.boe.com/pc/exam/test?id=
+VITE_BOE_PATH_DETAIL_URL=http://u-pre.boe.com/pc/forward?to=/fe-student
 
 VITE_BOE_API_URL=https://u-pre.boe.com
 

.env.release

@@ -7,5 +7,6 @@ VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
 VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
 VITE_BOE_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid=
 VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc-release/exam/test?id=
+VITE_BOE_PATH_DETAIL_URL=http://u.boe.com/pc/forward?to=/fe-student-release
 
 VITE_BOE_API_URL=https://u.boe.com

src/App.vue

@@ -7,17 +7,10 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
-  <!-- <div
+   <!--
-    style="
+ -->
-      background: #0078fc;
-      height: 150px;
-      width: 100%;
-      position: absolute;
-      top: 0;
-      z-index: 1;
-    "
-  ></div> -->
   <div id="container">
+ 
     <!-- <div id="nav">
       <router-link
         v-for="item in routes"
@@ -43,7 +36,7 @@ import {useStore} from "vuex";
 import {onMounted} from "vue";
 import router from "@/router";
 
-console.log("版本1.0.1------------");
+console.log("版本1.0.5------------");
 const store = useStore();
 onMounted(() => {
   getUserInfo();

src/api/api.js

@@ -57,4 +57,6 @@ export const ASSESSMENT_SUBMIT = '/stu/task/evaluate/commit post'
 export const ACTIVITY = '/activity'
 
 export const STUDY_RECORD = '/stu/task/thirdTask/submit post'
-export const PROJECT_LIST = '/stu/project/list post'
+export const PROJECT_LIST = '/stu/project/list post'
+
+export const FACETEACH_SIGNUP = `/stu/project/stuFaceTeachSignUp`

src/components/FileTypeImg.vue

@@ -1,7 +1,6 @@
 <template>
-  <img class="file"
+	<img class="file" :style="style"
-       :style="style"
+		:src="{ pdf, doc: word, ppt, zip, excel, xlsx: excel, xls: excel, rar, book, md, docx: word, png }[filePath.split('.').slice(-1)] || book" />
-       :src="{pdf,doc:word,ppt,zip,excel,xlsx:excel,xls:excel,rar,book,md,docx:word}[filePath.split('.').slice(-1)] || book"/>
 </template>
 <script setup>
 import rar from '@/assets/image/file/rar.png'
@@ -12,20 +11,20 @@ import ppt from '@/assets/image/file/ppt.png'
 import word from '@/assets/image/file/word.png'
 import zip from '@/assets/image/file/zip.png'
 import book from '@/assets/image/file/book.png'
-import {defineProps, ref} from "vue";
+import { defineProps, ref } from "vue";
 
-const {modelValue = [], style} = defineProps({
+const { modelValue = "", style } = defineProps({
-  modelValue: String,
+	modelValue: String,
-  style: {
+	style: {
-    type: Object,
+		type: Object,
-    default: {}
+		default: {}
-  }
+	}
 })
 const filePath = ref(modelValue)
 </script>
 <style lang="scss">
 .file {
-  width: 22px;
+	width: 22px;
-  height: 26px;
+	height: 26px;
 }
 </style>

src/components/PathDetailImage.vue

@@ -0,0 +1,82 @@
+<template>
+  <div class="pathDetail" v-if="visiable" :style="{background:`url('${back}') no-repeat`}">
+    <div v-for="(item,i) in detail.chapterDtoList" :key="i" class="cha"
+         :style="{top:`${imgAttr.positions[i]?.top - (current===i?5:0)}px`,left:`${imgAttr.positions[i]?.left - (current===i?10:0)}px`}">
+      <div @click="toDetail(i)"
+           :style="{background: `url('${current===i?currentBack:nameBack}')`,backgroundSize:'100%',width:`${current===i?139:123}px`,height:`${current===i?60:53}px`,textAlign:'center',lineHeight:'45px',fontsize:'12px',color:'#FFF'}">
+        {{ item.name }}
+      </div>
+    </div>
+  </div>
+</template>
+<script setup>
+import {computed, defineProps, ref, watch} from "vue";
+import back from '@/assets/image/pathdetails/组 21.png'
+import nameBack from '@/assets/image/pathdetails/组 23.png'
+import currentBack from '@/assets/image/pathdetails/组 23(1).png'
+import {useRouter} from "vue-router/dist/vue-router";
+
+const props = defineProps({
+  value: String,
+  img: String,
+  detail: {
+    type: Object,
+    default: {}
+  }
+})
+const router = useRouter();
+const visiable = ref(true)
+const imageAttrs = {
+  '路径图背景-1671015331292.png': {
+    width: 1437,
+    height: 594,
+    positions: [
+      {left: 84, top: 518},
+      {left: 307, top: 370},
+      {left: 848, top: 275},
+      {left: 617, top: 69},
+      {left: 1047, top: 42},
+    ]
+  }
+}
+
+const imgAttr = computed(() => imageAttrs[Object.keys(imageAttrs).find(e => props.img.includes(e))] || {})
+
+const current = computed(() => props.detail.chapterDtoList.findIndex(e => e.chapterId === props.detail.currentStageId))
+
+function show() {
+  visiable.value = true
+}
+
+function toDetail(i) {
+  if (current.value !== i) {
+    return
+  }
+  import.meta.env.MODE === "development"
+      ? router.push({
+        path: "/pathdetails",
+        query: {routerId: props.detail.routerId, routerName: props.detail.routerName},
+      })
+      : window.open(
+          `${import.meta.env.VITE_BOE_PATH_DETAIL_URL}/pathdetails&params=${encodeURIComponent(
+              `routerId=${props.detail.routerId}&routerName=${props.detail.routerName}`
+          )}`
+      );
+}
+
+function close() {
+  visiable.value = false
+}
+</script>
+<style lang="scss">
+.pathDetail {
+  width: 100%;
+  height: 1011px;
+  position: relative;
+}
+
+.cha {
+  position: absolute;
+  cursor: pointer;
+}
+</style>

src/views/ballot/BallotPage.vue

@@ -16,14 +16,10 @@
       </div>
 -->
 <div class="return">
-      <div style="display: flex" @click="returnclick">
+				<div style="display: flex" @click="returnclick">
-                  <img
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-                    class="img2" style="margin-right:22px;"
+				</div>
-                    src="../../assets/image/return.png"
+			</div>
-                  />
-                  <div class="text">返回</div>
-        </div>
-    </div>
     </div>
     <!-- 面包屑导航 -->
     <div class="debateTitle">【投票】{{ dataInfo?.voteName }}</div>

src/views/debate/DebatePage.vue

@@ -15,14 +15,10 @@
         <button class="btn btn02" style="margin-left: 6px"></button>
       </div>-->
       <div class="return">
-      <div style="display: flex" @click="returnclick">
+				<div style="display: flex" @click="returnclick">
-                  <img
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-                    class="img2" style="margin-right:22px;"
+				</div>
-                    src="../../assets/image/return.png"
+			</div>
-                  />
-                  <div class="text">返回</div>
-        </div>
-    </div>
     </div>
     <!-- 面包屑导航 -->
     <div class="debateTitle">

src/views/discuss/DiscussPage.vue

@@ -29,14 +29,10 @@
         </div>
       </div>-->
       <div class="return">
-      <div style="display: flex" @click="returnclick">
+				<div style="display: flex" @click="returnclick">
-                  <img
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-                    class="img2" style="margin-right:22px;"
+				</div>
-                    src="../../assets/image/return.png"
+			</div>
-                  />
-                  <div class="text">返回</div>
-        </div>
-    </div>
     </div>
     <!-- 面包屑导航 -->
     <!-- 标题 -->

src/views/discussdetail/DiscussDetail.vue

@@ -30,14 +30,10 @@
       </div>-->
 
       <div class="return">
-      <div style="display: flex" @click="returnclick">
+				<div style="display: flex" @click="returnclick">
-                  <img
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-                    class="img2" style="margin-right:22px;"
+				</div>
-                    src="../../assets/image/return.png"
+			</div>
-                  />
-                  <div class="text">返回</div>
-        </div>
-    </div>
     </div> 
     <!-- 面包屑导航 -->
     <!-- 标题 -->

src/views/examination/ExamPage.vue

@@ -29,14 +29,10 @@
         </div>
       </div>-->
       <div class="return">
-      <div style="display: flex" @click="returnclick">
+				<div style="display: flex" @click="returnclick">
-                  <img
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-                    class="img2" style="margin-right:22px;"
+				</div>
-                    src="../../assets/image/return.png"
+			</div>
-                  />
-                  <div class="text">返回</div>
-        </div>
-    </div>
     </div>
     <!-- 面包屑导航 -->
     <!-- 标题 -->

src/views/faceteach/FaceTeachSignUp.vue

@@ -0,0 +1,504 @@
+<template>
+	<div style=" background: #0078fc;height: 150px;width: 100%;position: absolute;top: 0;z-index:-9999;"></div>
+	<div class="faceteach" style="padding: 30px">
+		<!-- 面包屑导航 -->
+		<div class="crumb">
+			<div>课程列表</div>
+			<div style="margin-left: 6px; margin-right: 6px">/</div>
+			<div style="font-weight: 700">课程报名</div>
+
+
+			<div v-if="pName != ''" class="return">
+				<div style="display: flex" @click="returnclick">
+					<el-button style="color:#0073FB"> <img class="img2" style="margin-right:11px;cursor: pointer;"
+							src="../../assets/image/return.png" />返回</el-button>
+				</div>
+			</div>
+		</div>
+		<!-- 面包屑导航 -->
+
+		<!-- 基本信息 -->
+		<div class="bascinfo">
+			<div style="display:flex;">
+				<img style="width:405px;height:230px;margin-left: 48px;border-radius: 8px;margin-top: 40px;"
+					:src="data.offcourseDto.picUrl" alt="">
+				<div style="margin-left: 40px;margin-top: 56px;">
+					<div class="title">【面授课】{{ data.planDto?.name }}</div>
+					<div class="time" style="margin-top: 30px">
+						<img style="width: 15px; height: 17px" src="../../assets/image/time.png" />
+						<div style="margin-left: 8px">
+							{{ dayjs(data.planDto?.beginTime).format('YYYY-MM-DD HH:MM') + " 至 " +
+									dayjs(data.planDto?.endTime).format('YYYY-MM-DD HH:MM')
+							}}
+						</div>
+					</div>
+					<div v-if="data.planDto.address" class="time" style="margin-top: 10px">
+						<img style="width: 16px; height: 18px" src="../../assets/image/position.png" />
+						<div style="margin-left: 8px">{{ data.planDto?.address }}</div>
+					</div>
+					<div class="time" style="margin-top: 37px">
+						<botton class="btn" style="margin-right: 20px;width: 160px;height: 46px;" @click="onLineSignUp">立即报名
+						</botton>
+					</div>
+				</div>
+			</div>
+			<div style="display: flex">
+			</div>
+		</div>
+		<!-- 基本信息 -->
+
+		<!-- 详细信息 -->
+		<div class="detailinfo">
+			<div class="detail">
+				<div class="detailB">
+					<el-tabs v-model="activeName" @tab-click="handleClick">
+						<el-tab-pane label="课程介绍" name="first">
+							<div class="notice" style="padding:20px;font-size:14px;">
+								{{ data.offcourseDto?.intro || "暂无课程介绍" }}
+							</div>
+						</el-tab-pane>
+						<el-tab-pane label="课程大纲" name="second">
+							<div style="display: flex; align-items: center">
+								<div style="padding:20px;" class="content" v-html="data.offcourseDto?.outline"></div>
+							</div>
+						</el-tab-pane>
+						<!-- <el-tab-pane label="课程评论" name="third" :disabed=dayjs().isBefore(dayjs(data.planDto.beginTime))>
+
+						</el-tab-pane> -->
+						<el-tab-pane label="材料下载" name="third" :disabed=dayjs().isBefore(dayjs(data.planDto.beginTime))>
+							<div v-if="data.offcourseDto?.attach == ''"
+								style="font-size: 14px;font-weight: 400; line-height: 24px; cursor: pointer;margin-left: 40px; margin-top: 20px;">
+								此课程无附件
+							</div>
+							<div v-else>
+								<div v-for="(el, index) in formateArr(data.offcourseDto.attach)" :key="index" class="enclosure"
+									:style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
+									<div class="enclosureL">
+										<FileTypeImg :v-model="el.slice(el.indexOf('-') + 1)" :style="{
+											width: '22px',
+											height: '26px',
+											marginLeft: '10px',
+										}"></FileTypeImg>
+										<div style="margin-left: 20px">{{ el.slice(el.indexOf('-') + 1) }}</div>
+									</div>
+									<div class="download">
+										<img style="width: 16px; height: 15px" src="../../assets/image/download.png" />
+										<div style="margin-left: 5px;color:#999;">
+											下载
+										</div>
+										<!-- <div style="margin-left: 5px;color:#999;" @click="download(el)">
+											下载
+										</div> -->
+									</div>
+								</div>
+							</div>
+						</el-tab-pane>
+					</el-tabs>
+				</div>
+			</div>
+			<div class="teacher">
+				<div class="title">
+					<img style="width: 21px; height: 23px" src="../../assets/image/livelecturer.png" />
+					<div class="text">面授课讲师</div>
+					<div class="box"></div>
+				</div>
+				<!--        todo #面授课接口 讲师缺少img和介绍-->
+				<div class="teacheritem">
+					<img class="peopleimg" :src="teacherInfo.avatar" />
+					<div class="nameSpan">
+						<div class="teacherName" style="margin-right: 5px">
+							{{ data.planDto?.teacher }}
+						</div>
+						<div class="introduce">{{ data.planDto?.bandDesc }}</div>
+					</div>
+					<!--          <div class="follow">+ 关注</div>-->
+				</div>
+			</div>
+		</div>
+		<!-- 详细信息 -->
+	</div>
+</template>
+
+<script setup>
+import { computed, reactive, toRefs, watch, onUnmounted } from "vue";
+import FileTypeImg from "@/components/FileTypeImg.vue";
+import { request, useRequest } from "@/api/request";
+import {
+	STU_OFFCOURSE_DETAIL,
+	TASK_OFFCOURSE_NOTASK_SIGN,
+	TASK_OFFCOURSE_SIGN,
+	TASK_BROADCAST_SIGN,
+	FACETEACH_SIGNUP
+} from "@/api/api";
+import { useRoute, useRouter } from "vue-router";
+import { useUserInfo } from "@/api/utils";
+import { ElMessage, messageConfig } from "element-plus";
+import dayjs from "dayjs";
+const router = useRouter();
+const returnclick = () => {
+	router.back();
+};
+const {
+	query: { courseId, type, id: taskId },
+} = useRoute();
+
+const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId });
+console.log("datadatadatadatadatadatadata", data);
+const teacherInfo = useUserInfo(
+	computed(() => data.value?.planDto?.teacherId)
+);
+
+const state = reactive({
+	activeName: "first",
+	enclosure: "",
+	isAllowSign: false,
+});
+const { activeName, enclosure, isAllowSign } = toRefs(state);
+const handleClick = (tab, event) => {
+	console.log("附件", tab, event);
+};
+const download = (url) => {
+	window.open(url);
+};
+const downloads = (url) => {
+	ElMessage.warning("未到开始时间，请耐心等待！");
+};
+let timer = null;
+
+// 报名
+function onLineSignUp() {
+	request(FACETEACH_SIGNUP, { courseId }).then(res => {
+		console.log(res)
+		if (res.code == 200) {
+			ElMessage.success("报名成功");
+		}
+	}).catch(err => {
+		console.log(err)
+	});
+}
+
+function formateArr(strs) {
+	let arrs = strs.split(',')
+	console.log('112233', arrs)
+	return arrs
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss">
+.faceteach {
+	.crumb {
+		color: #fff;
+		display: flex;
+		font-size: 14px;
+		line-height: 24px;
+	}
+
+	.bascinfo {
+		width: 100%;
+		height: 310px;
+		border-radius: 8px;
+		background-color: rgba(255, 255, 255, 1);
+		margin-top: 37px;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.btn {
+			width: 146px;
+			height: 46px;
+			background: #2478ff;
+			border-radius: 4px;
+			box-shadow: 0px 1px 8px 0px rgba(56, 125, 247, 0.7);
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fff;
+			font-size: 14px;
+			font-weight: 800;
+			line-height: 24px;
+			cursor: pointer;
+			margin-right: 96px;
+		}
+
+		.title {
+			font-size: 20px;
+			font-weight: 800;
+			color: #333333;
+			line-height: 24px;
+			margin-left: -9px;
+		}
+
+		.time {
+			font-size: 14px;
+			color: #6e7b84;
+			line-height: 24px;
+			display: flex;
+			align-items: center;
+		}
+	}
+
+	.return {
+		position: absolute;
+		right: 10%;
+
+		.text {
+			text-align: center;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+		}
+	}
+
+	.detailinfo {
+		width: 100%;
+		margin-top: 20px;
+		display: flex;
+		align-items: flex-start;
+
+		.detail {
+			flex: 1;
+			margin-right: 20px;
+
+			.detailT {
+				min-height: 263px;
+				background: #ffffff;
+				border-radius: 8px;
+				color: rgba(51, 51, 51, 1);
+
+				.title {
+					display: flex;
+					align-items: center;
+					padding-top: 39px;
+					position: relative;
+				}
+
+				.title .text {
+					margin-left: 8px;
+					font-size: 16px;
+					color: rgba(51, 51, 51, 1);
+					font-weight: 800;
+				}
+
+				.title .box {
+					width: 75px;
+					height: 10px;
+					background-color: rgba(36, 120, 255, 0.15);
+					position: absolute;
+					left: 23px;
+					top: 53px;
+				}
+
+				.content {
+					margin-left: 8px;
+					font-size: 14px;
+					color: rgba(51, 51, 48, 1);
+					font-weight: 500;
+					line-height: 35px;
+					margin-top: 30px;
+					padding-bottom: 30px;
+				}
+			}
+
+			.detailB {
+				min-height: 363px;
+				background: #ffffff;
+				border-radius: 8px;
+				margin-top: 20px;
+
+				.wenxintishi {
+					display: flex;
+					justify-content: stretch;
+					padding: 72px;
+				}
+
+				.el-tabs__item {
+					height: 69px;
+					padding: 25px 7px 0px 52px;
+					font-size: 14px;
+					font-weight: 500;
+				}
+
+				.el-tabs__nav-wrap::after {
+					background-color: rgba(56, 125, 247, 0.2);
+				}
+
+				.enclosure {
+					height: 89px;
+					margin-left: 51px;
+					margin-right: 40px;
+					// border-bottom: 1px solid rgba(56, 125, 247, 0.2);
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					.enclosureL {
+						display: flex;
+						align-items: center;
+						font-size: 14px;
+						font-weight: 400;
+						color: #677d86;
+						line-height: 24px;
+					}
+
+					.download {
+						display: flex;
+						align-items: center;
+						font-size: 16px;
+						font-weight: 400;
+						color: #2478ff;
+						line-height: 24px;
+						cursor: pointer;
+					}
+				}
+
+				.work {
+					margin-left: 51px;
+					margin-right: 40px;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-top: 37px;
+				}
+
+				.work .question {
+					font-size: 14px;
+					font-weight: 500;
+					color: #333330;
+					line-height: 18px;
+				}
+
+				.work .submit {
+					width: 126px;
+					height: 46px;
+					background: #2478ff;
+					box-shadow: 0px 1px 8px 0px rgba(56, 125, 247, 0.7);
+					border-radius: 4px;
+					font-size: 16px;
+					font-weight: 800;
+					color: #ffffff;
+					line-height: 24px;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					cursor: pointer;
+				}
+			}
+		}
+
+		.teacher {
+			width: 434px;
+			min-height: 500px;
+			// height: 10%;
+			background-color: rgba(255, 255, 255, 1);
+			border-radius: 8px;
+
+			.title {
+				display: flex;
+				align-items: center;
+				padding-top: 39px;
+				position: relative;
+				margin-left: 48px;
+			}
+
+			.title .text {
+				margin-left: 8px;
+				font-size: 16px;
+				color: rgba(51, 51, 51, 1);
+				font-weight: 800;
+			}
+
+			.title .box {
+				width: 75px;
+				height: 10px;
+				background-color: rgba(36, 120, 255, 0.15);
+				position: absolute;
+				left: 23px;
+				top: 53px;
+			}
+
+			.teacheritem {
+				margin-left: 48px;
+				margin-right: 48px;
+				// min-height: 115px;
+				margin-top: 20px;
+				padding: 25px 0px;
+				display: flex;
+				position: relative;
+
+				// align-items: center;
+			}
+
+			.teacheritem .peopleimg {
+				width: 60px;
+				height: 60px;
+				border-radius: 30px;
+			}
+
+			.teacheritem {
+				.nameSpan {
+					width: 190px;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+
+					.teacherName {
+						font-size: 14px;
+						font-weight: bold;
+						color: #394145;
+						display: flex;
+						align-items: center;
+					}
+				}
+
+
+			}
+
+			.teacheritem {
+				.nameSpan {
+					width: 190px;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+
+					.teacherName {
+						font-size: 14px;
+						font-weight: bold;
+						color: #394145;
+						display: flex;
+						align-items: center;
+					}
+				}
+
+			}
+
+			.teacheritem .introduce {
+				font-size: 14px;
+				font-weight: 500;
+				color: #394145;
+				margin-top: 14px;
+			}
+
+			.teacheritem .follow {
+				width: 80px;
+				height: 30px;
+				background: #387df7;
+				border-radius: 4px;
+				margin-top: 28px;
+				position: absolute;
+				right: -25px;
+				font-size: 14px;
+				font-weight: 500;
+				color: #ffffff;
+				line-height: 24px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				cursor: pointer;
+			}
+		}
+
+
+	}
+}
+</style>

src/views/homework/HomeworkPage.vue

@@ -1,4 +1,5 @@
 <template>
+	<div style=" background: #0078fc;height: 150px;width: 100%;position: absolute;top: 0;z-index:-9999;"></div>
 	<div class="homework" style="padding: 30px">
 		<!-- 面包屑导航 -->
 		<div class="crumb">
@@ -14,13 +15,11 @@
         <span class="content" style="margin-left: 31px">下一个</span>
         <button class="btn btn02" style="margin-left: 6px"></button>
       </div>-->
-
+	   <div class="return">
-			<div class="return">
 				<div style="display: flex" @click="returnclick">
-					<img class="img2" style="margin-right: 22px;cursor: pointer;" src="../../assets/image/return.png" />
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-					<div style="cursor: pointer;" class="text">返回</div>
 				</div>
-			</div>
+		</div>
 		</div>
 		<!-- 面包屑导航 -->
 		<div class="debateTitle" style="color: #fff">
@@ -48,11 +47,12 @@
 								</div>
 							</div>
 						</div>
+						<div v-if="dayjs().isBefore(dayjs(data?.submitEndTime)) && dayjs(data?.submitStartTime).isBefore(dayjs())" >
 						<UploadImg v-model:value="fileList" ref="uploadRef">
 							<button class="shangchuan" style="cursor: pointer">
 								上传
 							</button>
-						</UploadImg>
+						</UploadImg></div>
 						<div class="uploadDetail"
 							:style="{ display: showFileList && fileList && fileList.length > 0 ? 'block' : 'none' }"
 							@mousemove="showFileList = 1" @mouseout="showFileList = 0" style="padding-top: 60px">
@@ -108,16 +108,22 @@
 							<div class="text">作业内容</div>
 							<div class="box"></div>
 						</div>
-
+						<div v-if="dayjs().isBefore(dayjs(data?.submitEndTime)) && dayjs(data?.submitStartTime).isBefore(dayjs())" >
-						<div class="join">
+							<el-input   v-model="sbValue.content" :autosize="{ minRows: 12.5, maxRows: 12.5 }" resize="none"
-							<el-input v-model="sbValue.content" :autosize="{ minRows: 12.5, maxRows: 12.5 }" resize="none"
 								type="textarea" />
 						</div>
+						<div v-else class="join">
+							<el-input disabled  v-model="sbValue.content" :autosize="{ minRows: 12.5, maxRows: 12.5 }" resize="none"
+								type="textarea" />
+						</div>
+						
+					
+						<div v-if="dayjs().isBefore(dayjs(data?.submitEndTime)) && dayjs(data?.submitStartTime).isBefore(dayjs())" >
 						<div style="display: flex; justify-content: center">
 							<button class="tijiao" @click="handleClick">{{ submitList && submitList.length > 0 ? "再次" : ""
 							}}提交</button>
 						</div>
-
+						</div>
 
 
 
@@ -149,9 +155,7 @@
 									</div>
 								</div>
 								<div class="content3">
-									<div>
+									<div><span style="margin-left: 10px">
-
-										<span style="margin-left: 10px">
 											<el-link target="_blank" type="primary" :href="value.workUploadAddress?.split(',')[0] || ''">{{
 													value.workUploadAddress?.split(',')[0].split('/').at(-1) ||
 													''
@@ -172,23 +176,12 @@
 				</div>
 				<div class="timebox clearfix">
 					<div class="innertime">
-						{{
+						{{data?.submitStartTime}}&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;{{data?.submitEndTime}}
-								data?.submitStartTime
-						}}&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;{{
-		data?.submitEndTime
-}}
 					</div>
 					<div class="endtime clearfix">
-						<div class="endtimetext">
+						<div v-if="dayjs(data?.submitEndTime).isBefore(dayjs())" class="endtimetext">改任务已结束</div>
-							距离结束还有&nbsp;&nbsp;
+						<div v-else class="endtimetext">距离结束还有&nbsp;&nbsp;<span class="te">{{parseInt(dayjs(data?.submitEndTime).diff(dayjs(), "minute") / 60)}}</span>&nbsp;&nbsp; 小时&nbsp;&nbsp;
-							<span class="te">{{
+						<span class="te">{{dayjs(data?.submitEndTime).diff(dayjs(), "minute") % 60}}</span>&nbsp;&nbsp;分钟</div>
-									parseInt(
-										dayjs(data?.submitEndTime).diff(dayjs(), "minute") / 60
-									)
-							}}</span>&nbsp;&nbsp; 小时&nbsp;&nbsp;<span class="te">{{
-		dayjs(data?.submitEndTime).diff(dayjs(), "minute") % 60
-}}</span>&nbsp;&nbsp;分钟
-						</div>
 					</div>
 				</div>
 				<div class="righttitle">
@@ -271,6 +264,7 @@ const showFileList = computed(() => {
 	return fileList.value.length
 })
 
+
 const handleClick = () => {
 	console.log(fileList.value, uploadRef.value)
 	if (!sbValue.value.content) {

src/views/moreActive/MoreActive.vue

@@ -1,4 +1,5 @@
 <template>
+  <div style=" background: #0078fc;height: 150px;width: 100%;position: absolute;top: 0;z-index:-9999;"></div>
   <div class="moreactive" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div class="crumb">
@@ -15,15 +16,10 @@
         <button class="btn btn02" style="margin-left: 6px"></button>
       </div>-->
       <div class="return">
-        <div style="display: flex" @click="returnclick">
+				<div style="display: flex" @click="returnclick">
-          <img
+          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
-            class="img2"
+				</div>
-            style="margin-right: 22px"
+			</div>
-            src="../../assets/image/return.png"
-          />
-          <div class="text">返回</div>
-        </div>
-      </div>
     </div>
     <!-- 面包屑导航 -->
 
@@ -49,13 +45,7 @@
           <div style="margin-left: 8px">{{ data?.activityAddress }}</div>
         </div>
       </div>
-      <botton
+      <botton class="btn" :style="{background: `${data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`, }" @click="signClick" >{{ data.signFlag ? "已签到" : "签到" }}
-        class="btn"
-        :style="{
-          background: `${data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
-        }"
-        @click="signClick"
-        >{{ data.signFlag ? "已签到" : "签到" }}
       </botton>
     </div>
     <!-- 基本信息 -->
@@ -151,6 +141,7 @@ import { request, useRequest } from "@/api/request";
 import { useRouter } from "vue-router";
 import { useRoute } from "vue-router/dist/vue-router";
 import { ElMessage } from "element-plus";
+import { reactive, onUnmounted } from "vue";
 const router = useRouter();
 const returnclick = () => {
   router.back();
@@ -158,20 +149,74 @@ const returnclick = () => {
 const {
   query: { courseId: activityId, id: taskId, type, pName, sName },
 } = useRoute();
+const state = reactive({
 
+	isAllowSign: false,
+});
 const { data } = useRequest(ACTIVITY, { activityId });
 const signClick = (tab, event) => {
   if (data.value.signFlag) {
     return;
   }
   data.value.signFlag = true;
-  ElMessage.info("签到成功");
+  ElMessage.warning("签到成功");
   request(TASK_ACTIVITY_SIGN, {
     courseId: activityId,
     taskId,
     type,
   });
 };
+let timer = null;
+//判断能否签到
+function isSignClick() {
+	timer = setInterval(() => {
+		let beginTime = new Date(data.activityStartTime).getTime();
+		let endTime = !data.afterSignIn
+			? new Date(data.activityEndTime).getTime()
+			: new Date(data.activityStartTime).getTime();
+		let nowTime = new Date().getTime();
+		if (data.beforeSignIn && data.afterSignIn) {
+			//有开始前有开始后
+			beginTime = beginTime - data.beforeSignIn * 60 * 1000;
+			endTime = endTime + data.afterSignIn * 60 * 1000;
+			console.log("1111");
+		} else if (
+			data.beforeSignIn &&
+			!data.afterSignIn
+		) {
+			//只有开始前无开始后
+			beginTime = beginTime - data.beforeSignIn * 60 * 1000;
+			console.log("11112222");
+		} else if (
+			!data.beforeSignIn &&
+			data.afterSignIn
+		) {
+			//无开始前有开始后
+			endTime = endTime + data.afterSignIn * 60 * 1000;
+			console.log("1111333");
+		}
+		if (nowTime < endTime && nowTime > beginTime) {
+			state.isAllowSign = true;
+		} else {
+			state.isAllowSign = false;
+		}
+		// console.log(
+		//   "isAllowSign",
+		//   state.isAllowSign,
+		//   nowTime,
+		//   endTime,
+		//   beginTime,
+		//   nowTime < endTime,
+		//   nowTime > beginTime
+		// );
+	}, 1000);
+}
+isSignClick();
+onUnmounted(() => {
+	if (timer) {
+		clearInterval(timer);
+	}
+});
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->

src/views/project/ProjectDetails.vue

@@ -1,19 +1,28 @@
 <template>
+	<div style=" background: #0078fc;height: 150px;width: 100%;position: absolute;top: 0;z-index:-9999;"></div>
 	<div class="pathdetails" style="padding: 30px">
 		<!-- 面包屑导航 -->
 		<div class="crumb">
-			     <div>{{data.name}}</div>
+			<div>{{ data.name }}</div>
-			     <div style="margin-left: 6px; margin-right: 6px">/</div>
+			<div style="margin-left: 6px; margin-right: 6px">/</div>
 			<div style="font-weight: 700">项目详情</div>
+<!--
+			<div class="return">
+				<div style="display: flex" @click="returnclick">
+					<el-button style="color:#0073FB"> <img class="img2" style="margin-right:11px;cursor: pointer;"
+							src="../../assets/image/return.png" />返回</el-button>
+				</div>
+			</div>
+			-->
 		</div>
 		<!-- 面包屑导航 -->
 		<div class="pdname">
-			{{ userInfo.bandDesc }} 
+			{{ userInfo.bandDesc }}
-			<span @click="introductionPro"  style="font-size:14px;color:#fff;margin-left: 33px;cursor: pointer;">简介
+			<el-popover v-if="data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300" :content="data.remark">
-				<span style="position: relative;top:1px;left:-3px;cursor: pointer;">></span>
+    <template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
-			</span>
+  </el-popover>
 		</div>
-		
+
 		<!-- 详细信息 -->
 		<div class="detailinfo">
 			<div class="detailL">
@@ -37,11 +46,20 @@
 						(e) => !whiteTypes(e.type)
 					)" :key="index">
 						<div style="width: 70%">
-							<div class="coursename" :title="value.name">{{ value.name }}</div>
+							<div v-if="value.name.length > 50" class="coursename" :title="value.name">
+							<el-popover ref="popover"  placement="right" trigger="hover" :width="300" :content="value.name">
+								<template #reference></template>
+							</el-popover>
+							</div>
+
+							<div v-else class="coursename" :title="value.name">{{ value.name }}</div>
 							<div class="coursetag">
-								<div class="tag1" style="margin-right: 11px; margin-top: 16px">
+								<div v-if="value.flag" class="tag1" style="margin-right: 11px; margin-top: 16px">
 									必修
 								</div>
+								<div v-else class="tag2" style="margin-right: 11px; margin-top: 16px">
+									选修
+								</div>
 								<div class="tag3" style="margin-right: 11px; margin-top: 16px">
 									{{ types.typeName[value.type] || "" }}
 								</div>
@@ -75,7 +93,7 @@
 								</div>
 							</div>
 						</div>
-						<div class="goclass" @click="toFinish(value, i.name, i.stageId)">
+						<div class="goclass" @click="toFinish(value, i.stageName, i.stageId)">
 							{{
 									value.status === 1
 										? "已完成"
@@ -109,7 +127,7 @@
 					<el-tabs v-model="activeName" @tab-click="handleClick">
 						<el-tab-pane label="课程公告" name="first">
 							<div class="notice">
-								{{ data.remark || "暂无公告" }}
+								{{ data.notice || "暂无公告" }}
 							</div>
 						</el-tab-pane>
 						<!--  
@@ -231,17 +249,13 @@
 		</div>
 		<!-- 详细信息 -->
 		<!-- 弹框提示信息 -->
-		<el-dialog
+		<el-dialog title="" top="347px" v-model="dialogVisible" :show-close="false"
-			title=""
-			top="347px"
-			v-model="dialogVisible"
-			:show-close="false"
 			style="display:flex;justify-content:center;align-items:center;height: 283px;padding:0;border-radius: 4px;"
 			width="502px">
 			<div style="width:288px;color:#333333;font-size: 22px;font-weight: 600;">{{ dialogVisibleTip }}</div>
 			<span slot="footer" style="display:inline-block;margin-top:60px;">
 				<el-button @click="dialogVisible = false" style="width:140px;height:40px;margin-right: 22px;">取消</el-button>
-				<el-button type="primary" @click="dialogVisible = false"  style="width:140px;height:40px;">确定</el-button>
+				<el-button type="primary" @click="dialogVisible = false" style="width:140px;height:40px;">确定</el-button>
 			</span>
 		</el-dialog>
 	</div>
@@ -272,9 +286,7 @@ const {
 	query: { courseId, projectId },
 } = useRoute();
 const router = useRouter();
-const returnclick = () => {
+
-	router.back();
-};
 const { data } = useRequest(PROJECT_PROCESS, {
 	projectId: projectId || courseId,
 });
@@ -363,25 +375,17 @@ const types = ref({
 const dialogVisible = ref(false);
 const dialogVisibleTip = ref('该任务无法学习，请联系管理员进行替换！');
 
-// function dialogVisible(){
-// 	return true;
-// }
 
-function introductionPro() {
+function toFinish(d, sName, chapterOrStageId) {
-	dialogVisibleTip.value =data.value.remark;
+	console.log("dddddd", d, sName, chapterOrStageId);
-	dialogVisible.value = true;
-}
-
-function toFinish(d, sName, chapterId) {
-	console.log("dddddd", d);
 	// 作业过期判断
 	if (d.type == 4) {
 		let date1 = new Date(d.endTime).getTime();
 		let date2 = new Date().getTime();
 		if (date1 < date2) {
-			dialogVisibleTip.value ='当前作业已结束';
+			dialogVisibleTip.value = '当前作业已结束';
 			dialogVisible.value = true;
-			// ElMessage.error("当前作业已结束")
+		
 			return
 		}
 	}
@@ -390,7 +394,7 @@ function toFinish(d, sName, chapterId) {
 		let date1 = new Date(d.endTime).getTime();
 		let date2 = new Date().getTime();
 		if (date1 < date2) {
-			dialogVisibleTip.value ='当前直播已结束';
+			dialogVisibleTip.value = '当前直播已结束';
 			dialogVisible.value = true;
 			return
 		}
@@ -399,7 +403,7 @@ function toFinish(d, sName, chapterId) {
 	if (d.type == 5) {
 		if (d.taskStatus == 1 || d.taskStatus == 2) {
 			// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
-			dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
+			dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
 			dialogVisible.value = true;
 			return
 		}
@@ -408,7 +412,7 @@ function toFinish(d, sName, chapterId) {
 	if (d.type == 11) {
 		if (d.taskStatus == 1 || d.taskStatus == 2) {
 			// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
-			dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
+			dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
 			dialogVisible.value = true;
 			return
 		}
@@ -418,7 +422,7 @@ function toFinish(d, sName, chapterId) {
 		let date1 = new Date(d.endTime).getTime();
 		let date2 = new Date().getTime();
 		if (date1 < date2) {
-			dialogVisibleTip.value ='当前活动已结束';
+			dialogVisibleTip.value = '当前活动已结束';
 			dialogVisible.value = true;
 			return
 		}
@@ -427,7 +431,7 @@ function toFinish(d, sName, chapterId) {
 	if (d.type == 1) {
 		if (d.taskStatus == 1 || d.taskStatus == 2) {
 			// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
-			dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
+			dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
 			dialogVisible.value = true;
 			return
 		}
@@ -436,7 +440,7 @@ function toFinish(d, sName, chapterId) {
 	if (d.type == 2) {
 		if (d.taskStatus == 1 || d.taskStatus == 2) {
 			// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
-			dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
+			dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
 			dialogVisible.value = true;
 			return
 		}
@@ -466,9 +470,12 @@ function toFinish(d, sName, chapterId) {
 				query: {
 					id: d.projectTaskId,
 					type: 2,
+					taskId: data.value.projectId,
+					taskIds: data.value.projectId,
 					courseId: d.courseId,
 					pName: data.value.name,
 					sName,
+					chapterOrStageId
 				},
 			});
 	} else if (typeof types.value.path[d.type] === "function") {
@@ -481,15 +488,31 @@ function whiteTypes(type) {
 </script>
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss">
+.example-showcase .el-loading-mask {
+  z-index: 9;
+}
 .pathdetails {
 	.el-dialog__header {
 		display: none;
 	}
+
 	.crumb {
 		color: #fff;
 		display: flex;
 		font-size: 14px;
 		line-height: 24px;
+
+		.return {
+			position: absolute;
+			right: 10%;
+
+			.text {
+				text-align: center;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+			}
+		}
 	}
 
 	.pdname {

src/views/project/ProjectManage.vue

@@ -7,11 +7,11 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
-  <div class="projectManage">
+	<div class="projectManage">
-    <div class="content">
+		<div class="content">
-      <div class="title">我的项目</div>
+			<div class="title">我的项目</div>
-      <div class="search">
+			<div class="search">
-        <!-- <el-select v-model="value" class="m-2" placeholder="Select">
+				<!-- <el-select v-model="value" class="m-2" placeholder="Select">
           <el-option
             v-for="item in projectClassify"
             :key="item.value"
@@ -27,88 +27,59 @@
             :value="item.value"
           />
         </el-select> -->
-        <div style="width: 200px; margin-right: 20px">
+				<div style="width: 200px; margin-right: 20px">
-          <el-input v-model="projectname" placeholder="请输入项目名称" />
+					<el-input v-model="projectname" placeholder="请输入项目名称" />
-        </div>
+				</div>
-        <div style="width: 420px">
+				<div style="width: 420px">
-          <el-date-picker
+					<el-date-picker v-model="searchTime" type="daterange" range-separator="To" start-placeholder="开始时间" end-placeholder="结束时间" :size="size" @change="selectTime"/>
-            v-model="searchTime"
+					
-            type="datetimerange"
+				</div>
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            @change="selectTime"
-          />
-        </div>
 
-        <button
+				<button class="searchBtn" @click="searchClick" style="margin-left: 20px">
-          class="searchBtn"
+					搜索
-          @click="searchClick"
+				</button>
-          style="margin-left: 20px"
+				<button class="searchBtn" @click="resetClick">重置</button>
-        >
+			</div>
-          搜索
+			<div class="projectList" v-if="!projectList.length" style="display:flex;color:#909399;">
-        </button>
+				<img class="img2" style="margin-left:359px;margin-top:100px;width:148px;height:220px;"
-        <button class="searchBtn" @click="resetClick">重置</button>
+					src="../../assets/image/notask.png" />
-      </div>
+			</div>
-      <div class="projectList" v-if="projectList.length==0" style="display:flex;color:#909399;">
+			<div v-else class="projectList" v-for="(i, k) in projectList" :key="k">
-        <img
+				<div style="display: flex">
-            class="img2"
+					<img style="width: 253px; height: 144px; border-radius: 4px" :src="i.picUrl" />
-            style="margin-left: 675px;margin-top: 165px;width:148px;height:220px;"
+					<div style="margin-left: 29px">
-            src="../../assets/image/notask.png"
+						<div class="projectName" :title="i.name">
-          />
+							{{ i.name }}
-      </div>
+						</div>
-      <div v-else class="projectList" v-for="(i, k) in projectList" :key="k">
+						<div class="progress">
-        <div style="display: flex">
+							<div class="progressNow">当前进度：</div>
-          <img
+							<div style="width: 115px">
-            style="width: 253px; height: 144px; border-radius: 4px"
+								<el-progress :percentage="parseInt(i.finishTaskNum / i.totalTaskNum * 100)" :show-text="false"
-            :src="i.picUrl"
+									:stroke-width="8" color="rgba(255, 160, 80, 1)" />
-          />
+							</div>
-          <div style="margin-left: 29px">
+							<div class="progressNum">
-            <div class="projectName" :title="i.name">
+								{{
-              {{ i.name }}
+										(i.finishTaskNum && i.totalTaskNum) ? parseInt(i.finishTaskNum / i.totalTaskNum * 100) : 0
-            </div>
+								}}%
-            <div class="progress">
+							</div>
-              <div class="progressNow">当前进度：</div>
+						</div>
-              <div style="width: 115px">
+						<div class="studyNew" v-if="i.lastStudyTime">最新一次学习时间：{{ i.lastStudyTime }}</div>
-                <el-progress
+					</div>
-                  :percentage="parseInt(i.finishTaskNum / i.totalTaskNum) * 100"
+				</div>
-                  :show-text="false"
+				<div class="tobestarted" v-if="i.status == 2" @click="goProjectDetails(i)">
-                  :stroke-width="8"
+					待开始
-                  color="rgba(255, 160, 80, 1)"
+				</div>
-                />
+				<div class="gostudy" v-if="i.status == 0" @click="goProjectDetails(i)">
-              </div>
+					去学习
-              <div class="progressNum">
+				</div>
-                {{
+				<div class="finish" v-if="i.status == 1" @click="goProjectDetails(i)">
-                  i.finishTaskNum && i.totalTaskNum
+					已完成
-                    ? parseInt(i.finishTaskNum / i.totalTaskNum) * 100
+				</div>
-                    : 0
+				<div class="tobestarted" v-if="i.status == 3" @click="goProjectDetails(i)">
-                }}%
+					已结束
-              </div>
+				</div>
-            </div>
+			</div>
-            <div class="studyNew">最新一次学习时间：{{ i.lastStudyTime }}</div>
+			<!-- <div
-          </div>
-        </div>
-        <div
-          class="tobestarted"
-          v-if="i.status == 2"
-          @click="goProjectDetails(i)"
-        >
-          待开始
-        </div>
-        <div class="gostudy" v-if="i.status == 0" @click="goProjectDetails(i)">
-          去学习
-        </div>
-        <div class="finish" v-if="i.status == 1" @click="goProjectDetails(i)">
-          已完成
-        </div>
-        <div
-          class="tobestarted"
-          v-if="i.status == 3"
-          @click="goProjectDetails(i)"
-        >
-          已结束
-        </div>
-      </div>
-      <!-- <div
         style="display: flex; justify-content: center; margin-top: 30px"
         v-if="projectTotal > 10"
       >
@@ -123,17 +94,17 @@
           />
         </div>
       </div> -->
-    </div>
+		</div>
-  </div>
+	</div>
 </template>
 <script setup>
 import { reactive, toRefs, ref, onMounted, computed } from "vue";
 
 import { boeRequest, request, usePage, useRequest } from "@/api/request";
 import {
-  ROUTER_CHAPTER_LIST,
+	ROUTER_CHAPTER_LIST,
-  PROJECT_LIST,
+	PROJECT_LIST,
-  ROUTER_UNCOMPLETE_LIST,
+	ROUTER_UNCOMPLETE_LIST,
 } from "@/api/api";
 
 import { useRouter } from "vue-router";
@@ -154,24 +125,24 @@ const userInfo = computed(() => store.state.userInfo);
 
 //获取项目列表--------start------------------------------------
 const getProject = () => {
-  request(PROJECT_LIST, {
+	request(PROJECT_LIST, {
-    beginTime: beginTime.value,
+		beginTime: beginTime.value,
-    endTime: endTime.value,
+		endTime: endTime.value,
-    key: projectname.value,
+		key: projectname.value,
-    pageNo: currentPage.value,
+		pageNo: currentPage.value,
-    pageSize: pageSize.value,
+		pageSize: pageSize.value,
-  })
+	})
-    .then((res) => {
+		.then((res) => {
-      console.log("获取成功", res);
+			console.log("获取成功", res);
-      if (res.code === 200) {
+			if (res.code === 200) {
-        projectList.value = res.data.rows;
+				projectList.value = res.data.rows;
-        projectTotal.value = Number(res.data.total);
+				projectTotal.value = Number(res.data.total);
-        console.log("projectTotal.value", projectTotal.value);
+				console.log("projectTotal.value", projectTotal.value);
-      }
+			}
-    })
+		})
-    .catch((err) => {
+		.catch((err) => {
-      console.log("获取失败", err);
+			console.log("获取失败", err);
-    });
+		});
 };
 getProject();
 
@@ -180,169 +151,189 @@ getProject();
 
 //搜索
 const searchClick = () => {
-  console.log("点击搜索", projectname.value, searchTime.value);
+	console.log("点击搜索", projectname.value, searchTime.value);
 
-  if (searchTime.value) {
+	if (searchTime.value) {
-    beginTime.value = toDate(
+		beginTime.value = toDate(
-      new Date(searchTime.value[0]).getTime() / 1000,
+			new Date(searchTime.value[0]).getTime() / 1000,
-      "Y-M-D h:m:s"
+			"Y-M-D h:m:s"
-    );
+		);
-    endTime.value = toDate(
+		endTime.value = toDate(
-      new Date(searchTime.value[1]).getTime() / 1000,
+			new Date(searchTime.value[1]).getTime() / 1000,
-      "Y-M-D h:m:s"
+			"Y-M-D h:m:s"
-    );
+		);
-  }
+	}
-  console.log("beginTime", beginTime.value, endTime.value);
+	console.log("beginTime", beginTime.value, endTime.value);
-  getProject();
+	getProject();
 };
 //重置
 const resetClick = () => {
-  searchTime.value = "";
+	searchTime.value = "";
-  projectname.value = "";
+	projectname.value = "";
-  currentPage.value = 1;
+	currentPage.value = 1;
-  beginTime.value = "";
+	beginTime.value = "";
-  endTime.value = "";
+	endTime.value = "";
-  getProject();
+	getProject();
-  console.log("点击重置");
+	console.log("点击重置");
 };
 //搜索--------------end-----------------------------------------
 const router = useRouter();
 const goProjectDetails = (value) => {
-  router.push({
+	import.meta.env.MODE === "development"
-    path: "/projectdetails",
+		? router.push({
-    query: { projectId: value.projectId },
+			path: "/projectdetails",
-  });
+			query: { projectId: value.projectId },
+		})
+		: window.open(
+			`${import.meta.env.VITE_BOE_PATH_DETAIL_URL}/projectdetails&params=${encodeURIComponent(
+				`projectId=${value.projectId}`
+			)}`
+		);
 };
 </script>
 <style lang="scss">
 .projectManage {
-  width: 100%;
+	width: 100%;
-  min-height: 800px;
+	min-height: 800px;
-  //border-radius: 8px;
+	//border-radius: 8px;
-  background-color: rgba(255, 255, 255, 1);
+	background-color: rgba(255, 255, 255, 1);
-  display: flex;
+	display: flex;
-  // background-color: #ccc;
+
-  .content {
+	// background-color: #ccc;
-    width: 100%;
+	.content {
-    // flex: 1;
+		width: 100%;
-    margin-top: 50px;
+		// flex: 1;
-    margin-left: 81px;
+		margin-top: 50px;
-    .title {
+		margin-left: 81px;
-      font-size: 18px;
+
-      font-weight: 600;
+		.title {
-      color: #333333;
+			font-size: 18px;
-      line-height: 25px;
+			font-weight: 600;
-    }
+			color: #333333;
-    .search {
+			line-height: 25px;
-      margin-top: 31px;
+		}
-      display: flex;
+
-      align-items: center;
+		.search {
-      .searchBtn {
+			margin-top: 31px;
-        width: 100px;
+			display: flex;
-        height: 35px;
+			align-items: center;
-        border-radius: 8px;
+
-        display: flex;
+			.searchBtn {
-        justify-content: center;
+				width: 100px;
-        align-items: center;
+				height: 35px;
-        background: #387df7;
+				border-radius: 8px;
-        border: 1px solid #387df7;
+				display: flex;
-        color: #ffffff;
+				justify-content: center;
-        cursor: pointer;
+				align-items: center;
-        margin-left: 10px;
+				background: #387df7;
-      }
+				border: 1px solid #387df7;
-    }
+				color: #ffffff;
-    .projectList {
+				cursor: pointer;
-      margin-top: 40px;
+				margin-left: 10px;
-      display: flex;
+			}
-      justify-content: space-between;
+		}
-      align-items: center;
+
-      overflow-x: auto;
+		.projectList {
-      .projectName {
+			margin-top: 40px;
-        width: 270px;
+			display: flex;
-        margin-top: 12px;
+			justify-content: space-between;
-        font-size: 18px;
+			align-items: center;
-        font-weight: 600;
+			overflow-x: auto;
-        color: #333333;
+
-        line-height: 25px;
+			.projectName {
-        margin-bottom: 40px;
+				width: 270px;
-        overflow: hidden;
+				margin-top: 12px;
-        text-overflow: ellipsis;
+				font-size: 18px;
-        white-space: nowrap;
+				font-weight: 600;
-      }
+				color: #333333;
-      .progress {
+				line-height: 25px;
-        display: flex;
+				margin-bottom: 40px;
-        align-items: center;
+				overflow: hidden;
-        .el-progress-bar__outer {
+				text-overflow: ellipsis;
-          background-color: rgba(255, 160, 80, 0.19);
+				white-space: nowrap;
-        }
+			}
-        .progressNow {
+
-          font-size: 14px;
+			.progress {
-          font-weight: 400;
+				display: flex;
-          color: #333333;
+				align-items: center;
-          line-height: 20px;
+
-          margin-right: 20px;
+				.el-progress-bar__outer {
-        }
+					background-color: rgba(255, 160, 80, 0.19);
-        .progressNum {
+				}
-          font-size: 12px;
+
-          font-weight: 400;
+				.progressNow {
-          color: #999999;
+					font-size: 14px;
-          line-height: 17px;
+					font-weight: 400;
-          margin-left: 26px;
+					color: #333333;
-        }
+					line-height: 20px;
-      }
+					margin-right: 20px;
-      .studyNew {
+				}
-        margin-top: 16px;
+
-        font-size: 14px;
+				.progressNum {
-        font-weight: 400;
+					font-size: 12px;
-        color: #999999;
+					font-weight: 400;
-        line-height: 20px;
+					color: #999999;
-      }
+					line-height: 17px;
-      .tobestarted {
+					margin-left: 26px;
-        width: 140px;
+				}
-        height: 40px;
+			}
-        border-radius: 4px;
+
-        border: 1px solid #387df7;
+			.studyNew {
-        display: flex;
+				margin-top: 16px;
-        align-items: center;
+				font-size: 14px;
-        justify-content: center;
+				font-weight: 400;
-        font-size: 16px;
+				color: #999999;
-        font-weight: 400;
+				line-height: 20px;
-        color: #387df7;
+			}
-        line-height: 22px;
+
-        cursor: pointer;
+			.tobestarted {
-        margin-right: 120px;
+				width: 140px;
-      }
+				height: 40px;
-      .gostudy {
+				border-radius: 4px;
-        width: 140px;
+				border: 1px solid #387df7;
-        height: 40px;
+				display: flex;
-        background: #387df7;
+				align-items: center;
-        box-shadow: 1px 2px 15px 1px rgba(56, 125, 247, 0.34);
+				justify-content: center;
-        border-radius: 4px;
+				font-size: 16px;
-        display: flex;
+				font-weight: 400;
-        align-items: center;
+				color: #387df7;
-        justify-content: center;
+				line-height: 22px;
-        font-size: 16px;
+				cursor: pointer;
-        font-weight: 400;
+				margin-right: 120px;
-        color: #ffffff;
+			}
-        line-height: 22px;
+
-        margin-right: 120px;
+			.gostudy {
-        cursor: pointer;
+				width: 140px;
-      }
+				height: 40px;
-      .finish {
+				background: #387df7;
-        width: 140px;
+				box-shadow: 1px 2px 15px 1px rgba(56, 125, 247, 0.34);
-        height: 40px;
+				border-radius: 4px;
-        background: rgba(56, 125, 247, 0.6);
+				display: flex;
-        border-radius: 4px;
+				align-items: center;
-        display: flex;
+				justify-content: center;
-        align-items: center;
+				font-size: 16px;
-        justify-content: center;
+				font-weight: 400;
-        font-size: 16px;
+				color: #ffffff;
-        font-weight: 400;
+				line-height: 22px;
-        color: #ffffff;
+				margin-right: 120px;
-        line-height: 22px;
+				cursor: pointer;
-        cursor: pointer;
+			}
-      }
+
-    }
+			.finish {
-  }
+				width: 140px;
+				height: 40px;
+				background: rgba(56, 125, 247, 0.6);
+				border-radius: 4px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 16px;
+				font-weight: 400;
+				color: #ffffff;
+				line-height: 22px;
+				cursor: pointer;
+			}
+		}
+	}
 }
 </style>

src/views/roadmap/LearnPath.vue

@@ -1,79 +1,80 @@
 <template>
-	<div class="learnpath">
+  <div class="learnpath">
-		<div class="content">
+    <div class="content">
-			<div class="title">
+      <div class="title">
-				<div class="titleL">
+        <div class="titleL">
-					<div @click="returnfun" class="text">学习路径图</div>
+          <div @click="returnfun" class="text">学习路径图</div>
-					<div class="info" style="margin-right: 14px" v-if="userInfo.jobName">
+          <div class="info" style="margin-right: 14px" v-if="userInfo.jobName">
-						<img style="width: 20px; height: 18px; margin-right: 10px" src="../../assets/image/pm.png" />
+            <img style="width: 20px; height: 18px; margin-right: 10px" src="../../assets/image/pm.png"/>
-						<div style="margin-top: 1px">{{ userInfo.jobName }}</div>
+            <div style="margin-top: 1px">{{ userInfo.jobName }}</div>
-					</div>
+          </div>
-					<div class="info" v-if="userInfo.bandDesc">
+          <div class="info" v-if="userInfo.bandDesc">
-						<img style="width: 18px; height: 17px; margin-right: 11px" src="../../assets/image/band.png" />
+            <img style="width: 18px; height: 17px; margin-right: 11px" src="../../assets/image/band.png"/>
-						<div style="margin-top: 2px">{{ userInfo.bandDesc }}</div>
+            <div style="margin-top: 2px">{{ userInfo.bandDesc }}</div>
-					</div>
+          </div>
-				</div>
+        </div>
-				<div :style="{ display: !showmapdetail ? 'flex' : 'none' }">
+        <div :style="{ display: !showmapdetail ? 'flex' : 'none' }">
-					<!--          <el-popover width="475px" trigger="hover" popper-class="lppopover">-->
+          <!--          <el-popover width="475px" trigger="hover" popper-class="lppopover">-->
-					<!--            <div>-->
+          <!--            <div>-->
-					<!--              <div class="finish">-->
+          <!--              <div class="finish">-->
-					<!--                <img-->
+          <!--                <img-->
-					<!--                    src="../../assets/image/circle.png"-->
+          <!--                    src="../../assets/image/circle.png"-->
-					<!--                    style="width: 20px; height: 20px"-->
+          <!--                    style="width: 20px; height: 20px"-->
-					<!--                />-->
+          <!--                />-->
-					<!--                <div class="text">未完成</div>-->
+          <!--                <div class="text">未完成</div>-->
-					<!--                <div class="box"></div>-->
+          <!--                <div class="box"></div>-->
-					<!--              </div>-->
+          <!--              </div>-->
-					<!--              <div-->
+          <!--              <div-->
-					<!--                  v-for="(value, index) in unCompleteTaskList"-->
+          <!--                  v-for="(value, index) in unCompleteTaskList"-->
-					<!--                  :key="index"-->
+          <!--                  :key="index"-->
-					<!--                  class="tasks"-->
+          <!--                  class="tasks"-->
-					<!--                  :style="{-->
+          <!--                  :style="{-->
-					<!--                  'border-bottom':-->
+          <!--                  'border-bottom':-->
-					<!--                    index === unCompleteTaskList.length - 1-->
+          <!--                    index === unCompleteTaskList.length - 1-->
-					<!--                      ? null-->
+          <!--                      ? null-->
-					<!--                      : '1px solid rgba(229, 228, 228, 1)',-->
+          <!--                      : '1px solid rgba(229, 228, 228, 1)',-->
-					<!--                }"-->
+          <!--                }"-->
-					<!--              >-->
+          <!--              >-->
-					<!--                <div style="font-size: 14px; font-weight: 500; color: #677d86">-->
+          <!--                <div style="font-size: 14px; font-weight: 500; color: #677d86">-->
-					<!--                  {{ value.name }}-->
+          <!--                  {{ value.name }}-->
-					<!--                </div>-->
+          <!--                </div>-->
-					<!--                <img-->
+          <!--                <img-->
-					<!--                    style="width: 20px; height: 20px"-->
+          <!--                    style="width: 20px; height: 20px"-->
-					<!--                    src="../../assets/image/go.png"-->
+          <!--                    src="../../assets/image/go.png"-->
-					<!--                    @click="toUnTask(chapterId)"-->
+          <!--                    @click="toUnTask(chapterId)"-->
-					<!--                />-->
+          <!--                />-->
-					<!--              </div>-->
+          <!--              </div>-->
-					<!--            </div>-->
+          <!--            </div>-->
-					<!--            <template #reference>-->
+          <!--            <template #reference>-->
-					<!--              todo #学习路径 只会有一个未完成任务么?是否是直接跳到任务详情-->
+          <!--              todo #学习路径 只会有一个未完成任务么?是否是直接跳到任务详情-->
-					<!--              <div class="titleR">进入未完成任务</div>-->
+          <!--              <div class="titleR">进入未完成任务</div>-->
-					<!--            </template>-->
+          <!--            </template>-->
-					<!--          </el-popover>-->
+          <!--          </el-popover>-->
-				</div>
+        </div>
-				<div :style="{ display: showmapdetail ? 'flex' : 'none' }" class="titleR" @click="returnfun">
+        <div :style="{ display: showmapdetail ? 'flex' : 'none' }" class="titleR" @click="returnfun">
-					返回列表
+          返回列表
-				</div>
+        </div>
-			</div>
+      </div>
-			<!-- 路径列表-->
+      <!-- 路径列表-->
-			<div :style="{ display: !showmapdetail ? 'flex' : 'none' }" class="head">
+      <div :style="{ display: !showmapdetail ? 'flex' : 'none' }" class="head">
-				<div style="min-width: 770px; width: 100%">
+        <div style="min-width: 770px; width: 100%">
-					<el-table :data="data" style="width: 100%" @row-click="gofun">
+          <el-table :data="data" style="width: 100%" @row-click="gofun">
-						<el-table-column prop="img" label="缩略图" #default="scope" align="center" width="255">
+            <el-table-column prop="img" label="缩略图" #default="scope" align="center" width="255">
-							<img :src="scope.row.picUrl" style="width: 230px; height: 155px" />
+              <img :src="scope.row.picUrl" style="width: 230px; height: 155px"/>
-						</el-table-column>
+            </el-table-column>
-						<el-table-column align="center" prop="name" label="路径名称" />
+            <el-table-column align="center" prop="name" label="路径名称"/>
-						<el-table-column align="center" prop="introduce" label="路径介绍" #default="scope">
+            <el-table-column align="center" prop="introduce" label="路径介绍" #default="scope">
-							<el-popover placement="bottom-start"   :width="400"  title="路径介绍" trigger="hover" :content="scope.row.remark">
+              <el-popover placement="bottom-start" :width="400" title="路径介绍" trigger="hover"
-								<template #reference>
+                          :content="scope.row.remark">
-									<div>{{ scope.row.remark }}</div>
+                <template #reference>
-								</template>
+                  <div>{{ scope.row.remark }}</div>
-							</el-popover>
+                </template>
-						</el-table-column>
+              </el-popover>
+            </el-table-column>
 
-						<el-table-column align="center" prop="organizationName" label="归属组织" />
+            <el-table-column align="center" prop="organizationName" label="归属组织"/>
-						<el-table-column #default="scope" align="center" :width="150" prop="state" label="状态">
+            <el-table-column #default="scope" align="center" :width="150" prop="state" label="状态">
-							<img :src="
+              <img :src="
 								scope.row.taskStatus === 1
 									? ongoing
 									: scope.row.taskStatus === 2
@@ -81,243 +82,220 @@
 										: scope.row.taskStatus === 0
 											? nostarted
 											: null
-							" style="width: 99px; height: 99px" />
+							" style="width: 99px; height: 99px"/>
-						</el-table-column>
+            </el-table-column>
-					</el-table>
+          </el-table>
-				</div>
+        </div>
-			</div>
+      </div>
-
+      <!--      :src="{ 0: nostarted, 1: completed, 2: ongoing }[scope.row.status]"-->
-			<!--      :src="{ 0: nostarted, 1: completed, 2: ongoing }[scope.row.status]"-->
+      <!-- 路径列表-->
-			<!-- 路径列表-->
+      <!-- 路径详情图 -->
-			<!-- 路径详情图 -->
+      <div :style="{ display: showmapdetail ? 'flex' : 'none' }" class="mapdetail">
-			<div :style="{ display: showmapdetail ? 'flex' : 'none' }" class="mapdetail">
+        <PathDetailImage img="https://u-pre.boe.com/upload/路径图背景-1671015331292.png" :detail="detail"></PathDetailImage>
-				<div v-for="(item, i) in detail?.rows" :key="i">
+      </div>
-					<img :src="useImage(`222_0${i + 2}.png`)" />
+      <!-- 路径详情图 -->
-				</div>
+    </div>
-				<!--        <div class="modal"-->
+  </div>
-				<!--             style="width: calc(100% - 168px); height: 525px;background-image: url('../../src/assets/image/mapdetail.png');background-size: 100%;background-repeat: no-repeat;">-->
-				<!--        </div>-->
-			</div>
-			<!-- 路径详情图 -->
-		</div>
-	</div>
 </template>
 <script setup>
-import { reactive, toRefs, ref, onMounted, computed } from "vue";
+import {computed, ref} from "vue";
 import nostarted from "../../assets/image/nostarted.png";
 import completed from "../../assets/image/completed.png";
 import ongoing from "../../assets/image/ongoing.png";
-import { boeRequest, request, usePage, useRequest } from "@/api/request";
+import {usePage} from "@/api/request";
-import {
+import {ROUTER_LIST,} from "@/api/api";
-	ROUTER_CHAPTER_LIST,
+import {useRouter} from "vue-router";
-	ROUTER_LIST,
-	ROUTER_UNCOMPLETE_LIST,
-} from "@/api/api";
-import { useImage } from "@/api/utils";
-import { useRouter } from "vue-router";
 import store from "@/store";
+import PathDetailImage from "@/components/PathDetailImage.vue";
 
 const detail = ref();
+const showmapdetail = ref(false);
+const currentStageId = ref();
 const userInfo = computed(() => store.state.userInfo);
-const { data } = usePage(ROUTER_LIST, { pageSize: 60 });
+const {data} = usePage(ROUTER_LIST, {pageSize: 60});
-console.log("datadata", data);
 const router = useRouter();
 const returnclick = () => {
-	router.back();
+  router.back();
 };
 
 // const {unCompleteTaskList} = useRequest(ROUTER_UNCOMPLETE_LIST, {});
 
-const state = reactive({
-	showmapdetail: false,
-});
-const { showmapdetail } = toRefs(state);
-
 const returnfun = () => {
-	state.showmapdetail = false;
+  showmapdetail.value = false;
 };
 
-async function gofun({ routerId, name: routerName }) {
+async function gofun(e) {
-	// console.log(routerId)
+  detail.value = e
-	// const data = await request(ROUTER_CHAPTER_LIST, {stuChapterListVo: {routerId}})
+  showmapdetail.value = true;
-	// detail.value = data.data
+}
-	// state.showmapdetail = true;
+
-	// router.push({path: "/pathdetails", query: {routerId}});
+function toUnTask() {
-	import.meta.env.MODE === "development"
-		? router.push({
-			path: "/pathdetails",
-			query: { routerId, routerName },
-		})
-		: window.open(
-			`http://u-pre.boe.com/pc/forward?to=/fe-student/pathdetails&params=${encodeURIComponent(
-				`routerId=${routerId}&routerName=${routerName}`
-			)}`
-		);
 }
-function toUnTask() { }
 </script>
 <style lang="scss">
 #app div:nth-child(1) {
-	// background: rgba(0, 0, 0, 0) !important;
+  // background: rgba(0, 0, 0, 0) !important;
 }
 
-.modal {}
+.modal {
+}
 
 .modal:after {
-	content: "";
+  content: "";
 }
 
 .learnpath {
-	width: 100%;
+  width: 100%;
-	min-height: 800px;
+  min-height: 800px;
-	//border-radius: 8px;
+  //border-radius: 8px;
-	background-color: rgba(255, 255, 255, 1);
+  background-color: rgba(255, 255, 255, 1);
-	display: flex;
+  display: flex;
 
-	.content {
+  .content {
-		width: 100%;
+    width: 100%;
-		// flex: 1;
+    // flex: 1;
-		margin-top: 43px;
+    margin-top: 43px;
+    position: relative;
+    // background-color: pink;
+    .title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-left: 53px;
+      margin-right: 54px;
+    }
 
-		// background-color: pink;
+    .title .titleL {
-		.title {
+      display: flex;
-			display: flex;
+      align-items: center;
-			justify-content: space-between;
+    }
-			align-items: center;
-			margin-left: 53px;
-			margin-right: 54px;
-		}
 
-		.title .titleL {
+    .title .titleL .text {
-			display: flex;
+      font-size: 18px;
-			align-items: center;
+      font-weight: bold;
-		}
+      color: #333333;
+      line-height: 24px;
+      margin-right: 26px;
+    }
 
-		.title .titleL .text {
+    .title .titleL .info {
-			font-size: 18px;
+      display: flex;
-			font-weight: bold;
+      // align-items: center;
-			color: #333333;
+      font-size: 14px;
-			line-height: 24px;
+      font-weight: 400;
-			margin-right: 26px;
+      color: #387df7;
-		}
+    }
 
-		.title .titleL .info {
+    .title .titleR {
-			display: flex;
+      width: 157px;
-			// align-items: center;
+      height: 48px;
-			font-size: 14px;
+      border: 2px solid #0060ff;
-			font-weight: 400;
+      border-radius: 8px;
-			color: #387df7;
+      display: flex;
-		}
+      align-items: center;
+      justify-content: center;
+      cursor: pointer;
+      font-size: 16px;
+      font-weight: bold;
+      color: #0060ff;
+    }
 
-		.title .titleR {
+    .head {
-			width: 157px;
+      // height: 50px;
-			height: 48px;
+      background: #f9f9f9;
-			border: 2px solid #0060ff;
+      margin-top: 50px;
-			border-radius: 8px;
+      display: flex;
-			display: flex;
+      justify-content: space-between;
-			align-items: center;
+      align-items: center;
-			justify-content: center;
+      font-size: 14px;
-			cursor: pointer;
+      font-weight: 500;
-			font-size: 16px;
+      color: #333333;
-			font-weight: bold;
+      margin-left: 53px;
-			color: #0060ff;
+      margin-right: 54px;
-		}
+      width: calc(100% - 107px);
+      // min-width: 770px;
+      overflow-x: auto;
 
-		.head {
+      .el-table th.el-table__cell {
-			// height: 50px;
+        background: rgba(249, 249, 249, 1);
-			background: #f9f9f9;
+        color: rgba(51, 51, 51, 1);
-			margin-top: 50px;
+        font-size: 14px;
-			display: flex;
+        font-weight: 500;
-			justify-content: space-between;
+      }
-			align-items: center;
-			font-size: 14px;
-			font-weight: 500;
-			color: #333333;
-			margin-left: 53px;
-			margin-right: 54px;
-			width: calc(100% - 107px);
-			// min-width: 770px;
-			overflow-x: auto;
 
-			.el-table th.el-table__cell {
+      .el-table .cell {
-				background: rgba(249, 249, 249, 1);
+        overflow: hidden;
-				color: rgba(51, 51, 51, 1);
+        text-overflow: ellipsis;
-				font-size: 14px;
+        width: 100%;
-				font-weight: 500;
+        display: -webkit-box;
-			}
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 3;
+        word-break: break-all;
+      }
 
-			.el-table .cell {
+      .el-table__row {
-				overflow: hidden;
+        height: 231px;
-				text-overflow: ellipsis;
+        font-size: 14px;
-				width: 100%;
+        color: rgba(102, 102, 102, 1);
-				display: -webkit-box;
+        font-weight: 500;
-				-webkit-box-orient: vertical;
+      }
-				-webkit-line-clamp: 3;
+    }
-				word-break: break-all;
-			}
 
-			.el-table__row {
+    .mapdetail {
-				height: 231px;
+      width: calc(100% - 107px);
-				font-size: 14px;
+      min-height: 577px;
-				color: rgba(102, 102, 102, 1);
+      background: rgba(242, 245, 247, 0.6);
-				font-weight: 500;
+      margin-top: 26px;
-			}
+      border-radius: 8px;
-		}
+      margin-left: 53px;
-
+      margin-right: 54px;
-		.mapdetail {
+      display: flex;
-			width: calc(100% - 107px);
+      align-items: center;
-			height: 577px;
+      justify-content: center;
-			background: rgba(242, 245, 247, 0.6);
+    }
-			margin-top: 26px;
+  }
-			border-radius: 8px;
-			margin-left: 53px;
-			margin-right: 54px;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
-	}
 }
 
 .lppopover {
-	.finish {
+  .finish {
-		padding-left: 27px;
+    padding-left: 27px;
-		padding-right: 18px;
+    padding-right: 18px;
-		margin-top: 15px;
+    margin-top: 15px;
-		margin-bottom: 17px;
+    margin-bottom: 17px;
-		position: relative;
+    position: relative;
-		display: flex;
+    display: flex;
-		align-items: center;
+    align-items: center;
-	}
+  }
 
-	.text {
+  .text {
-		font-size: 16px;
+    font-size: 16px;
-		font-weight: 800;
+    font-weight: 800;
-		color: #333333;
+    color: #333333;
-		margin-left: 8px;
+    margin-left: 8px;
-	}
+  }
 
-	.box {
+  .box {
-		width: 59px;
+    width: 59px;
-		height: 10px;
+    height: 10px;
-		background-color: rgba(36, 120, 255, 0.15);
+    background-color: rgba(36, 120, 255, 0.15);
-		position: absolute;
+    position: absolute;
-		left: 50px;
+    left: 50px;
-		top: 15px;
+    top: 15px;
-	}
+  }
+
+  .tasks {
+    width: 405px;
+    height: 52px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-left: 28px;
+    cursor: pointer;
+  }
 
-	.tasks {
-		width: 405px;
-		height: 52px;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-left: 28px;
-		cursor: pointer;
-	}
   .box-item {
-  width: 200px;
+    width: 200px;
-  margin-top: 10px;
+    margin-top: 10px;
-}
+  }
 }
 </style>

src/views/survey/SurveyDetail.vue

@@ -1,17 +1,16 @@
 <template>
-  <div class="surveydetail" style="padding: 30px">
+	<div style=" background: #0078fc;height: 150px;width: 100%;position: absolute;top: 0;z-index:-9999;"></div>
-    <!-- 面包屑导航 -->
+	<div class="surveydetail" style="padding: 30px">
-    <div
+		<!-- 面包屑导航 -->
-      style="display: flex; align-items: center; justify-content: space-between"
+		<div style="display: flex; align-items: center; justify-content: space-between">
-    >
+			<div class="crumb">
-      <div class="crumb">
+				<div>{{ pName }}</div>
-        <div>{{ pName }}</div>
+				<div style="margin-left: 6px; margin-right: 6px">/</div>
-        <div style="margin-left: 6px; margin-right: 6px">/</div>
+				<div>{{ sName }}</div>
-        <div>{{ sName }}</div>
+				<div v-if="sName" style="margin-left: 6px; margin-right: 6px">/</div>
-        <div style="margin-left: 6px; margin-right: 6px">/</div>
+				<div style="font-weight: 700; font-size: 16px">评估详情</div>
-        <div style="font-weight: 700; font-size: 16px">评估详情</div>
+			</div>
-      </div>
+			<!-- 
-      <!-- 
       <div class="prevnext">
         <div class="prev">
           <img
@@ -27,185 +26,133 @@
               src="../../assets/image/next.png"
           />
         </div>-->
-      <div class="return">
+			<div class="return">
-        <div style="display: flex" @click="returnclick">
+				<div style="display: flex" @click="returnclick">
-          <img
+					<el-button style="color:#0073FB"> <img class="img2" style="margin-right:11px;cursor: pointer;"
-            class="img2"
+							src="../../assets/image/return.png" />返回</el-button>
-            style="margin-right: 22px"
+				</div>
-            src="../../assets/image/return.png"
+			</div>
-          />
+		</div>
-          <div class="text" style="color: #fff">返回</div>
+		<!-- 面包屑导航 -->
-        </div>
+		<!-- 标题 -->
-      </div>
+		<div class="title">【评估】{{ data.assessmentName }}</div>
-    </div>
+		<!-- 标题 -->
-    <!-- 面包屑导航 -->
+		<!-- 基本信息 -->
-    <!-- 标题 -->
+		<div class="bascinfo">
-    <div class="title">【评估】{{data.assessmentName}}</div>
+			<div>
-    <!-- 标题 -->
+				<!-- {{ [data.assessmentEssayQuestionDtoList,data.assessmentMultipleChoiceDtoList,data.assessmentScoringQuestionDtoList,data.assessmentSingleChoiceDtoList].sort((a,b)=>{
-    <!-- 基本信息 -->
-    <div class="bascinfo">
-      <div>
-        <!-- {{ [data.assessmentEssayQuestionDtoList,data.assessmentMultipleChoiceDtoList,data.assessmentScoringQuestionDtoList,data.assessmentSingleChoiceDtoList].sort((a,b)=>{
           return a[0].orderNumber - b[0].orderNumber
         }) }} -->
 
-        <div
+				<div class="question" v-for="
-          class="question"
+          (value, index) in  formateArr([data.assessmentEssayQuestionDtoList, data.assessmentMultipleChoiceDtoList, data.assessmentScoringQuestionDtoList, data.assessmentSingleChoiceDtoList]).sort((a, b) => {
-          v-for="(value, index) in [data.assessmentEssayQuestionDtoList,data.assessmentMultipleChoiceDtoList,data.assessmentScoringQuestionDtoList,data.assessmentSingleChoiceDtoList].sort((a,b)=>{
+          	return a[0].orderNumber - b[0].orderNumber
-          return a[0].orderNumber - b[0].orderNumber
+          }) " :key="index" :style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
-        }) "
+					<div v-if="value[0].questionType == '4'">
-          :key="index"
+						<div class="question" v-for="(value, index) in data.assessmentScoringQuestionDtoList" :key="index"
-          :style="{ 'margin-top': index === 0 ? '57px' : '41px' }"
+							:style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
-        >
+							<div class="text">{{ value.assessmentScTitle }}</div>
-          <div v-if="value[0].questionType=='4'">
+							<div class="answer">
-            <div
+								<div class="answerL">完全没用</div>
-              class="question"
+								<div class="answerC">
-              v-for="(value, index) in data.assessmentScoringQuestionDtoList"
+									<div class="answerCitem" v-for="(item, key) in Array.from(
-              :key="index"
+										{ length: value.assessmentMaxScore },
-              :style="{ 'margin-top': index === 0 ? '57px' : '41px' }"
+										(k, i) => i
-            >
+									)" :key="key" :style="{
-              <div class="text">{{ value.assessmentScTitle }}</div>
+	'margin-left': key === 0 ? '15px' : '10px',
-              <div class="answer">
+	background:
-                <div class="answerL">完全没用</div>
+		value.selectAnswer === item
-                <div class="answerC">
+			? 'rgba(86, 163, 249, 1)'
-                  <div
+			: 'rgba(86, 163, 249, 0)',
-                    class="answerCitem"
+	color:
-                    v-for="(item, key) in Array.from(
+		value.selectAnswer === item
-                      { length: value.assessmentMaxScore },
+			? '#fff'
-                      (k, i) => i
+			: 'rgba(86, 163, 249, 1)',
-                    )"
+}" @click="
-                    :key="key"
+	() => {
-                    :style="{
+		if (data.isSubmit) {
-                      'margin-left': key === 0 ? '15px' : '10px',
+			return;
-                      background:
+		}
-                        value.selectAnswer === item
+		value.selectAnswer = item;
-                          ? 'rgba(86, 163, 249, 1)'
+	}
-                          : 'rgba(86, 163, 249, 0)',
+">
-                      color:
+										<div>{{ item + 1 }}</div>
-                        value.selectAnswer === item
+									</div>
-                          ? '#fff'
+								</div>
-                          : 'rgba(86, 163, 249, 1)',
+								<div class="answerR">非常有帮助/启发</div>
-                    }"
+							</div>
-                    @click="
+						</div>
-                      () => {
+					</div>
-                        if (data.isSubmit) {
-                          return;
-                        }
-                        value.selectAnswer = item;
-                      }
-                    "
-                  >
-                    <div>{{ item + 1 }}</div>
-                  </div>
-                </div>
-                <div class="answerR">非常有帮助/启发</div>
-              </div>
-            </div>
-          </div>
 
-          <div v-else-if="value[0].questionType=='1'">
+					<div v-else-if="value[0].questionType == '1'">
-            <div
+						<div class="question" style="margin-top: 41px" v-if="
-              class="question"
+							data.assessmentSingleChoiceDtoList &&
-              style="margin-top: 41px"
+							data.assessmentSingleChoiceDtoList.length
-              v-if="
+						">
-                data.assessmentSingleChoiceDtoList &&
+							<div class="text">
-                data.assessmentSingleChoiceDtoList.length
+								{{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}
-              "
+							</div>
-            >
+							<div v-for="(value, index) in data.assessmentSingleChoiceDtoList" :key="index"
-              <div class="text">
+								style="display: flex; align-items: center" :style="{
-                {{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}
+									'margin-top': index === 0 ? '29px' : '22px',
-              </div>
+									cursor: 'pointer',
-              <div
+								}" @click="
-                v-for="(value, index) in data.assessmentSingleChoiceDtoList"
+	() => {
-                :key="index"
+		if (data.isSubmit) {
-                style="display: flex; align-items: center"
+			return;
-                :style="{
+		}
-                  'margin-top': index === 0 ? '29px' : '22px',
+		data.assessmentSingleChoiceDtoList.forEach((e) => {
-                  cursor: 'pointer',
+			e.select = false;
-                }"
+		});
-                @click="
+		value.select = true;
-                  () => {
+	}
-                    if (data.isSubmit) {
+">
-                      return;
+								<img style="width: 19px; height: 18px; cursor: pointer" :src="value.select ? checkbox : checkbox2" />
-                    }
+								<div class="people">{{ value.singleOptionName }}</div>
-                    data.assessmentSingleChoiceDtoList.forEach((e) => {
+							</div>
-                      e.select = false;
+						</div>
-                    });
+					</div>
-                    value.select = true;
-                  }
-                "
-              >
-                <img
-                  style="width: 19px; height: 18px; cursor: pointer"
-                  :src="value.select ? checkbox : checkbox2"
-                />
-                <div class="people">{{ value.singleOptionName }}</div>
-              </div>
-            </div>
-          </div>
 
-          <div v-else-if="value[0].questionType=='2'">
+					<div v-else-if="value[0].questionType == '2'">
-            <div
+						<div class="question" style="margin-top: 41px" v-if="
-              class="question"
+							data.assessmentMultipleChoiceDtoList &&
-              style="margin-top: 41px"
+							data.assessmentMultipleChoiceDtoList.length
-              v-if="
+						">
-                data.assessmentMultipleChoiceDtoList &&
+							<div class="text">
-                data.assessmentMultipleChoiceDtoList.length
+								{{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}
-              "
+							</div>
-            >
+							<div v-for="(value, index) in data.assessmentMultipleChoiceDtoList" :key="index"
-              <div class="text">
+								style="display: flex; align-items: center" :style="{
-                {{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}
+									'margin-top': index === 0 ? '29px' : '22px',
-              </div>
+									cursor: 'pointer',
-              <div
+								}" @click="
-                v-for="(value, index) in data.assessmentMultipleChoiceDtoList"
+	() => {
-                :key="index"
+		if (data.isSubmit) {
-                style="display: flex; align-items: center"
+			return;
-                :style="{
+		}
-                  'margin-top': index === 0 ? '29px' : '22px',
+		value.select = !value.select;
-                  cursor: 'pointer',
+	}
-                }"
+">
-                @click="
+								<img style="width: 19px; height: 18px; cursor: pointer" :src="value.select ? checkbox : checkbox2" />
-                  () => {
+								<div class="people">{{ value.multipleOptionName }}</div>
-                    if (data.isSubmit) {
+							</div>
-                      return;
+						</div>
-                    }
+					</div>
-                    value.select = !value.select;
-                  }
-                "
-              >
-                <img
-                  style="width: 19px; height: 18px; cursor: pointer"
-                  :src="value.select ? checkbox : checkbox2"
-                />
-                <div class="people">{{ value.multipleOptionName }}</div>
-              </div>
-            </div>
-          </div>
 
-          <div v-else-if="value[0].questionType=='3'">
+					<div v-else-if="value[0].questionType == '3'">
-            <div
+						<div class="question" style="margin-top: 41px" v-for="(item, i) in data.assessmentEssayQuestionDtoList"
-              class="question"
+							:key="i">
-              style="margin-top: 41px"
+							<div class="text">{{ item.assessmentQaTitle }}</div>
-              v-for="(item, i) in data.assessmentEssayQuestionDtoList"
+							<div style="width: 713px; margin-top: 31px; position: relative">
-              :key="i"
+								<el-input v-model="item.content" :autosize="{ minRows: 5, maxRows: 5 }" resize="none" maxlength="200"
-            >
+									type="textarea" :readonly="!!data.isSubmit" />
-              <div class="text">{{ item.assessmentQaTitle }}</div>
+								<div class="words">{{ item.content?.length || 0 }}/200</div>
-              <div style="width: 713px; margin-top: 31px; position: relative">
+							</div>
-                <el-input
+						</div>
-                  v-model="item.content"
+					</div>
-                  :autosize="{ minRows: 5, maxRows: 5 }"
+				</div>
-                  resize="none"
-                  maxlength="200"
-                  type="textarea"
-                  :readonly="!!data.isSubmit"
-                />
-                <div class="words">{{ item.content?.length || 0 }}/200</div>
-              </div>
-            </div>
-          </div>
-        </div>
 
-        <!-- <div
+				<!-- <div
           class="question"
           v-for="(value, index) in data.assessmentScoringQuestionDtoList"
           :key="index"
@@ -343,42 +290,39 @@
             <div class="words">{{ item.content?.length || 0 }}/200</div>
           </div>
         </div> -->
-        
+
-        <div
+				<div style="display: flex; justify-content: center" v-if="
-          style="display: flex; justify-content: center"
+					data.assessmentEssayQuestionDtoList?.length ||
-          v-if="
+					data.assessmentMultipleChoiceDtoList?.length ||
-            data.assessmentEssayQuestionDtoList?.length ||
+					data.assessmentSingleChoiceDtoList?.length ||
-            data.assessmentMultipleChoiceDtoList?.length ||
+					data.assessmentScoringQuestionDtoList?.length
-            data.assessmentSingleChoiceDtoList?.length ||
+				">
-            data.assessmentScoringQuestionDtoList?.length
+					<div class="submit" @click="submit" :style="{ background: data.isSubmit ? '#999' : '#2478ff' }">
-          "
+						提交
-        >
+					</div>
-          <div
+				</div>
-            class="submit"
+			</div>
-            @click="submit"
+		</div>
-            :style="{ background: data.isSubmit ? '#999' : '#2478ff' }"
+		<!-- 基本信息 -->
-          >
+		<!--    todo 测评页面 没有接口-->
-            提交
+	</div>
-          </div>
+	<el-dialog v-model="centerDialogVisible" title="" width="20%" center :show-close="false" :align-center="true">
-        </div>
+		<div style="text-align: center;font-size:16px;"> <span style="color:black">
-      </div>
+				提交成功
-    </div>
+			</span></div>
-    <!-- 基本信息 -->
+		<template #footer>
-    <!--    todo 测评页面 没有接口-->
+			<span class="dialog-footer">
-  </div>
+				<el-button class="cancel"
-  <el-dialog v-model="centerDialogVisible"  title="" width="20%" center :show-close="false" :align-center="true"> 
+					style="color: #387DF7; border: 1px solid #387DF7;padding: 8px 32px; border-radius: 4px;"
-  <div style="text-align: center;font-size:16px;">  <span style="color:black">
+					@click="centerDialogVisible = false">取消</el-button>
-     提交成功
+				<el-button class="back"
-    </span></div>
+					style="background: #387DF7;box-shadow: 1px 2px 15px 1px rgba(56,125,247,0.34);border: 0px;padding: 8px 32px;"
-    <template #footer>
+					type="primary" @click="returnclick">
-      <span class="dialog-footer">
+					返回
-        <el-button class="cancel" style="color: #387DF7; border: 1px solid #387DF7;padding: 8px 32px; border-radius: 4px;"  @click="centerDialogVisible = false">取消</el-button>
+				</el-button>
-        <el-button class="back" style="background: #387DF7;box-shadow: 1px 2px 15px 1px rgba(56,125,247,0.34);border: 0px;padding: 8px 32px;" type="primary" @click="returnclick">
+			</span>
-          返回
+		</template>
-        </el-button>
+	</el-dialog>
-      </span>   
-    </template>
-  </el-dialog>
 </template>
 <script setup>
 import checkbox from "@/assets/image/checkbox.png";
@@ -387,210 +331,245 @@ import { useRoute, useRouter } from "vue-router/dist/vue-router";
 import { request, usePage, useRequest } from "@/api/request";
 import { ASSESSMENT_QUERY, ASSESSMENT_SUBMIT } from "@/api/api";
 import { ElMessage } from "element-plus";
-import {  ref} from "vue";
+import { ref } from "vue";
 
 const {
-  query: { courseId, id: taskId, type, pName, sName },
+	query: { courseId, id: taskId, taskIds, type, pName, sName, chapterOrStageId },
 } = useRoute();
 const router = useRouter();
 const returnclick = () => {
-  router.back();
+	router.back();
 };
 
-const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId });
+// 数组去空对象
-console.log('我是需要排序得题目', data )
+function formateArr(arr1) {
+	console.log(arr1, arr1[0], arr1[0].length)
+	let newarr = []
+	for (let i = 0; i < arr1.length; i++) {
+		if (arr1[i].length !== 0) {
+			newarr.push(arr1[i])
+		}
+	}
+	return newarr
+}
 
-const centerDialogVisible =ref(false);
+const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: taskIds ? taskIds : 0 });
-const open=()=>{
+console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: taskIds ? taskIds : 0 })
-  centerDialogVisible.value = true
+console.log('我是需要排序得题目', data)
+
+function goHome() {
+
+}
+
+const centerDialogVisible = ref(false);
+const open = () => {
+	centerDialogVisible.value = true
 };
 function submit() {
-  if (data.value.isSubmit) {
+	if (1 > 0) {
-    return;
+		console.log(data)
-  }
+		console.log('我是提交的数据', {
- console.log("data.value",data.value);
+			targetId: taskId ? taskId : taskIds ? taskIds : 0, // 项目、路径图或开课的Id
- let list1 = data.value.assessmentEssayQuestionDtoList;
+			chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, //  关卡或者阶段Id  关卡Id不允许为空
- if(list1 &&list1.length > 0){
+			assessmentId: courseId,
-  list1.forEach((item) => {
+			taskId: taskId ? taskId : taskIds ? taskIds : 0,
-    if(item && !item.content){
+			type,
-     
+			result: JSON.stringify(data.value),
-      return ElMessage.warning("您有未填写的评估题干");
+		})
-    }
+	}
-  })
+	if (data.value.isSubmit) {
- }
+		return;
- let list2 = data.value.assessmentScoringQuestionDtoList;
+	}
- if(list2 &&list2.length > 0){
+	console.log("data.value", data.value);
-  list2.forEach((item) => {
+	let list1 = data.value.assessmentEssayQuestionDtoList;
-    if(item && !item.selectAnswer){
+	if (list1 && list1.length > 0) {
-     
+		list1.forEach((item) => {
-      return ElMessage.warning("您有未填写的评估题干");
+			if (item && !item.content) {
-    }
+
-  })
+				return ElMessage.warning("您有未填写的评估题干");
- }
+			}
- let list3 = data.value.assessmentSingleChoiceDtoList;
+		})
- if(list3 &&list3.length > 0){
+	}
-  let flag = 0;
+	let list2 = data.value.assessmentScoringQuestionDtoList;
-  list3.forEach((item) => {
+	if (list2 && list2.length > 0) {
-    flag = flag + item.select? 1 : 0;
+		list2.forEach((item) => {
-  })
+			if (item && !item.selectAnswer) {
-  if(flag ==0 ){
+
-   
+				return ElMessage.warning("您有未填写的评估题干");
-    return ElMessage.warning("您有未填写的评估题干");
+			}
-  }
+		})
- }
+	}
- let list4 = data.value.assessmentMultipleChoiceDtoList;
+	let list3 = data.value.assessmentSingleChoiceDtoList;
- if(list4 &&list4.length > 0){
+	if (list3 && list3.length > 0) {
-  let flag = 0;
+		let flag = 0;
-  list4.forEach((item) => {
+		list3.forEach((item) => {
-    flag = flag + item.select? 1 : 0;
+			flag = flag + item.select ? 1 : 0;
-  })
+		})
-  if(flag == 0 ){
+		if (flag == 0) {
-   
+
-    return ElMessage.warning("您有未填写的评估题干");
+			return ElMessage.warning("您有未填写的评估题干");
-  }
+		}
- }
+	}
-  data.value.isSubmit = !data.value.isSubmit;
+	let list4 = data.value.assessmentMultipleChoiceDtoList;
-  request(ASSESSMENT_SUBMIT, {
+	if (list4 && list4.length > 0) {
-    assessmentId: courseId,
+		let flag = 0;
-    taskId,
+		list4.forEach((item) => {
-    type,
+			flag = flag + item.select ? 1 : 0;
-    result: JSON.stringify(data.value),
+		})
-  }).then(() => {
+		if (flag == 0) {
-    open();
+
-  });
+			return ElMessage.warning("您有未填写的评估题干");
+		}
+	}
+
+	data.value.isSubmit = !data.value.isSubmit;
+	request(ASSESSMENT_SUBMIT, {
+		targetId: taskIds ? taskIds : 0, // 项目、路径图或开课的Id
+		chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, //  关卡或者阶段Id  关卡Id不允许为空
+		assessmentId: courseId,
+		taskId: taskIds ? taskIds : 0,
+		type,
+		result: JSON.stringify(data.value),
+	}).then(() => {
+		open();
+	});
 
 }
 </script>
 <style lang="scss">
 .surveydetail {
-  .crumb {
+	.crumb {
-    color: #fff;
+		color: #fff;
-    display: flex;
+		display: flex;
-    font-size: 14px;
+		font-size: 14px;
-    line-height: 24px;
+		line-height: 24px;
-  }
+	}
-  .return {
-    position: absolute;
-    right: 10%;
-    .text {
-      text-align: center;
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-    }
-  }
-  .prevnext {
-    display: flex;
-    align-items: center;
-    font-size: 14px;
-    font-weight: 500;
-    color: #ffffff;
 
-    .prev {
+	.return {
-      display: flex;
+		position: absolute;
-      align-items: center;
+		right: 10%;
-      cursor: pointer;
-    }
-  }
 
-  .title {
+		.text {
-    font-size: 20px;
+			text-align: center;
-    font-weight: 800;
+			display: flex;
-    color: #ffffff;
+			flex-direction: row;
-    line-height: 24px;
+			align-items: center;
-    margin-top: 17px;
+		}
-    margin-left: -11px;
+	}
-  }
 
-  .bascinfo {
+	.prevnext {
-    width: 100%;
+		display: flex;
-    min-height: 1032px;
+		align-items: center;
-    margin-top: 24px;
+		font-size: 14px;
-    background: #ffffff;
+		font-weight: 500;
-    border-radius: 8px;
+		color: #ffffff;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
 
-    .question .text {
+		.prev {
-      font-size: 16px;
+			display: flex;
-      font-weight: 500;
+			align-items: center;
-      color: #333330;
+			cursor: pointer;
-    }
+		}
+	}
 
-    .question .answer {
+	.title {
-      margin-top: 30px;
+		font-size: 20px;
-      display: flex;
+		font-weight: 800;
-      align-items: center;
+		color: #ffffff;
-      font-size: 14px;
+		line-height: 24px;
-      font-weight: 500;
+		margin-top: 17px;
-      color: #56a3f9;
+		margin-left: -11px;
-    }
+	}
 
-    .question .answer .answerC {
+	.bascinfo {
-      width: 540px;
+		width: 100%;
-      height: 73px;
+		min-height: 1032px;
-      border: 1px solid #d7e5fd;
+		margin-top: 24px;
-      border-radius: 8px;
+		background: #ffffff;
-      display: flex;
+		border-radius: 8px;
-      align-items: center;
+		display: flex;
-      margin-left: 11px;
+		flex-direction: column;
-      margin-right: 11px;
+		align-items: center;
-      // justify-content: center;
-      .answerCitem {
-        width: 40px;
-        height: 40px;
-        border: 1px solid #56a3f9;
-        border-radius: 8px;
-        font-size: 14px;
-        font-weight: 400;
-        color: #ffffff;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-left: 10px;
-        cursor: pointer;
-      }
-    }
 
-    .question .people {
+		.question .text {
-      font-size: 14px;
+			font-size: 16px;
-      font-weight: 500;
+			font-weight: 500;
-      color: #333330;
+			color: #333330;
-      margin-left: 15px;
+		}
-    }
 
-    .question .words {
+		.question .answer {
-      position: absolute;
+			margin-top: 30px;
-      right: 15px;
+			display: flex;
-      bottom: 5px;
+			align-items: center;
-      font-size: 14px;
+			font-size: 14px;
-      font-weight: 500;
+			font-weight: 500;
-      color: #333330;
+			color: #56a3f9;
-    }
+		}
 
-    .question .el-textarea__inner {
+		.question .answer .answerC {
-      border-radius: 8px;
+			width: 540px;
-      background-color: rgba(245, 246, 247, 1);
+			height: 73px;
-    }
+			border: 1px solid #d7e5fd;
+			border-radius: 8px;
+			display: flex;
+			align-items: center;
+			margin-left: 11px;
+			margin-right: 11px;
 
-    .submit {
+			// justify-content: center;
-      width: 126px;
+			.answerCitem {
-      height: 46px;
+				width: 40px;
-      background: #2478ff;
+				height: 40px;
-      box-shadow: 0px 1px 8px 0px rgba(56, 125, 247, 0.7);
+				border: 1px solid #56a3f9;
-      border-radius: 4px;
+				border-radius: 8px;
-      font-size: 16px;
+				font-size: 14px;
-      font-weight: 800;
+				font-weight: 400;
-      color: #ffffff;
+				color: #ffffff;
-      line-height: 24px;
+				display: flex;
-      display: flex;
+				align-items: center;
-      align-items: center;
+				justify-content: center;
-      justify-content: center;
+				margin-left: 10px;
-      cursor: pointer;
+				cursor: pointer;
-      margin-top: 39px;
+			}
-      margin-bottom: 30px;
+		}
-    }
+
-  }
+		.question .people {
+			font-size: 14px;
+			font-weight: 500;
+			color: #333330;
+			margin-left: 15px;
+		}
+
+		.question .words {
+			position: absolute;
+			right: 15px;
+			bottom: 5px;
+			font-size: 14px;
+			font-weight: 500;
+			color: #333330;
+		}
+
+		.question .el-textarea__inner {
+			border-radius: 8px;
+			background-color: rgba(245, 246, 247, 1);
+		}
+
+		.submit {
+			width: 126px;
+			height: 46px;
+			background: #2478ff;
+			box-shadow: 0px 1px 8px 0px rgba(56, 125, 247, 0.7);
+			border-radius: 4px;
+			font-size: 16px;
+			font-weight: 800;
+			color: #ffffff;
+			line-height: 24px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			cursor: pointer;
+			margin-top: 39px;
+			margin-bottom: 30px;
+		}
+	}
 }
 </style>

vite.config.js

@@ -10,86 +10,91 @@ import { defineConfig, loadEnv } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import topLevelAwait from "vite-plugin-top-level-await";
 const path = require('path')
-// const url = 'http://localhost:30001'
+
-const url = 'https://u.boe.com/manageApi-release'
+export default defineConfig(({ command, mode }) =>
-export default defineConfig(({ command }) =>
 ({
-    base: '/fe-student-release/',
+	base: loadEnv(mode, process.cwd()).VITE_BASE,
-    plugins: [
+	plugins: [
-        vue(),
+		vue(),
-        // legacy({
+		// legacy({
-        //     targets: ['chrome 64', 'defaults', 'not IE 11']
+		//     targets: ['chrome 64', 'defaults', 'not IE 11']
-        // }),
+		// }),
-        topLevelAwait({
+		topLevelAwait({
-            promiseExportName: '__tla',
+			promiseExportName: '__tla',
-            promiseImportName: i => `__tla_${i}`
+			promiseImportName: i => `__tla_${i}`
-        }),
+		}),
-        // viteMockServe({
+		// viteMockServe({
-        //     mockPath: './src/mock/mocks',
+		//     mockPath: './src/mock/mocks',
-        // })
+		// })
-    ],
+	],
-    resolve: {
+	resolve: {
-        alias: [
+		alias: [
-            { find: '@', replacement: path.resolve(__dirname, 'src') }
+			{ find: '@', replacement: path.resolve(__dirname, 'src') }
-        ]
+		]
-    },
+	},
-    server: {
+	server: {
-        proxy: {
+		proxy: {
-            '/file/upload': {
+			'/file/upload': {
-                    target: 'https://u.boe.com/manageApi-release',
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-                changeOrigin: true,
+				changeOrigin: true,
-            },
+			},
-            '/stu': {
+			'/stu': {
-                target: url,
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-                changeOrigin: true,
+				changeOrigin: true,
-            },
+			},
-            '/queryVoteSubmitDetailById': {
+			'/queryVoteSubmitDetailById': {
-                target: url,
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-                changeOrigin: true,
+				changeOrigin: true,
-            },
+			},
-            '/work': {
+			'/work': {
-                target: url,
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-                changeOrigin: true,
+				changeOrigin: true,
-            },
+			},
-            '/discuss': {
+			'/discuss': {
-                target: url,
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-                changeOrigin: true,
+				changeOrigin: true,
-            },
+			},
-            '/discussSubmit': {
+			'/discussSubmit': {
-                target: url,
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-                changeOrigin: true,
+				changeOrigin: true,
-            },
+			},
-            '/comment': {
+			'/comment': {
-                target: url,
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-                changeOrigin: true,
+				changeOrigin: true,
-            },
+			},
-            '/vote': {
+			'/vote': {
-                target: url,
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-                changeOrigin: true,
+				changeOrigin: true,
-            },
+			},
-            '/admin': {
+			'/admin': {
-                target: url,
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-                changeOrigin: true,
+				changeOrigin: true,
-            }, '/activity': {
+			}, '/activity': {
-                target: url,
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-                changeOrigin: true,
+				changeOrigin: true,
-            }, '/liveBroadcast': {
+			}, '/liveBroadcast': {
-                target: url,
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-                changeOrigin: true,
+				changeOrigin: true,
-            }, '/examination': {
+			}, '/examination': {
-                target: url,
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-                changeOrigin: true,
+				changeOrigin: true,
-            }, '/assessment': {
+			}, '/assessment': {
-                target: url,
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-                changeOrigin: true,
+				changeOrigin: true,
-            }, '/workSubmit': {
+			}, '/workSubmit': {
-                target: url,
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-                changeOrigin: true,
+				changeOrigin: true,
-            }, '/userbasic': {
+			}, '/userbasic': {
-                target: 'https://u.boe.com',
+				target: 'https://u-pre.boe.com',
-                changeOrigin: true,
+				changeOrigin: true,
-            },
+			}, '/link': {
-        }
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
-    }
+				changeOrigin: true,
-    })
+			}, '/onlineClasses/queryOnlineClassesStudyDetail': {
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+				changeOrigin: true,
+			},
+		}
+	}
+})
 )