From 582983f713f0d21983d9f3dfa966ffb2be133a56 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Fri, 23 Dec 2022 22:08:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                          |  3 ++-
 src/views/project/ProjectDetails.vue | 24 +++++++++++-------------
 src/views/roadmap/PathDetails.vue    | 16 +++++++---------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e2e327e..889253d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,6 +7,7 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
+   <!--
   <div
     style="
       background: #0078fc;
@@ -16,7 +17,7 @@
       top: 0;
       z-index: 1;
     "
-  ></div>
+  ></div>-->
   <div id="container">
     <!-- <div id="nav">
       <router-link
diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index ebded70..eef8f41 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -15,9 +15,9 @@
 		<!-- 面包屑导航 -->
 		<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>
+			<el-popover v-if="!data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300" :content="data.remark">
+    <template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
+  </el-popover>
 		</div>
 
 		<!-- 详细信息 -->
@@ -43,11 +43,17 @@
 						(e) => !whiteTypes(e.type)
 					)" :key="index">
 						<div style="width: 70%">
-							<div class="coursename" :title="value.name">{{ value.name }}</div>
+							
+							<el-popover ref="popover"  placement="right" trigger="hover" :width="300" :content="value.name">
+								<template #reference><div class="coursename" :title="value.name">{{ value.name }}</div></template>
+							</el-popover>
 							<div class="coursetag">
-								<div class="tag1" style="margin-right: 11px; margin-top: 16px">
+								<div v-if="value.flag" class="tag1" style="margin-right: 11px; margin-top: 16px">
 									必修
 								</div>
+								<div v-else class="tag2" style="margin-right: 11px; margin-top: 16px">
+									选修
+								</div>
 								<div class="tag3" style="margin-right: 11px; margin-top: 16px">
 									{{ types.typeName[value.type] || "" }}
 								</div>
@@ -365,14 +371,6 @@ const types = ref({
 const dialogVisible = ref(false);
 const dialogVisibleTip = ref('该任务无法学习，请联系管理员进行替换！');
 
-// function dialogVisible(){
-// 	return true;
-// }
-
-function introductionPro() {
-	dialogVisibleTip.value = data.value.remark;
-	dialogVisible.value = true;
-}
 
 function toFinish(d, sName, chapterOrStageId) {
 	console.log("dddddd", d, sName, chapterOrStageId);
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index 338c838..73b98dc 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -2,7 +2,7 @@
 	<div class="pathdetails" style="padding: 30px">
 		<!-- 面包屑导航 -->
 		<div class="crumb">
-			<div>{{ routerName }}</div>
+			<div>{{ data.routerName }}</div>
 			<div style="margin-left: 6px; margin-right: 6px">/</div>
 			<div style="font-weight: 700">路径图详情</div>
 
@@ -18,7 +18,7 @@
 
     <div class="pdname">
       {{ userInfo.bandDesc }}    
-      <el-popover ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300" :content="data.remark">
+      <el-popover v-if="!data.remark" ref="popover" popper-class="jianjie" placement="right" trigger="hover" :width="300" :content="data.remark">
     <template #reference><span style="font-size: 16px;font-weight: 600;">简介></span></template>
   </el-popover>
     </div>
@@ -45,7 +45,9 @@
               :key="index"
           >
             <div style="width: 70%">
-              <div class="coursename" :title="value.name">{{ value.name }}</div>
+				<el-popover ref="popover"  placement="right" trigger="hover" :width="300" :content="value.name">
+								<template #reference><div class="coursename" :title="value.name">{{ value.name }}</div></template>
+							</el-popover>
               <div class="coursetag">
                 <div
                     class="tag1"
@@ -89,12 +91,8 @@
 											}[parseInt(value.currentRatio * 100 / 20)]
 										" />
 									</div>
-									<div style="
-                      font-size: 14px;
-                      font-weight: 500;
-                      color: #277aff;
-                      margin-left: 10px;
-                    " :style="{
+									<div style="font-size: 14px;font-weight: 500;color: #277aff;margin-left: 10px;" 
+					:style="{
                     	color: {
                     		0: 'rgba(238, 112, 108, 1)',
                     		1: 'rgba(255, 151, 38, 1)',