From 24641add714a2aee6916cc23d54a1df7f83d9312 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Tue, 20 Dec 2022 11:36:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?style:=E9=9A=90=E8=97=8F=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE=E5=8A=A0=E8=BD=BD=E6=97=B6=E8=93=9D?=
 =?UTF-8?q?=E8=89=B2=E8=83=8C=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/roadmap/LearnPath.vue | 557 +++++++++++++++-----------------
 1 file changed, 258 insertions(+), 299 deletions(-)

diff --git a/src/views/roadmap/LearnPath.vue b/src/views/roadmap/LearnPath.vue
index 0d5c134..aea809f 100644
--- a/src/views/roadmap/LearnPath.vue
+++ b/src/views/roadmap/LearnPath.vue
@@ -1,151 +1,106 @@
 <template>
-  <div class="learnpath">
-    <div class="content">
-      <div class="title">
-        <div class="titleL">
-          <div @click="returnfun" class="text">学习路径图</div>
-          <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"
-            />
-            <div style="margin-top: 1px">{{ userInfo.jobName }}</div>
-          </div>
-          <div class="info" v-if="userInfo.bandDesc">
-            <img
-              style="width: 18px; height: 17px; margin-right: 11px"
-              src="../../assets/image/band.png"
-            />
-            <div style="margin-top: 2px">{{ userInfo.bandDesc }}</div>
-          </div>
-        </div>
-        <div :style="{ display: !showmapdetail ? 'flex' : 'none' }">
-          <!--          <el-popover width="475px" trigger="hover" popper-class="lppopover">-->
-          <!--            <div>-->
-          <!--              <div class="finish">-->
-          <!--                <img-->
-          <!--                    src="../../assets/image/circle.png"-->
-          <!--                    style="width: 20px; height: 20px"-->
-          <!--                />-->
-          <!--                <div class="text">未完成</div>-->
-          <!--                <div class="box"></div>-->
-          <!--              </div>-->
-          <!--              <div-->
-          <!--                  v-for="(value, index) in unCompleteTaskList"-->
-          <!--                  :key="index"-->
-          <!--                  class="tasks"-->
-          <!--                  :style="{-->
-          <!--                  'border-bottom':-->
-          <!--                    index === unCompleteTaskList.length - 1-->
-          <!--                      ? null-->
-          <!--                      : '1px solid rgba(229, 228, 228, 1)',-->
-          <!--                }"-->
-          <!--              >-->
-          <!--                <div style="font-size: 14px; font-weight: 500; color: #677d86">-->
-          <!--                  {{ value.name }}-->
-          <!--                </div>-->
-          <!--                <img-->
-          <!--                    style="width: 20px; height: 20px"-->
-          <!--                    src="../../assets/image/go.png"-->
-          <!--                    @click="toUnTask(chapterId)"-->
-          <!--                />-->
-          <!--              </div>-->
-          <!--            </div>-->
-          <!--            <template #reference>-->
-          <!--              todo #学习路径 只会有一个未完成任务么?是否是直接跳到任务详情-->
-          <!--              <div class="titleR">进入未完成任务</div>-->
-          <!--            </template>-->
-          <!--          </el-popover>-->
-        </div>
-        <div
-          :style="{ display: showmapdetail ? 'flex' : 'none' }"
-          class="titleR"
-          @click="returnfun"
-        >
-          返回列表
-        </div>
-      </div>
-      <!-- 路径列表-->
-      <div :style="{ display: !showmapdetail ? 'flex' : 'none' }" class="head">
-        <div style="min-width: 770px; width: 100%">
-          <el-table :data="data" style="width: 100%" @row-click="gofun">
-            <el-table-column
-              prop="img"
-              label="缩略图"
-              #default="scope"
-              align="center"
-              width="255"
-            >
-              <img
-                :src="scope.row.picUrl"
-                style="width: 230px; height: 155px"
-              />
-            </el-table-column>
-            <el-table-column align="center" prop="name" label="路径名称" />
-            <el-table-column
-              align="center"
-              prop="introduce"
-              label="路径介绍"
-              #default="scope"
-            >
-              <el-popover
-                placement="top-start"
-                title="路径介绍"
-                trigger="hover"
-                :content="scope.row.remark"
-              >
-                <template #reference>
-                  <div>{{ scope.row.remark }}</div>
-                </template>
-              </el-popover>
-            </el-table-column>
+	<div class="learnpath">
+		<div class="content">
+			<div class="title">
+				<div class="titleL">
+					<div @click="returnfun" class="text">学习路径图</div>
+					<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" />
+						<div style="margin-top: 1px">{{ userInfo.jobName }}</div>
+					</div>
+					<div class="info" v-if="userInfo.bandDesc">
+						<img style="width: 18px; height: 17px; margin-right: 11px" src="../../assets/image/band.png" />
+						<div style="margin-top: 2px">{{ userInfo.bandDesc }}</div>
+					</div>
+				</div>
+				<div :style="{ display: !showmapdetail ? 'flex' : 'none' }">
+					<!--          <el-popover width="475px" trigger="hover" popper-class="lppopover">-->
+					<!--            <div>-->
+					<!--              <div class="finish">-->
+					<!--                <img-->
+					<!--                    src="../../assets/image/circle.png"-->
+					<!--                    style="width: 20px; height: 20px"-->
+					<!--                />-->
+					<!--                <div class="text">未完成</div>-->
+					<!--                <div class="box"></div>-->
+					<!--              </div>-->
+					<!--              <div-->
+					<!--                  v-for="(value, index) in unCompleteTaskList"-->
+					<!--                  :key="index"-->
+					<!--                  class="tasks"-->
+					<!--                  :style="{-->
+					<!--                  'border-bottom':-->
+					<!--                    index === unCompleteTaskList.length - 1-->
+					<!--                      ? null-->
+					<!--                      : '1px solid rgba(229, 228, 228, 1)',-->
+					<!--                }"-->
+					<!--              >-->
+					<!--                <div style="font-size: 14px; font-weight: 500; color: #677d86">-->
+					<!--                  {{ value.name }}-->
+					<!--                </div>-->
+					<!--                <img-->
+					<!--                    style="width: 20px; height: 20px"-->
+					<!--                    src="../../assets/image/go.png"-->
+					<!--                    @click="toUnTask(chapterId)"-->
+					<!--                />-->
+					<!--              </div>-->
+					<!--            </div>-->
+					<!--            <template #reference>-->
+					<!--              todo #学习路径 只会有一个未完成任务么?是否是直接跳到任务详情-->
+					<!--              <div class="titleR">进入未完成任务</div>-->
+					<!--            </template>-->
+					<!--          </el-popover>-->
+				</div>
+				<div :style="{ display: showmapdetail ? 'flex' : 'none' }" class="titleR" @click="returnfun">
+					返回列表
+				</div>
+			</div>
+			<!-- 路径列表-->
+			<div :style="{ display: !showmapdetail ? 'flex' : 'none' }" class="head">
+				<div style="min-width: 770px; width: 100%">
+					<el-table :data="data" style="width: 100%" @row-click="gofun">
+						<el-table-column prop="img" label="缩略图" #default="scope" align="center" width="255">
+							<img :src="scope.row.picUrl" style="width: 230px; height: 155px" />
+						</el-table-column>
+						<el-table-column align="center" prop="name" label="路径名称" />
+						<el-table-column align="center" prop="introduce" label="路径介绍" #default="scope">
+							<el-popover placement="top-start" title="路径介绍" trigger="hover" :content="scope.row.remark">
+								<template #reference>
+									<div>{{ scope.row.remark }}</div>
+								</template>
+							</el-popover>
+						</el-table-column>
 
