Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/views/roadmap/PathDetails.vue

src/views/project/ProjectDetails.vue

@@ -2,7 +2,7 @@
 	<div class="pathdetails" style="padding: 30px">
 		<!-- 面包屑导航 -->
 		<div class="crumb">
-			<div>{{data.name}}</div>
+			<div>{{ data.name }}</div>
 			<div style="margin-left: 6px; margin-right: 6px">/</div>
 			<div style="font-weight: 700">项目详情</div>
 
@@ -15,12 +15,12 @@
 		</div>
 		<!-- 面包屑导航 -->
 		<div class="pdname">
-			{{ userInfo.bandDesc }} 
+			{{ userInfo.bandDesc }}
-			<span @click="introductionPro"  style="font-size:14px;color:#fff;margin-left: 33px;cursor: pointer;">简介
+			<span @click="introductionPro" style="font-size:14px;color:#fff;margin-left: 33px;cursor: pointer;">简介
 				<span style="position: relative;top:1px;left:-3px;cursor: pointer;">></span>
 			</span>
 		</div>
-		
+
 		<!-- 详细信息 -->
 		<div class="detailinfo">
 			<div class="detailL">
@@ -116,7 +116,7 @@
 					<el-tabs v-model="activeName" @tab-click="handleClick">
 						<el-tab-pane label="课程公告" name="first">
 							<div class="notice">
-								{{ data.remark || "暂无公告" }}
+								{{ data.notice || "暂无公告" }}
 							</div>
 						</el-tab-pane>
 						<!--  
@@ -238,17 +238,13 @@
 		</div>
 		<!-- 详细信息 -->
 		<!-- 弹框提示信息 -->
-		<el-dialog
+		<el-dialog title="" top="347px" v-model="dialogVisible" :show-close="false"
-			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;">{{ dialogVisibleTip }}</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>
+				<el-button type="primary" @click="dialogVisible = false" style="width:140px;height:40px;">确定</el-button>
 			</span>
 		</el-dialog>
 	</div>
