Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-stu into develop

2025-12-10 11:26:49 +08:00 · 2022-12-26 09:15:20 +08:00
parent ba2fcc6b0b 559878570c
commit ebe1c19f29
5 changed files with 441 additions and 430 deletions
--- a/src/App.vue
+++ b/src/App.vue
@@ -36,7 +36,7 @@ import {useStore} from "vuex";
 import {onMounted} from "vue";
 import router from "@/router";

-console.log("版本1.0.5------------");
+console.log("版本1.0.6------------");
 const store = useStore();
 onMounted(() => {
  getUserInfo();
--- a/src/components/PathDetailImage.vue
+++ b/src/components/PathDetailImage.vue
@@ -3,7 +3,9 @@
    <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'}">
+           class="nameClass"
+           :title="item.name"
+           :style="{background: `url('${current===i?currentBack:nameBack}')`,backgroundSize:'100%',width:`${current===i?107:93}px`,height:`${current===i?80:70}px`,lineHeight:'50px',color:'#FFF'}">
        {{ item.name }}
      </div>
    </div>
@@ -31,11 +33,12 @@ const imageAttrs = {
    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},
+      {left: 63, top: 503},
+      {left: 828, top: 455},
+      {left: 268, top: 325},
+      {left: 1087, top: 183},
+      {left: 647, top: 84},
+      {left: 1180, top: 40},
    ]
  }
 }
@@ -79,4 +82,12 @@ function close() {
  position: absolute;
  cursor: pointer;
 }
+.nameClass{
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+  padding:0 20px 0 50px;
+  font-size: 12px;
+}
 </style>
--- a/src/views/faceteach/FaceTeachSignUp.vue
+++ b/src/views/faceteach/FaceTeachSignUp.vue
@@ -10,8 +10,9 @@

      <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>
+          <el-button style="color:#0073FB"><img class="img2" style="margin-right:11px;cursor: pointer;"
+                                                src="../../assets/image/return.png"/>返回
+          </el-button>
        </div>
      </div>
    </div>
@@ -25,20 +26,20 @@
        <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" />
+            <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?.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" />
+            <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>
+            <botton class="btn" style="margin-right: 20px;width: 160px;height: 46px;" @click="onLineSignUp" :style="{	background: data.isSignUp ? '#999' : 'rgb(57, 146, 249)'}">{{data.isSignUp?'已报名':'立即报名'}}</botton>
          </div>
        </div>
      </div>
@@ -82,7 +83,7 @@
                    <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" />
+                    <img style="width: 16px; height: 15px" src="../../assets/image/download.png"/>
                    <div style="margin-left: 5px;color:#999;">
                      下载
                    </div>
@@ -98,13 +99,13 @@
      </div>
      <div class="teacher">
        <div class="title">
-					<img style="width: 21px; height: 23px" src="../../assets/image/livelecturer.png" />
+          <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" />
+          <img class="peopleimg" :src="teacherInfo.avatar"/>
          <div class="nameSpan">
            <div class="teacherName" style="margin-right: 5px">
              {{ data.planDto?.teacher }}
@@ -120,9 +121,9 @@
 </template>

 <script setup>
-import { computed, reactive, toRefs, watch, onUnmounted } from "vue";
+import {computed, reactive, toRefs, watch, onUnmounted} from "vue";
 import FileTypeImg from "@/components/FileTypeImg.vue";
-import { request, useRequest } from "@/api/request";
+import {request, useRequest} from "@/api/request";
 import {
  STU_OFFCOURSE_DETAIL,
  TASK_OFFCOURSE_NOTASK_SIGN,
@@ -130,20 +131,21 @@ import {
  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 {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 },
+  query: {courseId, type, id: taskId},
 } = useRoute();

-const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId });
-console.log("datadatadatadatadatadatadata", data);
+const {data} = useRequest(STU_OFFCOURSE_DETAIL, {courseId});
+
 const teacherInfo = useUserInfo(
    computed(() => data.value?.planDto?.teacherId)
 );
@@ -153,7 +155,7 @@ const state = reactive({
  enclosure: "",
  isAllowSign: false,
 });
-const { activeName, enclosure, isAllowSign } = toRefs(state);
+const {activeName, enclosure, isAllowSign} = toRefs(state);
 const handleClick = (tab, event) => {
  console.log("附件", tab, event);
 };
@@ -167,11 +169,9 @@ let timer = null;

 // 报名
 function onLineSignUp() {
-	request(FACETEACH_SIGNUP, { courseId }).then(res => {
-		console.log(res)
-		if (res.code == 200) {
+  data.value.isSignUp || request(FACETEACH_SIGNUP, {courseId}).then(() => {
    ElMessage.success("报名成功");
-		}
+    router.push({path: 'faceteach', query: {courseId}})
  }).catch(err => {
    console.log(err)
  });
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -437,11 +437,11 @@ function toFinish(d, sName, chapterOrStageId) {
 		return;
 	}
 	if (d.type == 3 || d.type == 7) {
-		request(STUDY_RECORD, {
+    d.status || 	request(STUDY_RECORD, {
 			studentId: data.value.userInfoBo.userId,
 			targetId: data.value.routerId,
 			logo: 2,
-			stageOrChapterId: chapterId,
+			stageOrChapterId: chapterOrStageId,
 			taskId: d.projectTaskId,
 		});
 	}
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -74,7 +74,7 @@
 								<div>当前进度</div>
 								<div class="progress">
 									<div style="width: 291px">
-										<el-progress :percentage="value.currentRatio * 100" :show-text="false" :stroke-width="8" :color="
+										<el-progress :percentage="value.currentRatio" :show-text="false" :stroke-width="8" :color="
 											{
 												0: 'rgba(238, 112, 108, 1)',
 												1: 'rgba(255, 151, 38, 1)',
@@ -82,7 +82,7 @@
 												3: 'rgba(59, 94, 251, 1)',
 												4: 'rgba(57, 219, 183, 1)',
 												5: 'rgba(57, 219, 183, 1)',
-											}[parseInt(value.currentRatio * 100 / 20)]
+											}[parseInt(value.currentRatio / 20)]
 										" />
 									</div>
 									<div style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;" 
@@ -94,9 +94,9 @@
                    		3: 'rgba(59, 94, 251, 1)',
                    		4: 'rgba(57, 219, 183, 1)',
                    		5: 'rgba(57, 219, 183, 1)',
-                    	}[parseInt(value.currentRatio * 100 / 20)],
+                    	}[parseInt(value.currentRatio / 20)],
                    }">
-										{{ value.currentRatio}}%
+										{{ value.currentRatio }}%
 									</div>
 								</div>
 							</div>
@@ -446,7 +446,7 @@ function toFinish(d) {
 		}
 	}
 	if (d.type === 3 || d.type === 7) {
-		request(STUDY_RECORD, {
+    d.status || request(STUDY_RECORD, {
 			studentId: userInfo.value.id,
 			targetId: data.value.routerId,
 			logo: 1,
@@ -463,8 +463,8 @@ function toFinish(d) {
 			router.push({
 				path: types.value.path[d.type],
 				query: {
-					// id: d.routerTaskId,
-					id: routerId,
+					id: d.routerTaskId,
+					// id: routerId,
 					type: 1,
 					taskId: routerId,
 					taskIds: routerId,