Merge branch 'master' into zcwy-dev

src/views/project/ProjectDetails.vue

@@ -199,7 +199,7 @@
         </div>
         <!-- 个人信息及学习进度 -->
         <!-- 学员积分及个人完成度排行榜 -->
-        <div class="detailRB">
+        <div  class="detailRB" v-if="data.rankFlag">
           <div class="info">
             <div
               style="display:flex;justify-content: space-between;align-items: center;height: 56px;padding-left: 27px;padding-right: 27px;">

src/views/survey/SurveyDetail.vue

@@ -34,6 +34,11 @@
     <!-- 标题 -->
     <!-- 基本信息 -->
     <div class="bascinfo">
+      <div class="header_wrap" v-if="data.projectInfo">
+        <div class="header_wrap_item">项目名称：{{ data.projectInfo.projectName }}</div>
+        <div class="header_wrap_item">开课名称：{{ sName }}</div>
+        <div class="header_wrap_item">培训讲师：{{ data.projectInfo.teacherName }}</div>
+      </div>
       <div>
         <div class="question" v-for="(value, index) in  questionList " :key="index"
              :style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
@@ -236,7 +241,7 @@ const { data } = useRequest(ASSESSMENT_QUERY(courseId), {
   chapterOrStageId,
   targetId: infoId ? infoId : 0
 });
-
+console.log(data,'data')
 // 答题时间
 const answerTime = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss");
 
@@ -410,7 +415,15 @@ function submit() {
     display: flex;
     flex-direction: column;
     align-items: center;
-
+    .header_wrap{
+      margin: 10px 0 0 0;
+      padding: 5px 0 5px 10px;
+      background: #fff;
+      margin-left: -680px;
+      .header_wrap_item{
+        margin-bottom: 5px;
+      }
+    }
     .question .text {
       font-size: 16px;
       font-weight: 500;