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

# Conflicts:
#	src/router/index.js

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();

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
 })
 

src/views/homework/HomeworkPage.vue

@@ -17,7 +17,8 @@
       </div>-->
 			<div class="return">
 				<div style="display: flex" @click="returnclick">
-          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
+					<el-button style="color:#0073FB"> <img class="img2" style="margin-right:11px;cursor: pointer;"
+							src="../../assets/image/return.png" />返回</el-button>
 				</div>
 			</div>
 		</div>
@@ -52,7 +53,8 @@
 								<button class="shangchuan" style="cursor: pointer">
 									上传
 								</button>
-						</UploadImg></div>
+							</UploadImg>
+						</div>
 						<div class="uploadDetail"
 							:style="{ display: showFileList && fileList && fileList.length > 0 ? 'block' : 'none' }"
 							@mousemove="showFileList = 1" @mouseout="showFileList = 0" style="padding-top: 60px">
@@ -127,7 +129,8 @@
 
 						<div v-else>
 							<div style="display: flex; justify-content: center">
-							<button disabled class="tijiao" style="background:#999;border-radius: 6px;cursor: not-allowed;">未到开始时间</button>
+								<button disabled class="tijiao"
+									style="background:#999;border-radius: 6px;cursor: not-allowed;">未到开始时间</button>
 							</div>
 						</div>
 
@@ -186,8 +189,12 @@
 					</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;
+						<div v-else class="endtimetext">距离结束还有&nbsp;&nbsp;<span class="te">{{
-						<span class="te">{{dayjs(data?.submitEndTime).diff(dayjs(), "minute") % 60}}</span>&nbsp;&nbsp;分钟</div>
+		parseInt(dayjs(data?.submitEndTime).diff(dayjs(), "minute") / 60)
+}}</span>&nbsp;&nbsp;
+							小时&nbsp;&nbsp;
+							<span class="te">{{ dayjs(data?.submitEndTime).diff(dayjs(), "minute") % 60 }}</span>&nbsp;&nbsp;分钟
+						</div>
 					</div>
 				</div>
 				<div class="righttitle">
@@ -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,

src/views/project/ProjectManage.vue

@@ -96,6 +96,15 @@
       </div> -->
 		</div>
 	</div>
+  <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>
+    <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",