-            <el-table-column
-              align="center"
-              prop="organizationName"
-              label="归属组织"
-            />
-            <el-table-column
-              #default="scope"
-              align="center"
-              :width="150"
-              prop="state"
-              label="状态"
-            >
-              <img
-                :src="
-                  scope.row.status === 0
-                    ? ongoing
-                    : scope.row.status === 1
-                    ? completed
-                    : scope.row.status === -1
-                    ? nostarted
-                    : null
-                "
-                style="width: 99px; height: 99px"
-              />
-            </el-table-column>
-          </el-table>
-        </div>
-      </div>
+						<el-table-column align="center" prop="organizationName" label="归属组织" />
+						<el-table-column #default="scope" align="center" :width="150" prop="state" label="状态">
+							<img :src="
+								scope.row.status === 0
+									? ongoing
+									: scope.row.status === 1
+										? completed
+										: scope.row.status === -1
+											? nostarted
+											: null
+							" style="width: 99px; height: 99px" />
+						</el-table-column>
+					</el-table>
+				</div>
+			</div>
 
-      <!--      :src="{ 0: nostarted, 1: completed, 2: ongoing }[scope.row.status]"-->
-      <!-- 路径列表-->
-      <!-- 路径详情图 -->
-      <div
-        :style="{ display: showmapdetail ? 'flex' : 'none' }"
-        class="mapdetail"
-      >
-        <div v-for="(item, i) in detail?.rows" :key="i">
-          <img :src="useImage(`222_0${i + 2}.png`)" />
-        </div>
-        <!--        <div class="modal"-->
-        <!--             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>
+			<!--      :src="{ 0: nostarted, 1: completed, 2: ongoing }[scope.row.status]"-->
+			<!-- 路径列表-->
+			<!-- 路径详情图 -->
+			<div :style="{ display: showmapdetail ? 'flex' : 'none' }" class="mapdetail">
+				<div v-for="(item, i) in detail?.rows" :key="i">
+					<img :src="useImage(`222_0${i + 2}.png`)" />
+				</div>
+				<!--        <div class="modal"-->
+				<!--             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";
@@ -154,9 +109,9 @@ import completed from "../../assets/image/completed.png";
 import ongoing from "../../assets/image/ongoing.png";
 import { boeRequest, request, usePage, useRequest } from "@/api/request";
 import {
-  ROUTER_CHAPTER_LIST,
-  ROUTER_LIST,
-  ROUTER_UNCOMPLETE_LIST,
+	ROUTER_CHAPTER_LIST,
+	ROUTER_LIST,
+	ROUTER_UNCOMPLETE_LIST,
 } from "@/api/api";
 import { useImage } from "@/api/utils";
 import { useRouter } from "vue-router";
@@ -168,193 +123,197 @@ 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,
+	showmapdetail: false,
 });
 const { showmapdetail } = toRefs(state);
 
 const returnfun = () => {
-  state.showmapdetail = false;
+	state.showmapdetail = false;
 };
 
 async function gofun({ routerId, name: routerName }) {
-  // console.log(routerId)
-  // const data = await request(ROUTER_CHAPTER_LIST, {stuChapterListVo: {routerId}})
-  // detail.value = data.data
-  // state.showmapdetail = true;
-  // router.push({path: "/pathdetails", query: {routerId}});
-  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}`
-        )}`
-      );
+	// console.log(routerId)
+	// const data = await request(ROUTER_CHAPTER_LIST, {stuChapterListVo: {routerId}})
+	// detail.value = data.data
+	// state.showmapdetail = true;
+	// router.push({path: "/pathdetails", query: {routerId}});
+	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() {}
+function toUnTask() { }
 </script>
 <style lang="scss">
-.modal {
+#app div:nth-child(1) {
+	background: rgba(0, 0, 0, 0) !important;
 }
 
