diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue
index 892c828..6c6e7b1 100644
--- a/src/views/homework/HomeworkPage.vue
+++ b/src/views/homework/HomeworkPage.vue
@@ -15,11 +15,12 @@
         <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">
-          <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>
 		</div>
 		<!-- 面包屑导航 -->
 		<div class="debateTitle" style="color: #fff">
@@ -47,12 +48,13 @@
 								</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></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>
+						</div>
 						<div class="uploadDetail"
 							:style="{ display: showFileList && fileList && fileList.length > 0 ? 'block' : 'none' }"
 							@mousemove="showFileList = 1" @mouseout="showFileList = 0" style="padding-top: 60px">
@@ -66,38 +68,38 @@
 										</span>
 										<span class="detail2" style="margin-right: 10px">{{ file.percentage }}%</span>
 										<span class="detail1">{{
-												{
-													ready: "正在上传",
-													abort: "暂停",
-													uploading: "正在上传",
-													fail: "上传失败",
-													success: "上传成功",
-												}[file.status]
-										}}</span>
+		{
+			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]
-										}}
+		{
+			ready: "暂停",
+			uploading: "暂停",
+			abort: "开始",
+			fail: "重传",
+		}[file.status]
+}}
 									</button>
 									<button class="btn" @click="remove">
 										{{
-												{
-													ready: "取消",
-													abort: "取消",
-													uploading: "取消",
-													fail: "取消",
-													success: "删除",
-												}[file.status]
-										}}
+		{
+			ready: "取消",
+			abort: "取消",
+			uploading: "取消",
+			fail: "取消",
+			success: "删除",
+		}[file.status]
+}}
 									</button>
 								</div>
 							</div>
@@ -108,27 +110,28 @@
 							<div class="text">作业内容</div>
 							<div class="box"></div>
 						</div>
-						<div v-if="dayjs().isBefore(dayjs(data?.submitEndTime)) && dayjs(data?.submitStartTime).isBefore(dayjs())" >
-							<el-input   v-model="sbValue.content" :autosize="{ minRows: 12.5, maxRows: 12.5 }" resize="none"
+						<div v-if="dayjs().isBefore(dayjs(data?.submitEndTime)) && dayjs(data?.submitStartTime).isBefore(dayjs())">
+							<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"
+							<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 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>
 
-						<div v-else >
-						<div style="display: flex; justify-content: center">
-							<button disabled class="tijiao" style="background:#999;border-radius: 6px;cursor: not-allowed;">未到开始时间</button>
-						</div>
+						<div v-else>
+							<div style="display: flex; justify-content: center">
+								<button disabled class="tijiao"
+									style="background:#999;border-radius: 6px;cursor: not-allowed;">未到开始时间</button>
+							</div>
 						</div>
 
 
@@ -148,11 +151,11 @@
 								<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)',
-							}">
+	'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>
@@ -163,9 +166,9 @@
 								<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>
+		value.workUploadAddress?.split(',')[0].split('/').at(-1) ||
+		''
+}}</el-link>
 										</span>
 									</div>
 								</div>
@@ -182,12 +185,16 @@
 				</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 v-if="dayjs(data?.submitEndTime).isBefore(dayjs())" class="endtimetext">该任务已结束</div>
-						<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">{{dayjs(data?.submitEndTime).diff(dayjs(), "minute") % 60}}</span>&nbsp;&nbsp;分钟</div>
+						<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">{{ dayjs(data?.submitEndTime).diff(dayjs(), "minute") % 60 }}</span>&nbsp;&nbsp;分钟
+						</div>
 					</div>
 				</div>
 				<div class="righttitle">
@@ -257,7 +264,9 @@ const {
 	query: { courseId: workId, type, id: taskId, pName, sName },
 } = useRoute();
 
-const { data } = useRequest(TASK_WORK_DETAIL, { workId, taskId });
+const { data } = taskId && taskId !== 'undefined' ? useRequest(TASK_WORK_DETAIL, { workId, taskId }) : useRequest(TASK_WORK_DETAIL, { workId });
+
+console.log('data==----->', data)
 
 const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, {
 	workerId: workId,