From 4f5efab57ca2c185f039d35d6b6578d2c1141c7f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 28 Dec 2022 23:15:14 +0800
Subject: [PATCH 1/6] =?UTF-8?q?--=20=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/index.js b/src/router/index.js
index 16056b8..2a0c732 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -20,7 +20,7 @@ const routes = [
 ]
 
 const router = createRouter({
-	history: createWebHistory("/fe-student-release"),
+	history: createWebHistory(import.meta.env.VITE_BASE),
 	routes
 })
 

From 529c91bc464f326caeabe21dd4cb48f8cc2ee863 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 28 Dec 2022 23:16:41 +0800
Subject: [PATCH 2/6] =?UTF-8?q?--=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/index.js b/src/router/index.js
index 3176265..2a0c732 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -20,7 +20,7 @@ const routes = [
 ]
 
 const router = createRouter({
-	history: createWebHistory("/fe-student"),
+	history: createWebHistory(import.meta.env.VITE_BASE),
 	routes
 })
 

From a78ecd6b9562bcfe0fcc8bfb3d444f3ef271e645 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 29 Dec 2022 00:00:01 +0800
Subject: [PATCH 3/6] =?UTF-8?q?--=20=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/ProjectManage.vue | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/views/project/ProjectManage.vue b/src/views/project/ProjectManage.vue
index 586495c..8167d87 100644
--- a/src/views/project/ProjectManage.vue
+++ b/src/views/project/ProjectManage.vue
@@ -96,6 +96,15 @@
       </div> -->
 		</div>
 	</div>
+  <el-dialog 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;">当前项目未到开始时间</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>
+			</span>
+  </el-dialog>
 </template>
 <script setup>
 import { reactive, toRefs, ref, onMounted, computed } from "vue";
@@ -120,7 +129,7 @@ const projectname = ref(""); //项目名称
 const searchTime = ref(""); //选择时间
 const beginTime = ref(""); //结束时间
 const endTime = ref(""); //开始时间
-
+const dialogVisible = ref(false)
 const userInfo = computed(() => store.state.userInfo);
 
 //获取项目列表--------start------------------------------------
@@ -179,6 +188,10 @@ const resetClick = () => {
 //搜索--------------end-----------------------------------------
 const router = useRouter();
 const goProjectDetails = (value) => {
+  if(value.status===2){
+    dialogVisible.value=true
+    return
+  }
 	import.meta.env.MODE === "development"
 		? router.push({
 			path: "/projectdetails",

From 334d04b59b66c1f0baf5b732986ed95853fde003 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 29 Dec 2022 00:07:23 +0800
Subject: [PATCH 4/6] =?UTF-8?q?--=20=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/ProjectManage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/project/ProjectManage.vue b/src/views/project/ProjectManage.vue
index 8167d87..9bcc651 100644
--- a/src/views/project/ProjectManage.vue
+++ b/src/views/project/ProjectManage.vue
@@ -96,7 +96,7 @@
       </div> -->
 		</div>
 	</div>
-  <el-dialog title="" top="347px" v-model="dialogVisible" :show-close="false"
+  <el-dialog title="" top="247px" 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;">当前项目未到开始时间</div>

From 7191bb4ad64be2d213c47bc91af668f1c0193b6f Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Thu, 29 Dec 2022 00:08:49 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=E4=BD=9C=E4=B8=9A=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homework/HomeworkPage.vue | 125 +++++++++++++++-------------
 1 file changed, 67 insertions(+), 58 deletions(-)

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,

From 07b4ae218fff1f7e615e857ddb2fba79b44d5796 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 29 Dec 2022 00:11:55 +0800
Subject: [PATCH 6/6] =?UTF-8?q?--=20=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index f16a90a..55404fe 100644
--- 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("版本2.0.1------------");
+console.log("版本2.0.2------------");
 const store = useStore();
 onMounted(() => {
 	getUserInfo();