+.modal {}
+
 .modal:after {
-  content: "";
+	content: "";
 }
 
 .learnpath {
-  width: 100%;
-  min-height: 800px;
-  //border-radius: 8px;
-  background-color: rgba(255, 255, 255, 1);
-  display: flex;
+	width: 100%;
+	min-height: 800px;
+	//border-radius: 8px;
+	background-color: rgba(255, 255, 255, 1);
+	display: flex;
 
-  .content {
-    width: 100%;
-    // flex: 1;
-    margin-top: 43px;
-    // background-color: pink;
-    .title {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-left: 53px;
-      margin-right: 54px;
-    }
+	.content {
+		width: 100%;
+		// flex: 1;
+		margin-top: 43px;
 
-    .title .titleL {
-      display: flex;
-      align-items: center;
-    }
+		// background-color: pink;
+		.title {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-left: 53px;
+			margin-right: 54px;
+		}
 
-    .title .titleL .text {
-      font-size: 18px;
-      font-weight: bold;
-      color: #333333;
-      line-height: 24px;
-      margin-right: 26px;
-    }
+		.title .titleL {
+			display: flex;
+			align-items: center;
+		}
 
-    .title .titleL .info {
-      display: flex;
-      // align-items: center;
-      font-size: 14px;
-      font-weight: 400;
-      color: #387df7;
-    }
+		.title .titleL .text {
+			font-size: 18px;
+			font-weight: bold;
+			color: #333333;
+			line-height: 24px;
+			margin-right: 26px;
+		}
 
-    .title .titleR {
-      width: 157px;
-      height: 48px;
-      border: 2px solid #0060ff;
-      border-radius: 8px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      cursor: pointer;
-      font-size: 16px;
-      font-weight: bold;
-      color: #0060ff;
-    }
+		.title .titleL .info {
+			display: flex;
+			// align-items: center;
+			font-size: 14px;
+			font-weight: 400;
+			color: #387df7;
+		}
 
-    .head {
-      // height: 50px;
-      background: #f9f9f9;
-      margin-top: 50px;
-      display: flex;
-      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;
+		.title .titleR {
+			width: 157px;
+			height: 48px;
+			border: 2px solid #0060ff;
+			border-radius: 8px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			cursor: pointer;
+			font-size: 16px;
+			font-weight: bold;
+			color: #0060ff;
+		}
 
-      .el-table th.el-table__cell {
-        background: rgba(249, 249, 249, 1);
-        color: rgba(51, 51, 51, 1);
-        font-size: 14px;
-        font-weight: 500;
-      }
+		.head {
+			// height: 50px;
+			background: #f9f9f9;
+			margin-top: 50px;
+			display: flex;
+			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 .cell {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        width: 100%;
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 3;
-        word-break: break-all;
-      }
+			.el-table th.el-table__cell {
+				background: rgba(249, 249, 249, 1);
+				color: rgba(51, 51, 51, 1);
+				font-size: 14px;
+				font-weight: 500;
+			}
 
-      .el-table__row {
-        height: 231px;
-        font-size: 14px;
-        color: rgba(102, 102, 102, 1);
-        font-weight: 500;
-      }
-    }
+			.el-table .cell {
+				overflow: hidden;
+				text-overflow: ellipsis;
+				width: 100%;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 3;
+				word-break: break-all;
+			}
 
-    .mapdetail {
-      width: calc(100% - 107px);
-      height: 577px;
-      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;
-    }
-  }
+			.el-table__row {
+				height: 231px;
+				font-size: 14px;
+				color: rgba(102, 102, 102, 1);
+				font-weight: 500;
+			}
+		}
+
+		.mapdetail {
+			width: calc(100% - 107px);
+			height: 577px;
+			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 {
-    padding-left: 27px;
-    padding-right: 18px;
-    margin-top: 15px;
-    margin-bottom: 17px;
-    position: relative;
-    display: flex;
-    align-items: center;
-  }
+	.finish {
+		padding-left: 27px;
+		padding-right: 18px;
+		margin-top: 15px;
+		margin-bottom: 17px;
+		position: relative;
+		display: flex;
+		align-items: center;
+	}
 
-  .text {
-    font-size: 16px;
-    font-weight: 800;
-    color: #333333;
-    margin-left: 8px;
-  }
+	.text {
+		font-size: 16px;
+		font-weight: 800;
+		color: #333333;
+		margin-left: 8px;
+	}
 
-  .box {
-    width: 59px;
-    height: 10px;
-    background-color: rgba(36, 120, 255, 0.15);
-    position: absolute;
-    left: 50px;
-    top: 15px;
-  }
+	.box {
+		width: 59px;
+		height: 10px;
+		background-color: rgba(36, 120, 255, 0.15);
+		position: absolute;
+		left: 50px;
+		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;
+	}
 }
 </style>

From a3f25a055f37e009d49854c64b10192bd1fef29b Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Wed, 21 Dec 2022 11:34:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BD=9C=E4=B8=9A=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=E5=80=BC=E6=9C=AA=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E4=BD=9C=E4=B8=9A=E5=86=85=E5=AE=B9=E5=8F=8A?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E9=99=84=E4=BB=B6=E5=88=A4=E6=96=AD=E6=9C=89?=
 =?UTF-8?q?=E4=B8=80=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/img/UploadImg.vue    |   86 +-
 src/views/homework/HomeworkPage.vue | 1720 +++++++++++++--------------
 2 files changed, 879 insertions(+), 927 deletions(-)

diff --git a/src/components/img/UploadImg.vue b/src/components/img/UploadImg.vue
index c5f9b39..bd99e07 100644
--- a/src/components/img/UploadImg.vue
+++ b/src/components/img/UploadImg.vue
@@ -1,32 +1,24 @@
 <template>
-  <el-upload
-      :file-list="files"
-      :action="FILE_UPLOAD"
-      method="POST"
-      :show-file-list="false"
-      :on-change="handleChange"
-      :limit="max"
-      ref="imageRef"
-      :on-exceed="exceed"
-  >
-    <template #trigger>
-      <div>
-        <slot></slot>
-      </div>
-    </template>
-  </el-upload>
+	<el-upload :file-list="files" :action="FILE_UPLOAD" method="POST" :show-file-list="false" :on-change="handleChange"
+		:limit="max" ref="imageRef" :on-exceed="exceed">
+		<template #trigger>
+			<div>
+				<slot></slot>
+			</div>
+		</template>
+	</el-upload>
 </template>
 <script setup>
-import {FILE_UPLOAD} from "@/api/api";
-import {defineProps, ref, watch} from "vue";
-import {ElMessage} from "element-plus";
+import { FILE_UPLOAD } from "@/api/api";
+import { defineProps, ref, watch } from "vue";
+import { ElMessage } from "element-plus";
 
 const props = defineProps({
-  value: [],
-  max: {
-    type: Number,
-    default: 1
-  }
+	value: [],
+	max: {
+		type: Number,
+		default: 1
+	}
 })
 
 const emit = defineEmits()
@@ -35,46 +27,48 @@ const files = ref([])
 const imageRef = ref()
 
 watch(props.value, () => {
-  props.value.length || (files.value = props.value)
+	props.value.length || (files.value = props.value)
 })
 
 function exceed() {
-  ElMessage.error(`只能上传${props.max}个附件`);
+	ElMessage.error(`只能上传${props.max}个附件`);
 }
 
 function handleChange(e) {
-  if (e.response && e.response.code === 200) {
-    e.url = e.response.data
-  }
+	if (e.response && e.response.code === 200) {
+		e.url = e.response.data
+	}
 
-  const index = files.value.findIndex(f => f.uid === e.uid)
-  if (index === -1) {
-    files.value.unshift(e)
-  } else {
-    files.value[index] = e
-  }
-  emit('update:value', files.value)
+	const index = files.value.findIndex(f => f.uid === e.uid)
+	if (index === -1) {
+		files.value.unshift(e)
+	} else {
+		files.value[index] = e
+	}
+	emit('update:value', files.value)
 }
 
 function remove(i) {
-  files.value.splice(i, 1)
+	files.value.splice(i, 1)
+	console.log(imageRef)
+	imageRef.value.clearFiles();
 }
 
 function reUpload(i) {
-  if (files.value[i].status === 'ready' || files.value[i].status === 'uploading') {
-    imageRef.value.abort(files.value[i].raw)
-    files.value[i].status = 'abort';
-  } else if (files.value[i].status === 'fail' || files.value[i].status === 'abort') {
-    imageRef.value.handleStart(files.value[i].raw)
-    imageRef.value.submit()
-  }
+	if (files.value[i].status === 'ready' || files.value[i].status === 'uploading') {
+		imageRef.value.abort(files.value[i].raw)
+		files.value[i].status = 'abort';
+	} else if (files.value[i].status === 'fail' || files.value[i].status === 'abort') {
+		imageRef.value.handleStart(files.value[i].raw)
+		imageRef.value.submit()
+	}
 }
 
 function abort(i) {
-  imageRef.value.abort(files.value[i].raw)
+	imageRef.value.abort(files.value[i].raw)
 }
 
 
-defineExpose({reUpload, remove})
+defineExpose({ reUpload, remove })
 
 </script>
diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue
index 114db2d..27a4c16 100644
--- a/src/views/homework/HomeworkPage.vue
+++ b/src/views/homework/HomeworkPage.vue
@@ -1,13 +1,13 @@
 <template>
-  <div class="homework" style="padding: 30px">
-    <!-- 面包屑导航 -->
-    <div class="crumb">
-      <div>{{ pName }}</div>
-      <div style="margin-left: 6px; margin-right: 6px">/</div>
-      <div>{{ sName }}</div>
-      <div style="margin-left: 6px; margin-right: 6px">/</div>
-      <div style="font-weight: 700; font-size: 16px">作业详情</div>
-      <!--
+	<div class="homework" style="padding: 30px">
+		<!-- 面包屑导航 -->
+		<div class="crumb">
+			<div>{{ pName }}</div>
+			<div style="margin-left: 6px; margin-right: 6px">/</div>
+			<div>{{ sName }}</div>
+			<div style="margin-left: 6px; margin-right: 6px">/</div>
+			<div style="font-weight: 700; font-size: 16px">作业详情</div>
+			<!--
       <div class="preNext">
         <button class="btn btn01"></button>
         <span class="content" style="margin-left: 6px">上一个</span>
@@ -15,934 +15,892 @@
         <button class="btn btn02" style="margin-left: 6px"></button>
       </div>-->
 
-      <div class="return">
-        <div style="display: flex" @click="returnclick">
-          <img
-            class="img2"
-            style="margin-right: 22px"
-            src="../../assets/image/return.png"
-          />
-          <div class="text">返回</div>
-        </div>
-      </div>
-    </div>
-    <!-- 面包屑导航 -->
-    <div class="debateTitle" style="color: #fff">
-      【作业】{{ data?.workName }}
-    </div>
-    <!-- 详细信息 -->
-    <div class="detailinfo">
-      <div class="detail">
-        <div class="detailT">
-          <div
-            style="
+			<div class="return">
+				<div style="display: flex" @click="returnclick">
+					<img class="img2" style="margin-right: 22px;cursor: pointer;" src="../../assets/image/return.png" />
+					<div style="cursor: pointer;" class="text">返回</div>
+				</div>
+			</div>
+		</div>
+		<!-- 面包屑导航 -->
+		<div class="debateTitle" style="color: #fff">
+			【作业】{{ data?.workName }}
+		</div>
+		<!-- 详细信息 -->
+		<div class="detailinfo">
+			<div class="detail">
+				<div class="detailT">
+					<div style="
               margin-left: 45px;
               margin-right: 42px;
               position: relative;
               width: 100%;
-            "
-          >
-            <div class="title">
-              <img
-                style="width: 20px; height: 20px"
-                src="../../assets/image/yuan.png"
-              />
-              <div class="text">作业名称</div>
-              <div class="box"></div>
-            </div>
-            <div class="shapan">
-              <div style="flex: 1; width: 0">
-                <div class="shapanexplain">
-                  {{ data?.workName }}
-                </div>
-              </div>
-            </div>
-            <UploadImg v-model:value="fileList" ref="uploadRef">
-              <button
-                class="shangchuan"
-                style="cursor: pointer"
-              >
-                上传
-              </button>
-            </UploadImg>
-            <div
-              class="uploadDetail"
-              :style="{ display: showFileList && fileList && fileList.length >0 ? 'block' : 'none' }"
-              @mousemove="showFileList = 1"
-              @mouseout="showFileList = 0"
-              style="padding-top: 60px"
-            >
-              <div class="triangle"></div>
-              <div class="square clearfix">
-                <div
-                  class="squarecontent1"
-                  v-for="(file, i) in fileList"
-                  :key="i"
-                >
-                  <FileTypeImg
-                    v-model="file.name"
-                    :style="{ margin: '12px 15px 0 27px' }"
-                  ></FileTypeImg>
-                  <div class="rarDetail">
-                    <span class="detail1" style="margin-right: 130px">
-                      {{ file.name }}
-                    </span>
-                    <span class="detail2" style="margin-right: 10px"
-                      >{{ file.percentage }}%</span
-                    >
-                    <span class="detail1">{{
-                      {
-                        ready: "正在上传",
-                        abort: "暂停",
-                        uploading: "正在上传",
-                        fail: "上传失败",
-                        success: "上传成功",
-                      }[file.status]
-                    }}</span>
-                    <div class="progress">
-                      <div
-                        class="progressinner"
-                        :style="{ width: `${(291 * file.percentage) / 100}px` }"
-                      ></div>
-                    </div>
-                  </div>
-                  <button class="btn btndetail" @click="reUpload(i)">
-                    {{
-                      {
-                        ready: "暂停",
-                        uploading: "暂停",
-                        abort: "开始",
-                        fail: "重传",
-                      }[file.status]
-                    }}
-                  </button>
-                  <button class="btn" @click="remove">
-                    {{
-                      {
-                        ready: "取消",
-                        abort: "取消",
-                        uploading: "取消",
-                        fail: "取消",
-                        success: "删除",
-                      }[file.status]
-                    }}
-                  </button>
-                </div>
-              </div>
-            </div>
+            ">
+						<div class="title">
+							<img style="width: 20px; height: 20px" src="../../assets/image/yuan.png" />
+							<div class="text">作业名称</div>
+							<div class="box"></div>
+						</div>
+						<div class="shapan">
+							<div style="flex: 1; width: 0">
+								<div class="shapanexplain">
+									{{ data?.workName }}
+								</div>
+							</div>
+						</div>
+						<UploadImg v-model:value="fileList" ref="uploadRef">
+							<button class="shangchuan" style="cursor: pointer">
+								上传
+							</button>
+						</UploadImg>
+						<div class="uploadDetail"
+							:style="{ display: showFileList && fileList && fileList.length > 0 ? 'block' : 'none' }"
+							@mousemove="showFileList = 1" @mouseout="showFileList = 0" style="padding-top: 60px">
+							<div class="triangle"></div>
+							<div class="square clearfix">
+								<div class="squarecontent1" v-for="(file, i) in fileList" :key="i">
+									<FileTypeImg v-model="file.name" :style="{ margin: '12px 15px 0 27px' }"></FileTypeImg>
+									<div class="rarDetail">
+										<span class="detail1" style="margin-right: 130px">
+											{{ file.name }}
+										</span>
+										<span class="detail2" style="margin-right: 10px">{{ file.percentage }}%</span>
+										<span class="detail1">{{
+												{
+													ready: "正在上传",
+													abort: "暂停",
+													uploading: "正在上传",
+													fail: "上传失败",
+													success: "上传成功",
+												}[file.status]
+										}}</span>
+										<div class="progress">
+											<div class="progressinner" :style="{ width: `${(291 * file.percentage) / 100}px` }"></div>
+										</div>
+									</div>
+									<button class="btn btndetail" @click="reUpload(i)">
+										{{
+												{
+													ready: "暂停",
+													uploading: "暂停",
+													abort: "开始",
+													fail: "重传",
+												}[file.status]
+										}}
+									</button>
+									<button class="btn" @click="remove">
+										{{
+												{
+													ready: "取消",
+													abort: "取消",
+													uploading: "取消",
+													fail: "取消",
+													success: "删除",
+												}[file.status]
+										}}
+									</button>
+								</div>
+							</div>
+						</div>
 
-            <div class="title">
-              <img
-                style="width: 20px; height: 20px"
-                src="../../assets/image/yuan.png"
-              />
-              <div class="text">作业内容</div>
-              <div class="box"></div>
-            </div>
+						<div class="title">
+							<img style="width: 20px; height: 20px" src="../../assets/image/yuan.png" />
+							<div class="text">作业内容</div>
+							<div class="box"></div>
+						</div>
 
-            <div class="join">
-              <el-input
-                v-model="sbValue.content"
-                :autosize="{ minRows: 12.5, maxRows: 12.5 }"
-                resize="none"
-                type="textarea"
-              />
-            </div>
-            <div  style="display: flex; justify-content: center">
-              <button class="tijiao" @click="handleClick">{{submitList && submitList.length>0?"再次":""}}提交</button>
-            </div>
-         
-          
-          
+						<div class="join">
+							<el-input v-model="sbValue.content" :autosize="{ minRows: 12.5, maxRows: 12.5 }" resize="none"
+								type="textarea" />
+						</div>
+						<div style="display: flex; justify-content: center">
+							<button class="tijiao" @click="handleClick">{{ submitList && submitList.length > 0 ? "再次" : ""
+							}}提交</button>
+						</div>
 
-            <div class=""></div>
 
-            <div class="title" style="margin-top: 0px">
-              <img
-                style="width: 20px; height: 20px"
-                src="../../assets/image/yuan.png"
-              />
-              <div class="text">历史纪录</div>
-              <div class="box"></div>
-            </div>
 
-            <div class="history">
-              <div class="historytitle">
-                <div class="content1">提交时间</div>
-                <div class="content2">作业内容</div>
-                <div class="content3">附件</div>
-              </div>
-              <div
-                v-for="(value, index) in submitList"
-                :key="index"
-                class="historytitle2"
-                :style="{
-                  'border-bottom':
-                    index === submitList.length - 1
-                      ? '1px solid rgba(215, 229, 253, 0)'
-                      : '1px solid rgba(215, 229, 253, 1)',
-                }"
-              >
-                <div class="content1" >{{ value.createTime }}</div>
-                <div class="content2">
-                  <div >
-                    {{ value.workUploadContent }}
-                   
-                  </div>
-                </div>
-                <div class="content3">
-                  <div >
-                    
-                    <span style="margin-left: 10px">
-                      <el-link target="_blank" type="primary" :href="value.workUploadAddress?.split(',')[0] || ''">{{value.workUploadAddress?.split(',')[0].split('/').at(-1)|| ''}}</el-link>
-                    </span>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="right">
-        <div class="righttitle">
-          <img
-            style="width: 20px; height: 20px"
-            src="../../assets/image/yuan.png"
-          />
-          <div class="text">截止时间</div>
-          <div class="box"></div>
-        </div>
-        <div class="timebox clearfix">
-          <div class="innertime">
-            {{
-              data?.submitStartTime
-            }}&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;{{
-              data?.submitEndTime
-            }}
-          </div>
-          <div class="endtime clearfix">
-            <div class="endtimetext">
-              距离结束还有&nbsp;&nbsp;
-              <span class="te">{{
-                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">
-          <img
-            style="width: 20px; height: 20px"
-            src="../../assets/image/yuan.png"
-          />
 
-          <div class="text">作业说明</div>
-          <div class="box"></div>
-        </div>
-        <div class="explain clearfix">
-          <!-- todo #作业任务详情 作业说明是作业要求字段么？-->
-          <div
-            class="explain1"
-            style="margin-top: 26px"
-            v-html="data?.workRequirement"
-          ></div>
-        </div>
-      </div>
-    </div>
-    <!-- 详细信息 -->
-  </div>
+						<div class=""></div>
 
-  <el-dialog v-model="centerDialogVisible"  title="" width="20%" center :show-close="false" :align-center="true"> 
-  <div style="text-align: center;font-size:16px;">  <span style="color:black">
-     提交成功
-    </span></div>
-    <template #footer>
-      <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 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">
-          返回
-        </el-button>
-      </span>   
-    </template>
-  </el-dialog>
+						<div class="title" style="margin-top: 0px">
+							<img style="width: 20px; height: 20px" src="../../assets/image/yuan.png" />
+							<div class="text">历史记录</div>
+							<div class="box"></div>
+						</div>
+
+						<div class="history">
+							<div class="historytitle">
+								<div class="content1">提交时间</div>
+								<div class="content2">作业内容</div>
+								<div class="content3">附件</div>
+							</div>
+							<div v-for="(value, index) in submitList" :key="index" class="historytitle2" :style="{
+								'border-bottom':
+									index === submitList.length - 1
+										? '1px solid rgba(215, 229, 253, 0)'
+										: '1px solid rgba(215, 229, 253, 1)',
+							}">
+								<div class="content1">{{ value.createTime }}</div>
+								<div class="content2">
+									<div>
+										{{ value.workUploadContent }}
+
+									</div>
+								</div>
+								<div class="content3">
+									<div>
+
+										<span style="margin-left: 10px">
+											<el-link target="_blank" type="primary" :href="value.workUploadAddress?.split(',')[0] || ''">{{
+													value.workUploadAddress?.split(',')[0].split('/').at(-1) ||
+													''
+											}}</el-link>
+										</span>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="right">
+				<div class="righttitle">
+					<img style="width: 20px; height: 20px" src="../../assets/image/yuan.png" />
+					<div class="text">截止时间</div>
+					<div class="box"></div>
+				</div>
+				<div class="timebox clearfix">
+					<div class="innertime">
+						{{
+								data?.submitStartTime
+						}}&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;{{
+		data?.submitEndTime
+}}
+					</div>
+					<div class="endtime clearfix">
+						<div class="endtimetext">
+							距离结束还有&nbsp;&nbsp;
+							<span class="te">{{
+									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">
+					<img style="width: 20px; height: 20px" src="../../assets/image/yuan.png" />
+
+					<div class="text">作业说明</div>
+					<div class="box"></div>
+				</div>
+				<div class="explain clearfix">
+					<!-- todo #作业任务详情 作业说明是作业要求字段么？-->
+					<div class="explain1" style="margin-top: 26px" v-html="data?.workRequirement"></div>
+				</div>
+			</div>
+		</div>
+		<!-- 详细信息 -->
+	</div>
+
+	<el-dialog v-model="centerDialogVisible" title="" width="20%" center :show-close="false" :align-center="true">
+		<div style="text-align: center;font-size:16px;"> <span style="color:black">
+				提交成功
+			</span></div>
+		<template #footer>
+			<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 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">
+					返回
+				</el-button>
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script setup>
-import {computed, reactive, ref, toRefs} from "vue";
+import { computed, reactive, ref, toRefs } from "vue";
 import { request, useRequest } from "@/api/request";
 import {
-  TASK_WORK_COMMIT,
-  TASK_WORK_DETAIL,
-  TASK_WORK_SUBMIT_LIST,
-  WORK_HISTROY,
+	TASK_WORK_COMMIT,
+	TASK_WORK_DETAIL,
+	TASK_WORK_SUBMIT_LIST,
+	WORK_HISTROY,
 } from "@/api/api";
 import dayjs from "dayjs";
 import { useRouter } from "vue-router";
 import UploadImg from "@/components/img/UploadImg.vue";
 import FileTypeImg from "@/components/FileTypeImg.vue";
 import { useRoute } from "vue-router/dist/vue-router";
-import {ElMessage} from "element-plus";
+import { ElMessage } from "element-plus";
 //import AlertSuccess from "@/components/alert/AlertSuccess.vue";
 
 const fileList = ref([]);
 const uploadRef = ref();
 
-const centerDialogVisible =ref(false);
+const centerDialogVisible = ref(false);
 const sbValue = ref({
-  content: "",
-  attach: "",
+	content: "",
+	attach: "",
 });
 const router = useRouter();
 const returnclick = () => {
-  router.back();
+	router.back();
 };
 const {
-  query: { courseId: workId, type, id: taskId, pName, sName },
+	query: { courseId: workId, type, id: taskId, pName, sName },
 } = useRoute();
 
 const { data } = useRequest(TASK_WORK_DETAIL, { workId, taskId });
 
 const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, {
-  workerId: workId,
+	workerId: workId,
 });
 
-const open=()=>{
-  centerDialogVisible.value = true
+const open = () => {
+	centerDialogVisible.value = true
 };
-const showFileList = computed(()=>{
-  return fileList.value.length
+const showFileList = computed(() => {
+	return fileList.value.length
 })
 
 const handleClick = () => {
-  if(!sbValue.value.content){
+	console.log(fileList.value, uploadRef.value)
+	if (!sbValue.value.content) {
+		if (fileList.value.length == 0) {
+			return ElMessage.warning("请输入作业内容");
+		}
+	}
 
-    return ElMessage.warning("请输入作业内容");
-  }
-  request(TASK_WORK_COMMIT, {
-    projectOrRouterLogo: type,
-    workUploadContent: sbValue.value.content,
-    workUploadAddress: fileList.value.map((e) => e.url).join(",") || "",
-    workId,
-    type,
-    taskId,
-  }).then((res) => {
-    console.log(res);
-    submitList.value.unshift(res.data);
-    open();
-  });
-  sbValue.value.content = "";
-  fileList.value = [];
+	request(TASK_WORK_COMMIT, {
+		projectOrRouterLogo: type,
+		workUploadContent: sbValue.value.content,
+		workUploadAddress: fileList.value.map((e) => e.url).join(",") || "",
+		workId,
+		type,
+		taskId,
+	}).then((res) => {
+		console.log(res);
+		submitList.value.unshift(res.data);
+		open();
+	});
+	sbValue.value.content = "";
+	fileList.value = [];
+	remove(0);
 };
 
 function remove(i) {
-  uploadRef.value.remove(i);
+	uploadRef.value.remove(i);
 }
 
 function reUpload(i) {
-  uploadRef.value.reUpload(i);
+	uploadRef.value.reUpload(i);
 }
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss">
 .homework {
-  .crumb {
-    color: #fff;
-    display: flex;
-    font-size: 14px;
-    line-height: 24px;
-    position: relative;
-  }
-  .return {
-    position: absolute;
-    right: 10%;
-    .text {
-      text-align: center;
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-    }
-  }
-  .preNext {
-    position: absolute;
-    right: 0px;
-
-    .content {
-      font-size: 14px;
-      color: #fff;
-      width: 43px;
-      height: 14px;
-      display: inline-block;
-      position: relative;
-      top: -6px;
-      cursor: pointer;
-    }
-
-    .btn {
-      width: 23px;
-      height: 23px;
-      border-radius: 50%;
-      border: 0;
-      cursor: pointer;
-    }
-
-    .btn01 {
-      background-image: url("../../assets/image/prev.png");
-    }
-
-    .btn02 {
-      background-image: url("../../assets/image/next.png");
-    }
-  }
-
-  .debateTitle {
-    margin-top: 15px;
-    font-size: 20px;
-    line-height: 24px;
-    height: 24px;
-    font-weight: 600;
-    margin-left: -10px;
-  }
-
-  .detailinfo {
-    width: 100%;
-    margin-top: 20px;
-    background: #ffffff;
-    border-radius: 8px;
-    display: flex;
-
-    .detail {
-      flex: 1;
-
-      .detailT {
-        // height: 1000px;
-
-        color: rgba(51, 51, 51, 1);
-        display: flex;
-        padding-bottom: 30px;
-        width: 100%;
-
-        .shapan {
-          width: 100%;
-          height: 58px;
-          margin-top: 30px;
-          background-image: url("../../assets/image/shapan.png");
-          background-repeat: no-repeat;
-          background-size: 100% 100%;
-          display: flex;
-          align-items: center;
-
-          .shapanexplain {
-            margin-left: 34px;
-            margin-right: 10px;
-            font-size: 20px;
-            font-weight: 800;
-            color: #4a9cf8;
-            line-height: 24px;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-          }
-        }
-
-        .shangchuan {
-          z-index: 999;
-          font-size: 16px;
-          font-weight: 800;
-          color: #ffffff;
-          line-height: 24px;
-          position: absolute;
-          right: -6px;
-          top: 162px;
-          border: 0;
-          background-color: #fff;
-          width: 162px;
-          height: 62px;
-          background-image: url("../../assets/image/shangchuan.png");
-        }
-
-        .uploadDetail {
-          position: absolute;
-          //top: 235px;
-          right: 3px;
-          z-index: 100;
-
-          .triangle {
-            top: -10px;
-            right: 60px;
-            width: 0;
-            height: 0;
-            position: absolute;
-            border-right: 10px solid transparent;
-            border-left: 10px solid transparent;
-            border-bottom: 10px solid #fff;
-            // box-shadow: 0px 1px 24px 0px rgba(0, 0, 0, 0.11);
-          }
-
-          .square {
-            padding-bottom: 40px;
-            width: 600px;
-            background: #ffffff;
-            box-shadow: 0px 1px 24px 0px rgba(0, 0, 0, 0.11);
-            border-radius: 8px;
-
-            .squarecontent1 {
-              padding-top: 40px;
-              display: flex;
-
-              .rar {
-                margin: 12px 15px 0 27px;
-                width: 22px;
-                height: 26px;
-                background-image: url("../../assets/image/rar.png");
-              }
-
-              .rarDetail {
-                .detail1 {
-                  // height: 14px;
-                  font-size: 12px;
-                  line-height: 30px;
-                  font-weight: 500;
-                  color: #677d86;
-                }
-
-                .detail2 {
-                  // height: 11px;
-                  font-size: 12px;
-                  font-weight: 500;
-                  color: #277aff;
-                }
-
-                .progress {
-                  width: 291px;
-                  height: 8px;
-                  background: #e8f1fe;
-                  border-radius: 4px;
-
-                  .progressinner {
-                    height: 8px;
-                    background: linear-gradient(0deg, #2478ff 0%, #5093ff 100%);
-                    border-radius: 4px;
-                  }
-                }
-              }
-
-              .btn {
-                border: 0;
-                background-color: #fff;
-                color: #277aff;
-                margin-top: 20px;
-                cursor: pointer;
-              }
-
-              .btndetail {
-                margin-left: 25px;
-              }
-            }
-
-            .squarecontent2 {
-              margin-top: 25px;
-              display: flex;
-
-              .rar {
-                margin: 12px 15px 0 27px;
-                width: 22px;
-                height: 26px;
-                background-image: url("../../assets/image/rar.png");
-              }
-
-              .rarDetail {
-                .detail1 {
-                  // height: 14px;
-                  font-size: 12px;
-                  line-height: 30px;
-                  font-weight: 500;
-                  color: #677d86;
-                }
-
-                .detail2 {
-                  // height: 11px;
-                  font-size: 12px;
-                  font-weight: 500;
-                  color: #277aff;
-                }
-
-                .progress {
-                  width: 291px;
-                  height: 8px;
-                  background: #e8f1fe;
-                  border-radius: 4px;
-
-                  .progressinner {
-                    width: 231px;
-                    height: 8px;
-                    background: linear-gradient(0deg, #ee625e 0%, #eea4a1 100%);
-                    border-radius: 4px;
-                  }
-                }
-              }
-
-              .btn {
-                border: 0;
-                background-color: #fff;
-                color: #277aff;
-                margin-top: 20px;
-                cursor: pointer;
-              }
-
-              .btndetail {
-                margin-left: 25px;
-              }
-            }
-
-            .squarecontent3 {
-              margin-top: 25px;
-              display: flex;
-
-              .rar {
-                margin: 12px 15px 0 27px;
-                width: 22px;
-                height: 26px;
-                background-image: url("../../assets/image/rar.png");
-              }
-
-              .rarDetail {
-                .detail1 {
-                  // height: 14px;
-                  font-size: 12px;
-                  line-height: 30px;
-                  font-weight: 500;
-                  color: #677d86;
-                }
-
-                .detail2 {
-                  // height: 11px;
-                  font-size: 12px;
-                  font-weight: 500;
-                  color: #277aff;
-                }
-
-                .progress {
-                  width: 291px;
-                  height: 8px;
-                  background: #e8f1fe;
-                  border-radius: 4px;
-
-                  .progressinner {
-                    width: 291px;
-                    height: 8px;
-                    background: linear-gradient(0deg, #36d1ae 0%, #3be5bf 100%);
-                    border-radius: 4px;
-                  }
-                }
-              }
-
-              .btn {
-                border: 0;
-                background-color: #fff;
-                color: #277aff;
-                margin-top: 20px;
-                cursor: pointer;
-              }
-
-              .btndetail {
-                margin-left: 25px;
-              }
-            }
-          }
-        }
-
-        .tijiao {
-          z-index: 999;
-          cursor: pointer;
-          margin-top: 22px;
-          // margin-left: 480px;
-          width: 33px;
-          height: 16px;
-          font-size: 16px;
-          font-weight: 800;
-          color: #ffffff;
-          line-height: 24px;
-          border: 0;
-          background-color: #fff;
-          width: 162px;
-          height: 62px;
-          background-image: url("../../assets/image/tijiao.png");
-        }
-
-        .history {
-          position: relative;
-          margin-top: 32px;
-          width: 100%;
-          border: 1px solid #d7e5fd;
-          border-radius: 8px;
-
-          .fenge {
-            width: 100%;
-            border-top: 1px solid #d7e5fd;
-          }
-
-          .tongyi {
-            display: flex;
-          }
-
-          .content1 {
-            margin-top: 14px;
-            margin-left: 20px;
-            width: 160px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-          }
-
-          .content2{
-            margin-top: 14px;
-            margin-left: 20px;
-            width:460px;;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-          }
-          .content3 {
-            margin-top: 14px;
-            margin-left: 20px;
-            width:230px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-          }
-
-          .historycontent {
-            height: 14px;
-            font-size: 14px;
-            font-weight: 400;
-            color: #333330;
-            line-height: 38px;
-          }
-
-          .historytitle {
-            width: 100%;
-            height: 50px;
-            background: #f2f5f7;
-            border-radius: 8px 8px 0px 0px;
-            display: flex;
-          }
-
-          .historytitle2 {
-            width: 100%;
-            height: 48px;
-            // background: #fff;
-            display: flex;
-          }
-        }
-
-        .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;
-        }
-
-        .all {
-          display: flex;
-          justify-content: space-between;
-          width: 1280px;
-          margin-top: 43px;
-
-          .allbox1 {
-            background: linear-gradient(
-              0deg,
-              rgba(160, 193, 230, 0) 0%,
-              rgba(161, 195, 231, 0.2) 100%
-            );
-          }
-
-          .allbox2 {
-            background: linear-gradient(
-              0deg,
-              rgba(177, 219, 229, 0) 0%,
-              rgba(172, 216, 227, 0.2) 100%
-            );
-          }
-
-          .allbox3 {
-            background: linear-gradient(
-              0deg,
-              rgba(195, 209, 234, 0) 0%,
-              rgba(191, 206, 231, 0.2) 100%
-            );
-          }
-
-          .item {
-            width: 410px;
-            height: 149px;
-            text-align: center;
-            border-radius: 4px;
-
-            .item1 {
-              color: #089dff;
-              font-size: 24px;
-              font-weight: bold;
-              margin-top: 36px;
-            }
-
-            .item2 {
-              color: #333330;
-              font-size: 14px;
-              margin-top: 29px;
-            }
-          }
-        }
-
-        .join {
-          width: 100%;
-          margin-top: 32px;
-
-          .el-textarea__inner {
-            border-radius: 8px;
-            background-color: rgba(245, 246, 247, 1);
-          }
-        }
-      }
-    }
-
-    .right {
-      margin-right: 45px;
-
-      .righttitle {
-        display: flex;
-        padding-top: 39px;
-        position: relative;
-
-        .text {
-          margin-left: 8px;
-          font-size: 16px;
-          color: rgba(51, 51, 51, 1);
-          font-weight: 800;
-        }
-
-        .box {
-          width: 75px;
-          height: 10px;
-          background-color: rgba(36, 120, 255, 0.15);
-          position: absolute;
-          left: 23px;
-          top: 53px;
-        }
-      }
-
-      .timebox {
-        width: 417px;
-        height: 149px;
-        background: linear-gradient(90deg, #b6c6e1 0%, #89aed6 100%);
-        border-radius: 4px;
-        margin-top: 52px;
-      }
-
-      .clearfix:before,
-      .clearfix:after {
-        content: "";
-        display: table;
-        clear: both;
-      }
-
-      .innertime {
-        margin-top: 17px;
-        margin-left: 55px;
-        font-size: 14px;
-        font-weight: 500;
-        color: #ffffff;
-        line-height: 24px;
-      }
-
-      .endtime {
-        margin-left: 10px;
-        margin-top: 16px;
-        width: 397px;
-        height: 81px;
-        background: #f2f5f7;
-        border-radius: 0px 8px 0px 8px;
-
-        .endtimetext {
-          margin-top: 25px;
-          margin-left: 46px;
-
-          .te {
-            font-size: 28px;
-            font-weight: 800;
-            color: #4a9cf8;
-            line-height: 24px;
-          }
-        }
-      }
-
-      .explain {
-        margin-top: 30px;
-        width: 416px;
-        // height: 158px;
-        background: #f2f5f7;
-        border-radius: 8px;
-        padding-bottom: 25px;
-
-        .explain1 {
-          margin-left: 23px;
-          width: 360px;
-          // height: 38px;
-          font-size: 14px;
-          font-weight: 500;
-          color: #333330;
-          line-height: 24px;
-        }
-      }
-    }
-  }
-  .el-dialog {
-    color:black;
-    text-align: center;
-    font-size: 16px;
-    .title{
-      text-align: center;
-    }
-    .dialog-footer{
-      .back{
-        background: #387DF7;
-        box-shadow: 1px 2px 15px 1px rgba(56,125,247,0.34);
-        border: 0px;
-        padding: 8px 32px;
-        border-radius: 4px;
-      }
-      .cancel{
-        background: #387DF7;
-        border: 0px;
-        padding: 8px 32px;
-        border: 1px solid #387DF7;
-        border-radius: 4px;
-      }
-     
-    }
-  }
+	.crumb {
+		color: #fff;
+		display: flex;
+		font-size: 14px;
+		line-height: 24px;
+		position: relative;
+	}
+
+	.return {
+		position: absolute;
+		right: 10%;
+
+		.text {
+			text-align: center;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+		}
+	}
+
+	.preNext {
+		position: absolute;
+		right: 0px;
+
+		.content {
+			font-size: 14px;
+			color: #fff;
+			width: 43px;
+			height: 14px;
+			display: inline-block;
+			position: relative;
+			top: -6px;
+			cursor: pointer;
+		}
+
+		.btn {
+			width: 23px;
+			height: 23px;
+			border-radius: 50%;
+			border: 0;
+			cursor: pointer;
+		}
+
+		.btn01 {
+			background-image: url("../../assets/image/prev.png");
+		}
+
+		.btn02 {
+			background-image: url("../../assets/image/next.png");
+		}
+	}
+
+	.debateTitle {
+		margin-top: 15px;
+		font-size: 20px;
+		line-height: 24px;
+		height: 24px;
+		font-weight: 600;
+		margin-left: -10px;
+	}
+
+	.detailinfo {
+		width: 100%;
+		margin-top: 20px;
+		background: #ffffff;
+		border-radius: 8px;
+		display: flex;
+
+		.detail {
+			flex: 1;
+
+			.detailT {
+				// height: 1000px;
+
+				color: rgba(51, 51, 51, 1);
+				display: flex;
+				padding-bottom: 30px;
+				width: 100%;
+
+				.shapan {
+					width: 100%;
+					height: 58px;
+					margin-top: 30px;
+					background-image: url("../../assets/image/shapan.png");
+					background-repeat: no-repeat;
+					background-size: 100% 100%;
+					display: flex;
+					align-items: center;
+
+					.shapanexplain {
+						margin-left: 34px;
+						margin-right: 10px;
+						font-size: 20px;
+						font-weight: 800;
+						color: #4a9cf8;
+						line-height: 24px;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+				}
+
+				.shangchuan {
+					z-index: 999;
+					font-size: 16px;
+					font-weight: 800;
+					color: #ffffff;
+					line-height: 24px;
+					position: absolute;
+					right: -6px;
+					top: 162px;
+					border: 0;
+					background-color: #fff;
+					width: 162px;
+					height: 62px;
+					background-image: url("../../assets/image/shangchuan.png");
+				}
+
+				.uploadDetail {
+					position: absolute;
+					//top: 235px;
+					right: 3px;
+					z-index: 100;
+
+					.triangle {
+						top: -10px;
+						right: 60px;
+						width: 0;
+						height: 0;
+						position: absolute;
+						border-right: 10px solid transparent;
+						border-left: 10px solid transparent;
+						border-bottom: 10px solid #fff;
+						// box-shadow: 0px 1px 24px 0px rgba(0, 0, 0, 0.11);
+					}
+
+					.square {
+						padding-bottom: 40px;
+						width: 600px;
+						background: #ffffff;
+						box-shadow: 0px 1px 24px 0px rgba(0, 0, 0, 0.11);
+						border-radius: 8px;
+
+						.squarecontent1 {
+							padding-top: 40px;
+							display: flex;
+
+							.rar {
+								margin: 12px 15px 0 27px;
+								width: 22px;
+								height: 26px;
+								background-image: url("../../assets/image/rar.png");
+							}
+
+							.rarDetail {
+								.detail1 {
+									// height: 14px;
+									font-size: 12px;
+									line-height: 30px;
+									font-weight: 500;
+									color: #677d86;
+								}
+
+								.detail2 {
+									// height: 11px;
+									font-size: 12px;
+									font-weight: 500;
+									color: #277aff;
+								}
+
+								.progress {
+									width: 291px;
+									height: 8px;
+									background: #e8f1fe;
+									border-radius: 4px;
+
+									.progressinner {
+										height: 8px;
+										background: linear-gradient(0deg, #2478ff 0%, #5093ff 100%);
+										border-radius: 4px;
+									}
+								}
+							}
+
+							.btn {
+								border: 0;
+								background-color: #fff;
+								color: #277aff;
+								margin-top: 20px;
+								cursor: pointer;
+							}
+
+							.btndetail {
+								margin-left: 25px;
+							}
+						}
+
+						.squarecontent2 {
+							margin-top: 25px;
+							display: flex;
+
+							.rar {
+								margin: 12px 15px 0 27px;
+								width: 22px;
+								height: 26px;
+								background-image: url("../../assets/image/rar.png");
+							}
+
+							.rarDetail {
+								.detail1 {
+									// height: 14px;
+									font-size: 12px;
+									line-height: 30px;
+									font-weight: 500;
+									color: #677d86;
+								}
+
+								.detail2 {
+									// height: 11px;
+									font-size: 12px;
+									font-weight: 500;
+									color: #277aff;
+								}
+
+								.progress {
+									width: 291px;
+									height: 8px;
+									background: #e8f1fe;
+									border-radius: 4px;
+
+									.progressinner {
+										width: 231px;
+										height: 8px;
+										background: linear-gradient(0deg, #ee625e 0%, #eea4a1 100%);
+										border-radius: 4px;
+									}
+								}
+							}
+
+							.btn {
+								border: 0;
+								background-color: #fff;
+								color: #277aff;
+								margin-top: 20px;
+								cursor: pointer;
+							}
+
+							.btndetail {
+								margin-left: 25px;
+							}
+						}
+
+						.squarecontent3 {
+							margin-top: 25px;
+							display: flex;
+
+							.rar {
+								margin: 12px 15px 0 27px;
+								width: 22px;
+								height: 26px;
+								background-image: url("../../assets/image/rar.png");
+							}
+
+							.rarDetail {
+								.detail1 {
+									// height: 14px;
+									font-size: 12px;
+									line-height: 30px;
+									font-weight: 500;
+									color: #677d86;
+								}
+
+								.detail2 {
+									// height: 11px;
+									font-size: 12px;
+									font-weight: 500;
+									color: #277aff;
+								}
+
+								.progress {
+									width: 291px;
+									height: 8px;
+									background: #e8f1fe;
+									border-radius: 4px;
+
+									.progressinner {
+										width: 291px;
+										height: 8px;
+										background: linear-gradient(0deg, #36d1ae 0%, #3be5bf 100%);
+										border-radius: 4px;
+									}
+								}
+							}
+
+							.btn {
+								border: 0;
+								background-color: #fff;
+								color: #277aff;
+								margin-top: 20px;
+								cursor: pointer;
+							}
+
+							.btndetail {
+								margin-left: 25px;
+							}
+						}
+					}
+				}
+
+				.tijiao {
+					z-index: 999;
+					cursor: pointer;
+					margin-top: 22px;
+					// margin-left: 480px;
+					width: 33px;
+					height: 16px;
+					font-size: 16px;
+					font-weight: 800;
+					color: #ffffff;
+					line-height: 24px;
+					border: 0;
+					background-color: #fff;
+					width: 162px;
+					height: 62px;
+					background-image: url("../../assets/image/tijiao.png");
+				}
+
+				.history {
+					position: relative;
+					margin-top: 32px;
+					width: 100%;
+					border: 1px solid #d7e5fd;
+					border-radius: 8px;
+
+					.fenge {
+						width: 100%;
+						border-top: 1px solid #d7e5fd;
+					}
+
+					.tongyi {
+						display: flex;
+					}
+
+					.content1 {
+						margin-top: 14px;
+						margin-left: 20px;
+						width: 160px;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+
+					.content2 {
+						margin-top: 14px;
+						margin-left: 20px;
+						width: 460px;
+						;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+
+					.content3 {
+						margin-top: 14px;
+						margin-left: 20px;
+						width: 230px;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+
+					.historycontent {
+						height: 14px;
+						font-size: 14px;
+						font-weight: 400;
+						color: #333330;
+						line-height: 38px;
+					}
+
+					.historytitle {
+						width: 100%;
+						height: 50px;
+						background: #f2f5f7;
+						border-radius: 8px 8px 0px 0px;
+						display: flex;
+					}
+
+					.historytitle2 {
+						width: 100%;
+						height: 48px;
+						// background: #fff;
+						display: flex;
+					}
+				}
+
+				.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;
+				}
+
+				.all {
+					display: flex;
+					justify-content: space-between;
+					width: 1280px;
+					margin-top: 43px;
+
+					.allbox1 {
+						background: linear-gradient(0deg,
+								rgba(160, 193, 230, 0) 0%,
+								rgba(161, 195, 231, 0.2) 100%);
+					}
+
+					.allbox2 {
+						background: linear-gradient(0deg,
+								rgba(177, 219, 229, 0) 0%,
+								rgba(172, 216, 227, 0.2) 100%);
+					}
+
+					.allbox3 {
+						background: linear-gradient(0deg,
+								rgba(195, 209, 234, 0) 0%,
+								rgba(191, 206, 231, 0.2) 100%);
+					}
+
+					.item {
+						width: 410px;
+						height: 149px;
+						text-align: center;
+						border-radius: 4px;
+
+						.item1 {
+							color: #089dff;
+							font-size: 24px;
+							font-weight: bold;
+							margin-top: 36px;
+						}
+
+						.item2 {
+							color: #333330;
+							font-size: 14px;
+							margin-top: 29px;
+						}
+					}
+				}
+
+				.join {
+					width: 100%;
+					margin-top: 32px;
+
+					.el-textarea__inner {
+						border-radius: 8px;
+						background-color: rgba(245, 246, 247, 1);
+					}
+				}
+			}
+		}
+
+		.right {
+			margin-right: 45px;
+
+			.righttitle {
+				display: flex;
+				padding-top: 39px;
+				position: relative;
+
+				.text {
+					margin-left: 8px;
+					font-size: 16px;
+					color: rgba(51, 51, 51, 1);
+					font-weight: 800;
+				}
+
+				.box {
+					width: 75px;
+					height: 10px;
+					background-color: rgba(36, 120, 255, 0.15);
+					position: absolute;
+					left: 23px;
+					top: 53px;
+				}
+			}
+
+			.timebox {
+				width: 417px;
+				height: 149px;
+				background: linear-gradient(90deg, #b6c6e1 0%, #89aed6 100%);
+				border-radius: 4px;
+				margin-top: 52px;
+			}
+
+			.clearfix:before,
+			.clearfix:after {
+				content: "";
+				display: table;
+				clear: both;
+			}
+
+			.innertime {
+				margin-top: 17px;
+				margin-left: 55px;
+				font-size: 14px;
+				font-weight: 500;
+				color: #ffffff;
+				line-height: 24px;
+			}
+
+			.endtime {
+				margin-left: 10px;
+				margin-top: 16px;
+				width: 397px;
+				height: 81px;
+				background: #f2f5f7;
+				border-radius: 0px 8px 0px 8px;
+
+				.endtimetext {
+					margin-top: 25px;
+					margin-left: 46px;
+
+					.te {
+						font-size: 28px;
+						font-weight: 800;
+						color: #4a9cf8;
+						line-height: 24px;
+					}
+				}
+			}
+
+			.explain {
+				margin-top: 30px;
+				width: 416px;
+				// height: 158px;
+				background: #f2f5f7;
+				border-radius: 8px;
+				padding-bottom: 25px;
+
+				.explain1 {
+					margin-left: 23px;
+					width: 360px;
+					// height: 38px;
+					font-size: 14px;
+					font-weight: 500;
+					color: #333330;
+					line-height: 24px;
+				}
+			}
+		}
+	}
+
+	.el-dialog {
+		color: black;
+		text-align: center;
+		font-size: 16px;
+
+		.title {
+			text-align: center;
+		}
+
+		.dialog-footer {
+			.back {
+				background: #387DF7;
+				box-shadow: 1px 2px 15px 1px rgba(56, 125, 247, 0.34);
+				border: 0px;
+				padding: 8px 32px;
+				border-radius: 4px;
+			}
+
+			.cancel {
+				background: #387DF7;
+				border: 0px;
+				padding: 8px 32px;
+				border: 1px solid #387DF7;
+				border-radius: 4px;
+			}
+
+		}
+	}
 }
-
-
 </style>

From d1fb89ac147226d946d260d53626dc114a548058 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Wed, 21 Dec 2022 13:50:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/ProjectDetails.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index 2b10205..906fba7 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -12,7 +12,8 @@
     <div class="detailinfo">
       <div class="detailL">
         <div v-for="(i, k) in data.stageProcessList" :key="k">
-          <div class="title">
+          <div v-if="i.stageId=='0'&&i.taskProcessList.length==0"></div>
+          <div v-else class="title">
             <div class="titleL">{{ i.stageName }}</div>
             <div class="titleR" :style="{ display: 'flex' }">
               <img src="../../assets/image/pathdetails/circle.png" />
@@ -28,7 +29,9 @@
               </div>
             </div>
           </div>
+          <div v-if="i.stageId=='0'&&i.taskProcessList.length==0"></div>
           <div
+            v-else
             class="course"
             v-for="(value, index) in i.taskProcessList.filter(
               (e) => !whiteTypes(e.type)
@@ -334,6 +337,7 @@ const { data } = useRequest(PROJECT_PROCESS, {
   projectId: projectId || courseId,
 });
 console.log("datadata", data);
+
 const userInfo = computed(() => store.state.userInfo);
 
 const activeName = ref("first");