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

src/api/api.js

@@ -15,6 +15,7 @@ export const ROUTER_LIST = '/stu/router/list post'
 export const ROUTER_PROCESS = '/stu/router/process'
 export const LINK_DETAILS = linkId => `/link/getOne?linkId=${linkId} post`
 export const PROJECT_PROCESS = '/stu/project/process'
+export const ONLINE_PROCESS = '/onlineClasses/queryOnlineClassesStudyDetail post'
 export const ROUTER_UNCOMPLETE_LIST = '/stu/router/unCompleteTaskList post'
 export const TAS_ACTIVITY_DETAIL = '/activity'
 export const TASK_ACTIVITY_SIGN = '/stu/task/activity/sign post'

src/views/project/ProjectDetails.vue

@@ -2,12 +2,18 @@
 	<div class="pathdetails" style="padding: 30px">
 		<!-- 面包屑导航 -->
 		<div class="crumb">
-			<!--      <div>产品经理学习路径图</div>-->
-			<!--      <div style="margin-left: 6px; margin-right: 6px">/</div>-->
+			     <div>{{data.name}}</div>
+			     <div style="margin-left: 6px; margin-right: 6px">/</div>
 			<div style="font-weight: 700">项目详情</div>
 		</div>
 		<!-- 面包屑导航 -->
-		<div class="pdname">{{ userInfo.bandDesc }}</div>
+		<div class="pdname">
+			{{ userInfo.bandDesc }} 
+			<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">
@@ -31,7 +37,7 @@
 						(e) => !whiteTypes(e.type)
 					)" :key="index">
 						<div style="width: 70%">
-							<div class="coursename">{{ value.name }}</div>
+							<div class="coursename" :title="value.name">{{ value.name }}</div>
 							<div class="coursetag">
 								<div class="tag1" style="margin-right: 11px; margin-top: 16px">
 									必修
@@ -254,6 +260,7 @@ import img from "@/assets/image/uploadimg.png";
 import { useRequest, request } from "@/api/request";
 import {
 	PROJECT_PROCESS,
+	ONLINE_PROCESS,
 	ROUTER_PROCESS,
 	LINK_DETAILS,
 	STUDY_RECORD,
@@ -271,7 +278,26 @@ const returnclick = () => {
 const { data } = useRequest(PROJECT_PROCESS, {
 	projectId: projectId || courseId,
 });
+
 console.log("datadata", data);
+
+// const { onlinedata } = useRequest(ONLINE_PROCESS, {
+// 	addView: false,
+// 	cid:"1042123882713739264"
+// });
+// console.log("onlinedata", onlinedata);
+
+// request(ONLINE_PROCESS, {
+//     addView: false,
+// 	cid:"1042123882713739264"
+//   })
+//     .then((res) => {
+// 		console.log(res)
+// 	}).catch(err=>{
+// 		console.log(err)
+// 	})
+
+
 const userInfo = computed(() => store.state.userInfo);
 const activeName = ref("first");
 const handleClick = (tab, event) => {
@@ -341,6 +367,11 @@ const dialogVisibleTip = ref('该任务无法学习，请联系管理员进行
 // 	return true;
 // }
 
+function introductionPro() {
+	dialogVisibleTip.value =data.value.remark;
+	dialogVisible.value = true;
+}
+
 function toFinish(d, sName, chapterId) {
 	console.log("dddddd", d);
 	// 作业过期判断

src/views/roadmap/PathDetails.vue

@@ -7,7 +7,12 @@
       <div style="font-weight: 700">路径图详情</div>
     </div>
     <!-- 面包屑导航 -->
-    <div class="pdname">{{ userInfo.bandDesc }}</div>
+    <div class="pdname">
+      {{ userInfo.bandDesc }}
+      <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">
@@ -308,6 +313,20 @@
       </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;">{{ 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>
+			</span>
+		</el-dialog>
   </div>
 </template>
 
@@ -338,6 +357,14 @@ const handleClick = (tab, event) => {
 };
 const path = {1: "path"};
 
+const dialogVisible = ref(false);
+const dialogVisibleTip = ref('');
+
+function introductionPro() {
+	dialogVisibleTip.value =data.value.remark;
+	dialogVisible.value = true;
+}
+
 const types = ref({
   typeName: {
     1: "在线",