Merge branch 'develop' into manage-release

# Conflicts:
#	src/router/index.js

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

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",