Merge branch 'dev0731' into 'zcwyny0220'

# Conflicts:
#   src/api/ThirdApi.js

src/views/investigat/InvestigatPage.vue

@@ -2,6 +2,11 @@
   <div class="Investigat">
     <!-- <TitleHead text="【调研】管理者进阶腾飞班 - 培训阶段性调研"></TitleHead> -->
     <ReturnHead text="评估详情"></ReturnHead>
+    <div class="header_wrap" v-if="data.projectInfoList&&type!=1">
+      <div>项目名称：{{ data.projectInfoList[0].projectName }}</div>
+      <div>开课名称：{{ data.projectInfoList[0].courseName }}</div>
+      <div>培训讲师：{{ data.projectInfoList.map(item => item.teacherName).join('，') }}</div>
+    </div>
     <div class="notice">
       <div class="noticebox">
         <div class="mani">
@@ -275,7 +280,12 @@ const { data } = useRequest(
     type,
     chapterOrStageId,
     targetId: infoId ? infoId : 0,
-  },
+  },(res)=>{
+    if (res.code === 6) {
+      router.push({
+        path: "/NotProject2",
+      });
+    } },
   (e) => {
     useRequest(
       checkStudentExist,
@@ -426,6 +436,10 @@ function submit() {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss">
+.header_wrap{
+    padding: 15px 0 5px 10px;
+    background: #fff;
+}
 .clearfix:before,
 .clearfix:after {
   content: " ";
@@ -440,7 +454,7 @@ function submit() {
     display: flex;
     justify-content: center;
     // margin-top: -17.5px;
-    margin-top: 10px;
+    //margin-top: 10px;
     .noticebox {
       // width: 90%;
       width: 100%;

src/views/nottask/NotProject2.vue

@@ -0,0 +1,21 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2023-03-01 20:41:06
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2023-03-09 18:33:51
+ * @FilePath: /stu_h5/src/views/nottask/NotTask.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <el-result icon="error" title="您不是此项目学员" sub-title="请联系管理员">
+    <template #extra>
+      <el-button type="primary" @click="toIndex">返回首页</el-button>
+    </template>
+  </el-result>
+</template>
+<script setup>
+function toIndex() {
+  window.location.href =
+    window.location.protocol + import.meta.env.VITE_BOE_HOME;
+}
+</script>