@@ -375,7 +371,7 @@ const dialogVisibleTip = ref('该任务无法学习，请联系管理员进行
 // }
 
 function introductionPro() {
-	dialogVisibleTip.value =data.value.remark;
+	dialogVisibleTip.value = data.value.remark;
 	dialogVisible.value = true;
 }
 
@@ -386,7 +382,7 @@ function toFinish(d, sName, chapterId) {
 		let date1 = new Date(d.endTime).getTime();
 		let date2 = new Date().getTime();
 		if (date1 < date2) {
-			dialogVisibleTip.value ='当前作业已结束';
+			dialogVisibleTip.value = '当前作业已结束';
 			dialogVisible.value = true;
 			// ElMessage.error("当前作业已结束")
 			return
@@ -397,7 +393,7 @@ function toFinish(d, sName, chapterId) {
 		let date1 = new Date(d.endTime).getTime();
 		let date2 = new Date().getTime();
 		if (date1 < date2) {
-			dialogVisibleTip.value ='当前直播已结束';
+			dialogVisibleTip.value = '当前直播已结束';
 			dialogVisible.value = true;
 			return
 		}
@@ -406,7 +402,7 @@ function toFinish(d, sName, chapterId) {
 	if (d.type == 5) {
 		if (d.taskStatus == 1 || d.taskStatus == 2) {
 			// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
-			dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
+			dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
 			dialogVisible.value = true;
 			return
 		}
@@ -415,7 +411,7 @@ function toFinish(d, sName, chapterId) {
 	if (d.type == 11) {
 		if (d.taskStatus == 1 || d.taskStatus == 2) {
 			// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
-			dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
+			dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
 			dialogVisible.value = true;
 			return
 		}
@@ -425,7 +421,7 @@ function toFinish(d, sName, chapterId) {
 		let date1 = new Date(d.endTime).getTime();
 		let date2 = new Date().getTime();
 		if (date1 < date2) {
-			dialogVisibleTip.value ='当前活动已结束';
+			dialogVisibleTip.value = '当前活动已结束';
 			dialogVisible.value = true;
 			return
 		}
@@ -434,7 +430,7 @@ function toFinish(d, sName, chapterId) {
 	if (d.type == 1) {
 		if (d.taskStatus == 1 || d.taskStatus == 2) {
 			// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
-			dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
+			dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
 			dialogVisible.value = true;
 			return
 		}
@@ -443,7 +439,7 @@ function toFinish(d, sName, chapterId) {
 	if (d.type == 2) {
 		if (d.taskStatus == 1 || d.taskStatus == 2) {
 			// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
-			dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
+			dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
 			dialogVisible.value = true;
 			return
 		}
@@ -492,21 +488,23 @@ function whiteTypes(type) {
 	.el-dialog__header {
 		display: none;
 	}
+
 	.crumb {
 		color: #fff;
 		display: flex;
 		font-size: 14px;
 		line-height: 24px;
+
 		.return {
 			position: absolute;
 			right: 10%;
 
 			.text {
-					text-align: center;
+				text-align: center;
-					display: flex;
+				display: flex;
-					flex-direction: row;
+				flex-direction: row;
-					align-items: center;
+				align-items: center;
-				}
+			}
 		}
 	}
 

src/views/project/ProjectManage.vue

@@ -7,11 +7,11 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
-  <div class="projectManage">
+	<div class="projectManage">
-    <div class="content">
+		<div class="content">
-      <div class="title">我的项目</div>
+			<div class="title">我的项目</div>
-      <div class="search">
+			<div class="search">
-        <!-- <el-select v-model="value" class="m-2" placeholder="Select">
+				<!-- <el-select v-model="value" class="m-2" placeholder="Select">
           <el-option
             v-for="item in projectClassify"
             :key="item.value"
@@ -27,86 +27,59 @@
             :value="item.value"
           />
         </el-select> -->
-        <div style="width: 200px; margin-right: 20px">
+				<div style="width: 200px; margin-right: 20px">
-          <el-input v-model="projectname" placeholder="请输入项目名称" />
+					<el-input v-model="projectname" placeholder="请输入项目名称" />
-        </div>
+				</div>
-        <div style="width: 420px">
+				<div style="width: 420px">
-          <el-date-picker
+					<el-date-picker v-model="searchTime" type="datetimerange" start-placeholder="开始时间" end-placeholder="结束时间"
-            v-model="searchTime"
+						@change="selectTime" />
-            type="datetimerange"
+				</div>
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            @change="selectTime"
-          />
-        </div>
 
-        <button
+				<button class="searchBtn" @click="searchClick" style="margin-left: 20px">
-          class="searchBtn"
+					搜索
-          @click="searchClick"
+				</button>
-          style="margin-left: 20px"
+				<button class="searchBtn" @click="resetClick">重置</button>
-        >
+			</div>
-          搜索
+			<div class="projectList" v-if="!projectList.length" style="display:flex;color:#909399;">
-        </button>
+				<img class="img2" style="margin-left: 675px;margin-top: 165px;width:148px;height:220px;"
-        <button class="searchBtn" @click="resetClick">重置</button>
+					src="../../assets/image/notask.png" />
-      </div>
+			</div>
-      <div class="projectList" v-if="!projectList.length" style="display:flex;color:#909399;">
+			<div v-else class="projectList" v-for="(i, k) in projectList" :key="k">
-        <img
+				<div style="display: flex">
-            class="img2"
+					<img style="width: 253px; height: 144px; border-radius: 4px" :src="i.picUrl" />
-            style="margin-left: 675px;margin-top: 165px;width:148px;height:220px;"
+					<div style="margin-left: 29px">
-            src="../../assets/image/notask.png"
+						<div class="projectName" :title="i.name">
-          />
+							{{ i.name }}
-      </div>
+						</div>
-      <div v-else class="projectList" v-for="(i, k) in projectList" :key="k">
+						<div class="progress">
-        <div style="display: flex">
+							<div class="progressNow">当前进度：</div>
-          <img
+							<div style="width: 115px">
-            style="width: 253px; height: 144px; border-radius: 4px"
+								<el-progress :percentage="parseInt(i.finishTaskNum / i.totalTaskNum * 100)" :show-text="false"
-            :src="i.picUrl"
+									:stroke-width="8" color="rgba(255, 160, 80, 1)" />
-          />
+							</div>
-          <div style="margin-left: 29px">
+							<div class="progressNum">
-            <div class="projectName" :title="i.name">
+								{{
-              {{ i.name }}
+										(i.finishTaskNum && i.totalTaskNum) ? parseInt(i.finishTaskNum / i.totalTaskNum * 100) : 0
-            </div>
+								}}%
-            <div class="progress">
+							</div>
-              <div class="progressNow">当前进度：</div>
+						</div>
-              <div style="width: 115px">
+						<div class="studyNew" v-if="i.lastStudyTime">最新一次学习时间：{{ i.lastStudyTime }}</div>
-                <el-progress
+					</div>
-                  :percentage="parseInt(i.finishTaskNum / i.totalTaskNum * 100) "
+				</div>
-                  :show-text="false"
+				<div class="tobestarted" v-if="i.status == 2" @click="goProjectDetails(i)">
-                  :stroke-width="8"
+					待开始
-                  color="rgba(255, 160, 80, 1)"
+				</div>
-                />
+				<div class="gostudy" v-if="i.status == 0" @click="goProjectDetails(i)">
-              </div>
+					去学习
-              <div class="progressNum">
+				</div>
-                {{
+				<div class="finish" v-if="i.status == 1" @click="goProjectDetails(i)">
-                  (i.finishTaskNum && i.totalTaskNum) ? parseInt(i.finishTaskNum / i.totalTaskNum * 100)  : 0
+					已完成
-                }}%
+				</div>
-              </div>
+				<div class="tobestarted" v-if="i.status == 3" @click="goProjectDetails(i)">
-            </div>
+					已结束
-            <div class="studyNew" v-if="i.lastStudyTime">最新一次学习时间：{{ i.lastStudyTime }}</div>
+				</div>
-          </div>
+			</div>
-        </div>
+			<!-- <div
-        <div
-          class="tobestarted"
-          v-if="i.status == 2"
-          @click="goProjectDetails(i)"
-        >
-          待开始
-        </div>
-        <div class="gostudy" v-if="i.status == 0" @click="goProjectDetails(i)">
-          去学习
-        </div>
-        <div class="finish" v-if="i.status == 1" @click="goProjectDetails(i)">
-          已完成
-        </div>
-        <div
-          class="tobestarted"
-          v-if="i.status == 3"
-          @click="goProjectDetails(i)"
-        >
-          已结束
-        </div>
-      </div>
-      <!-- <div
         style="display: flex; justify-content: center; margin-top: 30px"
         v-if="projectTotal > 10"
       >
@@ -121,17 +94,17 @@
           />
         </div>
       </div> -->
-    </div>
+		</div>
-  </div>
+	</div>
 </template>
 <script setup>
 import { reactive, toRefs, ref, onMounted, computed } from "vue";
 
 import { boeRequest, request, usePage, useRequest } from "@/api/request";
 import {
-  ROUTER_CHAPTER_LIST,
+	ROUTER_CHAPTER_LIST,
-  PROJECT_LIST,
+	PROJECT_LIST,
-  ROUTER_UNCOMPLETE_LIST,
+	ROUTER_UNCOMPLETE_LIST,
 } from "@/api/api";
 
 import { useRouter } from "vue-router";
@@ -152,24 +125,24 @@ const userInfo = computed(() => store.state.userInfo);
 
 //获取项目列表--------start------------------------------------
 const getProject = () => {
-  request(PROJECT_LIST, {
+	request(PROJECT_LIST, {
-    beginTime: beginTime.value,
+		beginTime: beginTime.value,
-    endTime: endTime.value,
+		endTime: endTime.value,
-    key: projectname.value,
+		key: projectname.value,
-    pageNo: currentPage.value,
+		pageNo: currentPage.value,
-    pageSize: pageSize.value,
+		pageSize: pageSize.value,
-  })
+	})
-    .then((res) => {
+		.then((res) => {
-      console.log("获取成功", res);
+			console.log("获取成功", res);
-      if (res.code === 200) {
+			if (res.code === 200) {
-        projectList.value = res.data.rows;
+				projectList.value = res.data.rows;
-        projectTotal.value = Number(res.data.total);
+				projectTotal.value = Number(res.data.total);
-        console.log("projectTotal.value", projectTotal.value);
+				console.log("projectTotal.value", projectTotal.value);
-      }
+			}
-    })
+		})
-    .catch((err) => {
+		.catch((err) => {
-      console.log("获取失败", err);
+			console.log("获取失败", err);
-    });
+		});
 };
 getProject();
 
@@ -178,175 +151,189 @@ getProject();
 
 //搜索
 const searchClick = () => {
-  console.log("点击搜索", projectname.value, searchTime.value);
+	console.log("点击搜索", projectname.value, searchTime.value);
 
-  if (searchTime.value) {
+	if (searchTime.value) {
-    beginTime.value = toDate(
+		beginTime.value = toDate(
-      new Date(searchTime.value[0]).getTime() / 1000,
+			new Date(searchTime.value[0]).getTime() / 1000,
-      "Y-M-D h:m:s"
+			"Y-M-D h:m:s"
-    );
+		);
-    endTime.value = toDate(
+		endTime.value = toDate(
-      new Date(searchTime.value[1]).getTime() / 1000,
+			new Date(searchTime.value[1]).getTime() / 1000,
-      "Y-M-D h:m:s"
+			"Y-M-D h:m:s"
-    );
+		);
-  }
+	}
-  console.log("beginTime", beginTime.value, endTime.value);
+	console.log("beginTime", beginTime.value, endTime.value);
-  getProject();
+	getProject();
 };
 //重置
 const resetClick = () => {
-  searchTime.value = "";
+	searchTime.value = "";
-  projectname.value = "";
+	projectname.value = "";
-  currentPage.value = 1;
+	currentPage.value = 1;
-  beginTime.value = "";
+	beginTime.value = "";
-  endTime.value = "";
+	endTime.value = "";
-  getProject();
+	getProject();
-  console.log("点击重置");
+	console.log("点击重置");
 };
 //搜索--------------end-----------------------------------------
 const router = useRouter();
 const goProjectDetails = (value) => {
-  import.meta.env.MODE === "development"
+	import.meta.env.MODE === "development"
-      ? router.push({
+		? router.push({
-        path: "/projectdetails",
+			path: "/projectdetails",
-        query: { projectId: value.projectId },
+			query: { projectId: value.projectId },
-      })
+		})
-      : window.open(
+		: window.open(
-          `${import.meta.env.VITE_BOE_PATH_DETAIL_URL}/projectdetails&params=${encodeURIComponent(
+			`${import.meta.env.VITE_BOE_PATH_DETAIL_URL}/projectdetails&params=${encodeURIComponent(
-              `projectId=${value.projectId}`
+				`projectId=${value.projectId}`
-          )}`
+			)}`
-      );
+		);
 };
 </script>
 <style lang="scss">
 .projectManage {
-  width: 100%;
+	width: 100%;
-  min-height: 800px;
+	min-height: 800px;
-  //border-radius: 8px;
+	//border-radius: 8px;
-  background-color: rgba(255, 255, 255, 1);
+	background-color: rgba(255, 255, 255, 1);
-  display: flex;
+	display: flex;
-  // background-color: #ccc;
+
-  .content {
+	// background-color: #ccc;
-    width: 100%;
+	.content {
-    // flex: 1;
+		width: 100%;
-    margin-top: 50px;
+		// flex: 1;
-    margin-left: 81px;
+		margin-top: 50px;
-    .title {
+		margin-left: 81px;
-      font-size: 18px;
+
-      font-weight: 600;
+		.title {
-      color: #333333;
+			font-size: 18px;
-      line-height: 25px;
+			font-weight: 600;
-    }
+			color: #333333;
-    .search {
+			line-height: 25px;
-      margin-top: 31px;
+		}
-      display: flex;
+
-      align-items: center;
+		.search {
-      .searchBtn {
+			margin-top: 31px;
-        width: 100px;
+			display: flex;
-        height: 35px;
+			align-items: center;
-        border-radius: 8px;
+
-        display: flex;
+			.searchBtn {
-        justify-content: center;
+				width: 100px;
-        align-items: center;
+				height: 35px;
-        background: #387df7;
+				border-radius: 8px;
-        border: 1px solid #387df7;
+				display: flex;
-        color: #ffffff;
+				justify-content: center;
-        cursor: pointer;
+				align-items: center;
-        margin-left: 10px;
+				background: #387df7;
-      }
+				border: 1px solid #387df7;
-    }
+				color: #ffffff;
-    .projectList {
+				cursor: pointer;
-      margin-top: 40px;
+				margin-left: 10px;
-      display: flex;
+			}
-      justify-content: space-between;
+		}
-      align-items: center;
+
-      overflow-x: auto;
+		.projectList {
-      .projectName {
+			margin-top: 40px;
-        width: 270px;
+			display: flex;
-        margin-top: 12px;
+			justify-content: space-between;
-        font-size: 18px;
+			align-items: center;
-        font-weight: 600;
+			overflow-x: auto;
-        color: #333333;
+
-        line-height: 25px;
+			.projectName {
-        margin-bottom: 40px;
+				width: 270px;
-        overflow: hidden;
+				margin-top: 12px;
-        text-overflow: ellipsis;
+				font-size: 18px;
-        white-space: nowrap;
+				font-weight: 600;
-      }
+				color: #333333;
-      .progress {
+				line-height: 25px;
-        display: flex;
+				margin-bottom: 40px;
-        align-items: center;
+				overflow: hidden;
-        .el-progress-bar__outer {
+				text-overflow: ellipsis;
-          background-color: rgba(255, 160, 80, 0.19);
+				white-space: nowrap;
-        }
+			}
-        .progressNow {
+
-          font-size: 14px;
+			.progress {
-          font-weight: 400;
+				display: flex;
-          color: #333333;
+				align-items: center;
-          line-height: 20px;
+
-          margin-right: 20px;
+				.el-progress-bar__outer {
-        }
+					background-color: rgba(255, 160, 80, 0.19);
-        .progressNum {
+				}
-          font-size: 12px;
+
-          font-weight: 400;
+				.progressNow {
-          color: #999999;
+					font-size: 14px;
-          line-height: 17px;
+					font-weight: 400;
-          margin-left: 26px;
+					color: #333333;
-        }
+					line-height: 20px;
-      }
+					margin-right: 20px;
-      .studyNew {
+				}
-        margin-top: 16px;
+
-        font-size: 14px;
+				.progressNum {
-        font-weight: 400;
+					font-size: 12px;
-        color: #999999;
+					font-weight: 400;
-        line-height: 20px;
+					color: #999999;
-      }
+					line-height: 17px;
-      .tobestarted {
+					margin-left: 26px;
-        width: 140px;
+				}
-        height: 40px;
+			}
-        border-radius: 4px;
+
-        border: 1px solid #387df7;
+			.studyNew {
-        display: flex;
+				margin-top: 16px;
-        align-items: center;
+				font-size: 14px;
-        justify-content: center;
+				font-weight: 400;
-        font-size: 16px;
+				color: #999999;
-        font-weight: 400;
+				line-height: 20px;
-        color: #387df7;
+			}
-        line-height: 22px;
+
-        cursor: pointer;
+			.tobestarted {
-        margin-right: 120px;
+				width: 140px;
-      }
+				height: 40px;
-      .gostudy {
+				border-radius: 4px;
-        width: 140px;
+				border: 1px solid #387df7;
-        height: 40px;
+				display: flex;
-        background: #387df7;
+				align-items: center;
-        box-shadow: 1px 2px 15px 1px rgba(56, 125, 247, 0.34);
+				justify-content: center;
-        border-radius: 4px;
+				font-size: 16px;
-        display: flex;
+				font-weight: 400;
-        align-items: center;
+				color: #387df7;
-        justify-content: center;
+				line-height: 22px;
-        font-size: 16px;
+				cursor: pointer;
-        font-weight: 400;
+				margin-right: 120px;
-        color: #ffffff;
+			}
-        line-height: 22px;
+
-        margin-right: 120px;
+			.gostudy {
-        cursor: pointer;
+				width: 140px;
-      }
+				height: 40px;
-      .finish {
+				background: #387df7;
-        width: 140px;
+				box-shadow: 1px 2px 15px 1px rgba(56, 125, 247, 0.34);
-        height: 40px;
+				border-radius: 4px;
-        background: rgba(56, 125, 247, 0.6);
+				display: flex;
-        border-radius: 4px;
+				align-items: center;
-        display: flex;
+				justify-content: center;
-        align-items: center;
+				font-size: 16px;
-        justify-content: center;
+				font-weight: 400;
-        font-size: 16px;
+				color: #ffffff;
-        font-weight: 400;
+				line-height: 22px;
-        color: #ffffff;
+				margin-right: 120px;
-        line-height: 22px;
+				cursor: pointer;
-        cursor: pointer;
+			}
-      }
+
-    }
+			.finish {
-  }
+				width: 140px;
+				height: 40px;
+				background: rgba(56, 125, 247, 0.6);
+				border-radius: 4px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 16px;
+				font-weight: 400;
+				color: #ffffff;
+				line-height: 22px;
+				cursor: pointer;
+			}
+		}
+	}
 }
 </style>