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

# Conflicts:
#	src/components/img/UploadImg.vue

src/api/api.js

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-12-11 16:57:58
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-15 10:56:54
+ * @LastEditTime: 2022-12-17 14:59:41
  * @FilePath: /fe-stu/src/api/api.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */

src/api/request.js

@@ -1,7 +1,7 @@
 import router from "@/router";
-import {reactive, ref, toRefs, watch} from "vue";
+import { reactive, ref, toRefs, watch } from "vue";
 import axios from 'axios';
-import {getCookie} from "@/api/utils";
+import { getCookie } from "@/api/utils";
 
 export function usePage(_url, param) {
 
@@ -11,11 +11,11 @@ export function usePage(_url, param) {
         total: 0,
         size: 10,
         current: 1,
-        params: {pageNo: 1, pageSize: 10, ...param}
+        params: { pageNo: 1, pageSize: 10, ...param }
     })
 
     watch(param, () => {
-        state.params = {...state.params, ...param}
+        state.params = { ...state.params, ...param }
         fetchData()
     })
 
@@ -86,14 +86,14 @@ export async function request(_url, params) {
         method,
         headers: {
             'token': getCookie('token'),
-            ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
+            ...method !== 'get' ? { 'Content-Type': 'application/json' } : {}
         },
         baseURL: import.meta.env.VITE_BASE_API,
-        ...method !== 'get' ? {data: JSON.stringify(body)} : {}
+        ...method !== 'get' ? { data: JSON.stringify(body) } : {}
     }).then(resp => resp.data).then(response => {
         if (response.code !== 200 && response.code !== 0) {
             if (response.code === 1000) {
-                import.meta.env.MODE === 'development' ? router.push({path: '/login'}) : window.open(import.meta.env.VITE_BASE_LOGIN_URL)
+                import.meta.env.MODE === 'development' ? router.push({ path: '/login' }) : window.open(import.meta.env.VITE_BASE_LOGIN_URL)
             }
             // if (import.meta.env.DEV && response.code === 1000) {
             //     router.push({path: '/login'})
@@ -108,7 +108,7 @@ export async function request(_url, params) {
         }
         return response
     }).catch(e => {
-        console.log(e)
+        console.log('eeeee', e)
         // router.push({path: '/login'})
     })
 }
@@ -135,10 +135,10 @@ export async function boeRequest(_url, params) {
         method,
         headers: {
             token: getCookie('token'),
-            ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
+            ...method !== 'get' ? { 'Content-Type': 'application/json' } : {}
         },
         baseURL: '',
-        ...method !== 'get' ? {data: JSON.stringify(body)} : {}
+        ...method !== 'get' ? { data: JSON.stringify(body) } : {}
     }).then(resp => resp.data).then(response => {
         return response
     }).catch(e => {

src/views/faceteach/FaceTeach.vue

@@ -14,25 +14,58 @@
         <div class="title">【面授课】{{ data.planDto?.name }}</div>
         <div class="time" style="margin-top: 26px">
           <img
-              style="width: 15px; height: 17px"
+            style="width: 15px; height: 17px"
-              src="../../assets/image/time.png"
+            src="../../assets/image/time.png"
           />
           <div style="margin-left: 8px">
-            {{ data.offcourseDto?.publishTime }}
+            {{ data.planDto?.beginTime + "至" + data.planDto?.endTime }}
           </div>
         </div>
         <div class="time" style="margin-top: 23px">
           <img
-              style="width: 16px; height: 18px"
+            style="width: 16px; height: 18px"
-              src="../../assets/image/position.png"
+            src="../../assets/image/position.png"
           />
           <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
         </div>
       </div>
-      <botton :style="{background:`${data.isSurvery?'#999':'rgb(57, 146, 249)'}`}" class="btn" @click="toSurvery"
+      <div style="display: flex">
-              v-if="data.evalFlag && data.evalFlag==='1'"
+        <botton
-      >{{ data.isSurvery ? '已评估' : '评估' }}
+          v-if="!isAllowSign"
-      </botton>
+          class="btn"
+          style="margin-right: 20px; background: #999"
+          @click="signClick"
+          >签到
+        </botton>
+        <botton
+          v-if="isAllowSign"
+          class="btn"
+          style="margin-right: 20px"
+          :style="{
+            background:
+              data.signFlag || !isAllowSign ? '#999' : 'rgb(57, 146, 249)',
+          }"
+          @click="signClick"
+          >{{ data.signFlag ? "已签到" : "签到" }}
+        </botton>
+        <botton
+          style="background: #999"
+          class="btn"
+          @click="toSurvery"
+          v-if="data.planDto?.evalFlag == 0"
+        >
+          评估
+        </botton>
+        <botton
+          :style="{
+            background: `${data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
+          }"
+          class="btn"
+          @click="toSurvery"
+          v-if="data.planDto?.evalFlag && data.planDto?.evalFlag == 1"
+          >{{ data.isSurvery ? "已评估" : "评估" }}
+        </botton>
+      </div>
     </div>
     <!-- 基本信息 -->
 
@@ -43,8 +76,8 @@
           <div class="" style="margin-left: 48px; margin-right: 48px">
             <div class="title">
               <img
-                  style="width: 20px; height: 20px"
+                style="width: 20px; height: 20px"
-                  src="../../assets/image/course.png"
+                src="../../assets/image/course.png"
               />
               <div class="text">课程详情</div>
               <div class="box"></div>
@@ -58,16 +91,29 @@
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="课程附件" name="first">
               <div
-                  v-for="(el, index) in JSON.parse(data.planDto?.attach)"
+                v-if="data.planDto?.attach === '[]'"
-                  :key="index"
+                style="
-                  v-if="data.planDto"
+                  font-size: 14px;
-                  class="enclosure"
+                  font-weight: 400;
-                  :style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }"
+                  line-height: 24px;
+                  cursor: pointer;
+                  margin-left: 40px;
+                  margin-top: 20px;
+                "
+              >
+                此课程无附件
+              </div>
+              <div
+                v-for="(el, index) in JSON.parse(data.planDto?.attach)"
+                :key="index"
+                v-if="data.planDto"
+                class="enclosure"
+                :style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }"
               >
                 <div class="enclosureL">
                   <FileTypeImg
-                      v-model="el.name"
+                    v-model="el.name"
-                      :style="{
+                    :style="{
                       width: '22px',
                       height: '26px',
                       marginLeft: '10px',
@@ -77,15 +123,33 @@
                 </div>
                 <div class="download">
                   <img
-                      style="width: 16px; height: 15px"
+                    style="width: 16px; height: 15px"
-                      src="../../assets/image/download.png"
+                    src="../../assets/image/download.png"
                   />
-                  <div style="margin-left: 5px" @click="download(el.response.data)">下载</div>
+                  <div
+                    style="margin-left: 5px"
+                    @click="download(el.response.data)"
+                  >
+                    下载
+                  </div>
                 </div>
               </div>
             </el-tab-pane>
             <el-tab-pane label="课程作业" name="second">
-              <div class="work" v-if="data.workDto?.workName ">
+              <div
+                v-if="data.planDto?.attach === '[]'"
+                style="
+                  font-size: 14px;
+                  font-weight: 400;
+                  line-height: 24px;
+                  cursor: pointer;
+                  margin-left: 40px;
+                  margin-top: 20px;
+                "
+              >
+                此课程无作业
+              </div>
+              <div class="work" v-if="data.workDto?.workName">
                 <div>
                   <div class="question">{{ data.workDto?.workName }}</div>
                   <div style="margin-top: 16px; display: flex">
@@ -94,11 +158,24 @@
                   </div>
                 </div>
                 <div class="submit" @click="toWork" v-if="data.workDto?.workId">
-                  提交
+                  去作业
                 </div>
               </div>
             </el-tab-pane>
             <el-tab-pane label="课程考试" name="third">
+              <div
+                v-if="data.planDto?.attach === '[]'"
+                style="
+                  font-size: 14px;
+                  font-weight: 400;
+                  line-height: 24px;
+                  cursor: pointer;
+                  margin-left: 40px;
+                  margin-top: 20px;
+                "
+              >
+                此课程无考试
+              </div>
               <div class="work" v-if="data.examinationDto?.examinationTestName">
                 <div>
                   <div class="question">
@@ -106,17 +183,17 @@
                   </div>
                   <div style="margin-top: 16px; display: flex">
                     <div
-                        class="tag1"
+                      class="tag1"
-                        v-if="data.examinationDto?.examinationFlag"
+                      v-if="data.examinationDto?.examinationFlag"
                     >
                       必修
                     </div>
                     <div class="tag3" style="margin-left: 11px">考试</div>
                   </div>
                 </div>
-                <!--                <div class="submit" @click="toExamItem(data.examinationDto)">-->
+                <div class="submit" @click="toExamItem(data.examinationDto)">
-                <!--                  去考试-->
+                  去考试
-                <!--                </div>-->
+                </div>
               </div>
             </el-tab-pane>
           </el-tabs>
@@ -125,15 +202,15 @@
       <div class="teacher">
         <div class="title">
           <img
-              style="width: 21px; height: 23px"
+            style="width: 21px; height: 23px"
-              src="../../assets/image/livelecturer.png"
+            src="../../assets/image/livelecturer.png"
           />
           <div class="text">直播讲师</div>
           <div class="box"></div>
         </div>
         <!--        todo #面授课接口 讲师缺少img和介绍-->
         <div class="teacheritem">
-          <img class="peopleimg" :src="userAvatar"/>
+          <img class="peopleimg" :src="userAvatar" />
           <div style="margin-left: 17px; width: 190px">
             <div class="teacherName" style="margin-right: 5px">
               {{ data.planDto?.teacher }}
@@ -149,46 +226,127 @@
 </template>
 
 <script setup>
-import {computed, reactive, toRefs, watch} from "vue";
+import { computed, reactive, toRefs, watch } from "vue";
 import FileTypeImg from "@/components/FileTypeImg.vue";
-import {request, useRequest} from "@/api/request";
+import { request, useRequest } from "@/api/request";
-import {STU_OFFCOURSE_DETAIL} from "@/api/api";
+import { STU_OFFCOURSE_DETAIL } from "@/api/api";
-import {useRoute, useRouter} from "vue-router";
+import { useRoute, useRouter } from "vue-router";
-import {useUserInfo} from "@/api/utils";
+import { useUserInfo } from "@/api/utils";
 
 const router = useRouter();
 const returnclick = () => {
   router.back();
 };
 const {
-  query: {courseId, type},
+  query: { courseId, type, id: taskId },
 } = useRoute();
 
-const {data} = useRequest(STU_OFFCOURSE_DETAIL, {courseId});
+const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId });
-
+console.log("datadatadatadatadatadatadata", data);
-const {avatar: userAvatar} = useUserInfo(
+const { avatar: userAvatar } = useUserInfo(
-    computed(() => data.value?.planDto?.teacherId)
+  computed(() => data.value?.planDto?.teacherId)
 );
 
 const state = reactive({
   activeName: "first",
   enclosure: "",
+  isAllowSign: false,
 });
-const {activeName, enclosure} = toRefs(state);
+const { activeName, enclosure, isAllowSign } = toRefs(state);
 const handleClick = (tab, event) => {
   console.log(tab, event);
 };
 const download = (url) => {
   window.open(url);
 };
+let timer = null;
+//判断能否签到
+function isSignClick() {
+  timer = setInterval(() => {
+    if (data.value.planDto.beforeStart && data.value.planDto.afterStart) {
+      //有开始前有开始后
+      let beginTime =
+        new Date(data.value.planDto.beginTime).getTime() -
+        data.value.planDto.beforeStart * 60 * 1000;
+      let endTime =
+        new Date(data.value.planDto.beginTime).getTime() +
+        data.value.planDto.afterStart * 60 * 1000;
+      let nowTime = new Date().getTime();
+      if (nowTime < endTime && nowTime > beginTime) {
+        state.isAllowSign = true;
+      } else {
+        state.isAllowSign = false;
+      }
+    } else if (
+      !data.value.planDto.beforeStart &&
+      !data.value.planDto.afterStart
+    ) {
+      //开始前开始后都没有
+      state.isAllowSign = true;
+    } else if (
+      data.value.planDto.beforeStart &&
+      !data.value.planDto.afterStart
+    ) {
+      //只有开始前无开始后
+      let beginTime =
+        new Date(data.value.planDto.beginTime).getTime() -
+        data.value.planDto.beforeStart * 60 * 1000;
+      let nowTime = new Date().getTime();
+      if (nowTime > beginTime) {
+        state.isAllowSign = true;
+      } else {
+        state.isAllowSign = false;
+      }
+    } else if (
+      !data.value.planDto.beforeStart &&
+      data.value.planDto.afterStart
+    ) {
+      //无开始前有开始后
+      let endTime =
+        new Date(data.value.planDto.beginTime).getTime() +
+        data.value.planDto.afterStart * 60 * 1000;
+      let nowTime = new Date().getTime();
+      if (nowTime < endTime) {
+        state.isAllowSign = true;
+      } else {
+        state.isAllowSign = false;
+      }
+    }
+    console.log("isAllowSign", state.isAllowSign);
+  }, 1000);
+}
+isSignClick();
+
+//签到
+const signClick = () => {
+  if (data.value.signFlag) {
+    return;
+  }
+  console.log("data.signFlag", data.value.signFlag);
+  if (!isAllowSign) {
+    ElMessage.info("未在签到范围内");
+    return;
+  }
+  data.value.signFlag = 1;
+  ElMessage.info("签到成功");
+  request(TASK_BROADCAST_SIGN, { courseId: courseId, taskId, type });
+};
 
 function toSurvery() {
   if (data.value.isSurvery) {
-    return
+    return;
+  }
+  if (data.value.planDto.evalFlag == 0) {
+    ElMessage.info("此课程无评估");
+    return;
   }
   router.push({
     path: "/surveydetail",
-    query: {courseId: data.value.planDto.evaluateId},
+    query: {
+      courseId: data.value.planDto.evaluateId,
+      pName: "面授课",
+      sName: data.value.planDto.name,
+    },
   });
 }
 
@@ -199,12 +357,16 @@ function toWork() {
       courseId: data.value.workDto.workId,
       id: data.value.offcourseDto.categoryId,
       type,
+      pName: "面授课",
+      sName: data.value.planDto.name,
     },
   });
 }
 
 function toExamItem(obj) {
-  router.push({path: "/starttest", query: {id: obj.courseId}});
+  console.log("obj", obj.examinationTestId);
+  window.open(import.meta.env.VITE_BOE_EXAM_DETAIL_URL + obj.examinationTestId); //测评
+  // router.push({ path: import.meta.env.VITE_BOE_EXAM_DETAIL_URL+ obj.examinationTestId });
 }
 </script>
 

src/views/homework/HomeworkPage.vue

@@ -26,10 +26,9 @@
         </div>
       </div>
     </div>
-    <div @click="returnclick">返回</div>
     <!-- 面包屑导航 -->
     <div class="debateTitle" style="color: #fff">
-      【作业】管理者进阶腾飞班 - 中级管理者作业
+      【作业】 {{ data?.workName }}
     </div>
     <!-- 详细信息 -->
     <div class="detailinfo">
@@ -284,6 +283,7 @@ const {
 } = useRoute();
 
 const { data } = useRequest(TASK_WORK_DETAIL, { workId, taskId });
+console.log("data", data);
 const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, {
   workerId: workId,
 });

src/views/liveBroadcast/LiveBroadcast.vue

@@ -7,23 +7,24 @@
       <div>{{ sName }}</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
       <div style="font-weight: 700; font-size: 16px">直播详情</div>
-<!--
+      <!--
       <div class="preNext">
          2022-12-15注释 李晓鸽  后面打开 -->
-        <!-- <button class="btn btn01"></button>
+      <!-- <button class="btn btn01"></button>
         <span class="content" style="margin-left: 6px">上一个</span>
         <span class="content" style="margin-left: 31px">下一个</span>
         <button class="btn btn02" style="margin-left: 6px"></button> 
       </div>-->
       <div class="return">
-      <div style="display: flex" @click="returnclick">
+        <div style="display: flex" @click="returnclick">
-                  <img
+          <img
-                    class="img2" style="margin-right:22px;"
+            class="img2"
-                    src="../../assets/image/return.png"
+            style="margin-right: 22px"
-                  />
+            src="../../assets/image/return.png"
-                  <div class="text">返回</div>
+          />
+          <div class="text">返回</div>
         </div>
-    </div>
+      </div>
     </div>
     <!-- 面包屑导航 -->
 
@@ -33,11 +34,11 @@
         <div class="title">【直播】{{ data?.liveName }}</div>
         <div class="time" style="margin-top: 26px">
           <img
-              style="width: 15px; height: 17px"
+            style="width: 15px; height: 17px"
-              src="../../assets/image/time.png"
+            src="../../assets/image/time.png"
           />
           <div style="margin-left: 8px">
-            {{ data?.liveStartTime + "-" + data?.liveEndTime }}
+            {{ data?.liveStartTime + "至" + data?.liveEndTime }}
           </div>
         </div>
         <!--          todo #直播详情 没有位置字段-->
@@ -52,27 +53,36 @@
       </div>
       <div class="threeBtn">
         <botton
-            class="btn"
+          class="btn"
-            style="background: rgb(59, 191, 252)"
+          style="background: rgb(59, 191, 252)"
-            @click="showClick"
+          @click="showClick"
-        >观看
+          >观看
         </botton>
         <botton
-            class="btn"
+          class="btn"
-            :style="{
+          :style="{
             background: `${data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
           }"
-            @click="signClick"
+          @click="signClick"
-        >{{ data.signFlag ? "已签到" : "签到" }}
+          >{{ data.signFlag ? "已签到" : "签到" }}
         </botton>
         <botton
-            :style="{
+          style="background: #999"
+          class="btn"
+          @click="commitClick"
+          v-if="data.isEvaluate == 0"
+        >
+          评估
+        </botton>
+
+        <botton
+          :style="{
             background: `${data.isSurvery ? '#999' : 'rgb(57, 146, 249)'}`,
           }"
-            class="btn"
+          class="btn"
-            @click="commitClick"
+          @click="commitClick"
-            v-if="data.isEvaluate && data.isEvaluate==='1'"
+          v-if="data.isEvaluate && data.isEvaluate == 1"
-        >{{ data.isSurvery ? "已评估" : "评估" }}
+          >{{ data.isSurvery ? "已评估" : "评估" }}
         </botton>
       </div>
     </div>
@@ -85,8 +95,8 @@
           <div class="" style="margin-left: 48px; margin-right: 48px">
             <div class="title">
               <img
-                  style="width: 20px; height: 20px"
+                style="width: 20px; height: 20px"
-                  src="../../assets/image/course.png"
+                src="../../assets/image/course.png"
               />
               <div class="text">直播说明</div>
               <div class="box"></div>
@@ -122,8 +132,8 @@
         <div class="tell">
           <div class="title">
             <img
-                style="width: 21px; height: 23px"
+              style="width: 21px; height: 23px"
-                src="../../assets/image/tv.png"
+              src="../../assets/image/tv.png"
             />
             <div class="text">直播公告</div>
             <div class="box"></div>
@@ -133,18 +143,18 @@
         <div class="teacher">
           <div class="title">
             <img
-                style="width: 21px; height: 23px"
+              style="width: 21px; height: 23px"
-                src="../../assets/image/livelecturer.png"
+              src="../../assets/image/livelecturer.png"
             />
             <!--            todo #直播详情 没有直播讲师-->
             <div class="text">直播讲师</div>
             <div class="box"></div>
           </div>
           <div
-              class="teacheritem"
+            class="teacheritem"
-              :style="{ 'border-bottom': '1px solid rgba(56, 125, 247, 0.2)' }"
+            :style="{ 'border-bottom': '1px solid rgba(56, 125, 247, 0.2)' }"
           >
-            <img class="peopleimg" :src="userAvatar"/>
+            <img class="peopleimg" :src="userAvatar" />
             <div style="margin-left: 17px; width: 190px">
               <div class="teacherName" style="margin-right: 5px">
                 {{ data.userInfoBo?.userName }}
@@ -161,27 +171,27 @@
 </template>
 
 <script setup>
-import {computed, reactive, toRefs} from "vue";
+import { computed, reactive, toRefs } from "vue";
 import img from "@/assets/image/uploadimg.png";
-import {request, useRequest} from "@/api/request";
+import { request, useRequest } from "@/api/request";
-import {TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN} from "@/api/api";
+import { TASK_BROADCAST_DETAIL, TASK_BROADCAST_SIGN } from "@/api/api";
-import {useRoute} from "vue-router/dist/vue-router";
+import { useRoute } from "vue-router/dist/vue-router";
-import {useRouter} from "vue-router";
+import { useRouter } from "vue-router";
-import {useUserInfo} from "@/api/utils";
+import { useUserInfo } from "@/api/utils";
-import {ElMessage} from "element-plus";
+import { ElMessage } from "element-plus";
 
 const {
-  query: {courseId: liveId, id: taskId, type, pName, sName},
+  query: { courseId: liveId, id: taskId, type, pName, sName },
 } = useRoute();
 const router = useRouter();
 const returnclick = () => {
   router.back();
 };
 
-const {data} = useRequest(TASK_BROADCAST_DETAIL, {liveId});
+const { data } = useRequest(TASK_BROADCAST_DETAIL, { liveId });
 
-const {avatar: userAvatar} = useUserInfo(
+const { avatar: userAvatar } = useUserInfo(
-    computed(() => data.value.userInfoBo?.userId)
+  computed(() => data.value.userInfoBo?.userId)
 );
 
 const state = reactive({
@@ -191,27 +201,36 @@ const state = reactive({
       id: 1,
       name: "王星天（显示事业）",
       introduce:
-          "教师是学生的镜子,学生是老师的影子。教师是学生的镜子,学生是老师的影子。教师是学生的镜子,学生是老师的影子。",
+        "教师是学生的镜子,学生是老师的影子。教师是学生的镜子,学生是老师的影子。教师是学生的镜子,学生是老师的影子。",
       peopleimg: img,
     },
   ],
 });
-const {activeName, teacher} = toRefs(state);
+const { activeName, teacher } = toRefs(state);
 const signClick = () => {
   if (data.value.signFlag) {
     return;
   }
   data.value.signFlag = 1;
   ElMessage.info("签到成功");
-  request(TASK_BROADCAST_SIGN, {courseId: liveId, taskId, type});
+  request(TASK_BROADCAST_SIGN, { courseId: liveId, taskId, type });
 };
 const commitClick = () => {
   if (data.value.isSurvery) {
     return;
   }
+  if (data.value.isEvaluate == 0) {
+    ElMessage.info("此直播无评估");
+    return;
+  }
+
   router.push({
     path: "/surveydetail",
-    query: {courseId: data.value.assessmentId},
+    query: {
+      courseId: data.value.assessmentId,
+      pName: "直播",
+      sName: data.value.liveName,
+    },
   });
 };
 
@@ -230,14 +249,14 @@ function showClick() {
     line-height: 24px;
     position: relative;
   }
-  .return{
+  .return {
     position: absolute;
     right: 10%;
-    .text{
+    .text {
       text-align: center;
-     display: flex;
+      display: flex;
-     flex-direction: row;
+      flex-direction: row;
-     align-items: center;
+      align-items: center;
     }
   }
   .preNext {
@@ -285,7 +304,6 @@ function showClick() {
     .threeBtn {
       display: flex;
       width: 490px;
-      justify-content: space-between;
       margin-right: 87px;
 
       .btn {
@@ -302,7 +320,7 @@ function showClick() {
         font-weight: 800;
         line-height: 24px;
         cursor: pointer;
-        // margin-right: 96px;
+        margin-left: 20px;
       }
     }
 
@@ -513,9 +531,9 @@ function showClick() {
       background-color: rgba(255, 255, 255, 1);
       border-radius: 8px;
       background: linear-gradient(
-              180deg,
+        180deg,
-              rgba(36, 120, 255, 0.15) 0%,
+        rgba(36, 120, 255, 0.15) 0%,
-              rgba(255, 255, 255) 50%
+        rgba(255, 255, 255) 50%
       );
 
       .title {

src/views/moreActive/MoreActive.vue

@@ -7,7 +7,7 @@
       <div>{{ sName }}</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
       <div style="font-weight: 700; font-size: 16px">活动详情</div>
- <!-- 
+      <!-- 
       <div class="preNext">
         <button class="btn btn01"></button>
         <span class="content" style="margin-left: 6px">上一个</span>
@@ -15,14 +15,15 @@
         <button class="btn btn02" style="margin-left: 6px"></button>
       </div>-->
       <div class="return">
-      <div style="display: flex" @click="returnclick">
+        <div style="display: flex" @click="returnclick">
-                  <img
+          <img
-                    class="img2" style="margin-right:22px;"
+            class="img2"
-                    src="../../assets/image/return.png"
+            style="margin-right: 22px"
-                  />
+            src="../../assets/image/return.png"
-                  <div class="text">返回</div>
+          />
+          <div class="text">返回</div>
         </div>
-    </div>
+      </div>
     </div>
     <!-- 面包屑导航 -->
 
@@ -33,26 +34,28 @@
         <div class="title">{{ data?.activityName }}</div>
         <div class="time" style="margin-top: 26px">
           <img
-              style="width: 15px; height: 17px"
+            style="width: 15px; height: 17px"
-              src="../../assets/image/time.png"
+            src="../../assets/image/time.png"
           />
           <div style="margin-left: 8px">
-            {{ data?.activityStartTime + "-" + data?.activityEndTime }}
+            {{ data?.activityStartTime + "至" + data?.activityEndTime }}
           </div>
         </div>
         <div class="time" style="margin-top: 23px">
           <img
-              style="width: 16px; height: 18px"
+            style="width: 16px; height: 18px"
-              src="../../assets/image/position.png"
+            src="../../assets/image/position.png"
           />
           <div style="margin-left: 8px">{{ data?.activityAddress }}</div>
         </div>
       </div>
       <botton
-          class="btn"
+        class="btn"
-          :style="{background:`${data.signFlag?'#999':'rgb(57, 146, 249)'}`}"
+        :style="{
-          @click="signClick"
+          background: `${data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`,
-      >{{ data.signFlag ? '已签到' : '签到' }}
+        }"
+        @click="signClick"
+        >{{ data.signFlag ? "已签到" : "签到" }}
       </botton>
     </div>
     <!-- 基本信息 -->
@@ -64,8 +67,8 @@
           <div style="margin-left: 48px; margin-right: 48px">
             <div class="title">
               <img
-                  style="width: 20px; height: 20px"
+                style="width: 20px; height: 20px"
-                  src="../../assets/image/book.png"
+                src="../../assets/image/book.png"
               />
               <div class="text">活动详情</div>
               <div class="box"></div>
@@ -76,8 +79,8 @@
                 <div class="content">
                   {{
                     data?.activityDuration
-                        ? data?.activityDuration + "分钟"
+                      ? data?.activityDuration + "分钟"
-                        : "-"
+                      : "-"
                   }}
                 </div>
               </div>
@@ -92,15 +95,15 @@
                 <div class="content">
                   {{
                     data?.beforeSignIn
-                        ? "开始前" + data?.beforeSignIn + "分钟开始签到"
+                      ? "开始前" + data?.beforeSignIn + "分钟开始签到"
-                        : "-"
+                      : "-"
                   }}
                 </div>
                 <div class="content">
                   {{
                     data?.afterSignIn
-                        ? "开始后" + data?.afterSignIn + "分钟结束签到"
+                      ? "开始后" + data?.afterSignIn + "分钟结束签到"
-                        : "-"
+                      : "-"
                   }}
                 </div>
               </div>
@@ -123,8 +126,8 @@
       <div class="teacher">
         <div class="title">
           <img
-              style="width: 24px; height: 20px"
+            style="width: 24px; height: 20px"
-              src="../../assets/image/call.png"
+            src="../../assets/image/call.png"
           />
           <div class="text">活动公告</div>
           <div class="box"></div>
@@ -140,27 +143,27 @@
 </template>
 
 <script setup>
-import {TAS_ACTIVITY_DETAIL, TASK_ACTIVITY_SIGN, ACTIVITY} from "@/api/api";
+import { TAS_ACTIVITY_DETAIL, TASK_ACTIVITY_SIGN, ACTIVITY } from "@/api/api";
-import {request, useRequest} from "@/api/request";
+import { request, useRequest } from "@/api/request";
-import {useRoute} from "vue-router/dist/vue-router";
+import { useRoute } from "vue-router/dist/vue-router";
-import {ElMessage} from "element-plus";
+import { ElMessage } from "element-plus";
 
 const {
-  query: {courseId: activityId, id: taskId, type, pName, sName},
+  query: { courseId: activityId, id: taskId, type, pName, sName },
 } = useRoute();
 
-const {data} = useRequest(ACTIVITY, {activityId});
+const { data } = useRequest(ACTIVITY, { activityId });
 const signClick = (tab, event) => {
   if (data.value.signFlag) {
     return;
   }
-  data.value.signFlag = true
+  data.value.signFlag = true;
   ElMessage.info("签到成功");
   request(TASK_ACTIVITY_SIGN, {
     courseId: activityId,
-    taskId, type
+    taskId,
-  })
+    type,
-
+  });
 };
 </script>
 
@@ -174,14 +177,14 @@ const signClick = (tab, event) => {
     line-height: 24px;
     position: relative;
   }
-  .return{
+  .return {
     position: absolute;
     right: 10%;
-    .text{
+    .text {
       text-align: center;
-     display: flex;
+      display: flex;
-     flex-direction: row;
+      flex-direction: row;
-     align-items: center;
+      align-items: center;
     }
   }
   .preNext {
@@ -442,9 +445,9 @@ const signClick = (tab, event) => {
       background-color: rgba(255, 255, 255, 1);
       border-radius: 8px;
       background: linear-gradient(
-              180deg,
+        180deg,
-              rgba(36, 120, 255, 0.15) 0%,
+        rgba(36, 120, 255, 0.15) 0%,
-              rgba(255, 255, 255) 50%
+        rgba(255, 255, 255) 50%
       );
 
       .title {

src/views/project/ProjectDetails.vue

@@ -135,8 +135,9 @@
                 {{ data.remark || '暂无公告' }}
               </div>
             </el-tab-pane>
+              <!--  
             <el-tab-pane label="共享文档" name="second">
-              <!--              <div style="padding: 19px 30px 17px 28px">-->
+                        <div style="padding: 19px 30px 17px 28px">-->
               <!--                <div-->
               <!--                  v-for="(value, index) in sharedoc"-->
               <!--                  :key="index"-->
@@ -156,8 +157,8 @@
               <!--                    <div style="margin-left: 7px">下载</div>-->
               <!--                  </div>-->
               <!--                </div>-->
-              <!--              </div>-->
+              <!--              </div>
-            </el-tab-pane>
+            </el-tab-pane>-->
           </el-tabs>
         </div>
         <!-- 课程公告及共享文档 -->
@@ -200,10 +201,13 @@
               <div class="text" style="margin-left: 9px">学习进度</div>
               <div class="box"></div>
             </div>
+            <!--
             <div class="rate">
               <div class="ratetext">上次学到：启航班-领导寄语</div>
               <div class="ratebtn">继续学习</div>
-            </div>
+            </div>-->
+
+
             <div style="margin-top: 16px">
               <div class="progressBox">
                 <div>总进度</div>

src/views/roadmap/PathDetails.vue

@@ -35,8 +35,8 @@
             )"
             :key="index"
           >
-            <div>
+            <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"
@@ -220,10 +220,11 @@
               <div class="text" style="margin-left: 9px">学习进度</div>
               <div class="box"></div>
             </div>
+            <!--
             <div class="rate">
               <div class="ratetext">上次学到：{{ data.lastLearned }}</div>
               <div class="ratebtn">继续学习</div>
-            </div>
+            </div>-->
             <div style="margin-top: 16px">
               <div class="progressBox">
                 <div>总进度</div>
@@ -338,7 +339,9 @@ const {
   query: { routerId, routerName },
 } = useRoute();
 const router = useRouter();
-
+const returnclick = () => {
+  router.back();
+};
 const { data } = useRequest(ROUTER_PROCESS, { routerId });
 
 const userInfo = computed(() => store.state.userInfo);
@@ -394,9 +397,9 @@ const types = ref({
       ), //外联
     8: "/discusspage",
     9: "/moreactive",
-    10: ({ evaTyp, targetId }) =>
+    10: ({ evaType, targetId }) =>
       window.open(
-        (evaTyp === 1
+        (evaType == 0
           ? import.meta.env.VITE_BOE_TEST_DETAIL_URL
           : import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId
       ), //测评
@@ -429,7 +432,9 @@ function toFinish(d, sName) {
         },
       });
   } else if (typeof types.value.path[d.type] === "function") {
+    console.log("ddddddd", d);
     types.value.path[d.type](d);
+    // console.log("types.value.path[d.type](d)", d);
   }
 }
 
@@ -512,6 +517,9 @@ function whiteTypes(type) {
           font-weight: 500;
           color: #333330;
           line-height: 24px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
 
         .coursetag {

src/views/survey/SurveyDetail.vue

@@ -2,16 +2,16 @@
   <div class="surveydetail" style="padding: 30px">
     <!-- 面包屑导航 -->
     <div
-        style="display: flex; align-items: center; justify-content: space-between"
+      style="display: flex; align-items: center; justify-content: space-between"
     >
       <div class="crumb">
         <div>{{ pName }}</div>
         <div style="margin-left: 6px; margin-right: 6px">/</div>
         <div>{{ sName }}</div>
         <div style="margin-left: 6px; margin-right: 6px">/</div>
-        <div style="font-weight: 700; font-size: 16px">调研详情</div>
+        <div style="font-weight: 700; font-size: 16px">评估详情</div>
       </div>
-       <!-- 
+      <!-- 
       <div class="prevnext">
         <div class="prev">
           <img
@@ -28,40 +28,41 @@
           />
         </div>-->
       <div class="return">
-      <div style="display: flex" @click="returnclick">
+        <div style="display: flex" @click="returnclick">
-                  <img
+          <img
-                    class="img2" style="margin-right:22px;"
+            class="img2"
-                    src="../../assets/image/return.png"
+            style="margin-right: 22px"
-                  />
+            src="../../assets/image/return.png"
-                  <div class="text">返回</div>
+          />
+          <div class="text" style="color: #fff">返回</div>
         </div>
       </div>
     </div>
     <!-- 面包屑导航 -->
     <!-- 标题 -->
-    <div class="title">【调研】管理者进阶腾飞班 - 培训阶段性调研</div>
+    <div class="title">【评估】管理者进阶腾飞班 - 培训阶段性调研</div>
     <!-- 标题 -->
     <!-- 基本信息 -->
     <div class="bascinfo">
       <div>
         <div
-            class="question"
+          class="question"
-            v-for="(value, index) in data.assessmentScoringQuestionDtoList"
+          v-for="(value, index) in data.assessmentScoringQuestionDtoList"
-            :key="index"
+          :key="index"
-            :style="{ 'margin-top': index === 0 ? '57px' : '41px' }"
+          :style="{ 'margin-top': index === 0 ? '57px' : '41px' }"
         >
           <div class="text">{{ value.assessmentScTitle }}</div>
           <div class="answer">
             <div class="answerL">完全没用</div>
             <div class="answerC">
               <div
-                  class="answerCitem"
+                class="answerCitem"
-                  v-for="(item, key) in Array.from(
+                v-for="(item, key) in Array.from(
                   { length: value.assessmentMaxScore },
                   (k, i) => i
                 )"
-                  :key="key"
+                :key="key"
-                  :style="{
+                :style="{
                   'margin-left': key === 0 ? '15px' : '10px',
                   background:
                     value.selectAnswer === item
@@ -72,10 +73,10 @@
                       ? '#fff'
                       : 'rgba(86, 163, 249, 1)',
                 }"
-                  @click="
+                @click="
                   () => {
-                    if(data.isSubmit){
+                    if (data.isSubmit) {
-                      return
+                      return;
                     }
                     value.selectAnswer = item;
                   }
@@ -88,21 +89,29 @@
           </div>
         </div>
         <div
-            class="question"
+          class="question"
-            style="margin-top: 41px"
+          style="margin-top: 41px"
-            v-if="data.assessmentSingleChoiceDtoList && data.assessmentSingleChoiceDtoList.length"
+          v-if="
+            data.assessmentSingleChoiceDtoList &&
+            data.assessmentSingleChoiceDtoList.length
+          "
         >
-          <div class="text">{{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}</div>
+          <div class="text">
+            {{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}
+          </div>
           <div
-              v-for="(value, index) in data.assessmentSingleChoiceDtoList"
+            v-for="(value, index) in data.assessmentSingleChoiceDtoList"
-              :key="index"
+            :key="index"
-              style="display: flex; align-items: center"
+            style="display: flex; align-items: center"
-              :style="{'margin-top': index === 0 ? '29px' : '22px',cursor: 'pointer'}"
+            :style="{
-              @click="
+              'margin-top': index === 0 ? '29px' : '22px',
+              cursor: 'pointer',
+            }"
+            @click="
               () => {
-                if(data.isSubmit){
+                if (data.isSubmit) {
-                      return
+                  return;
-                    }
+                }
                 data.assessmentSingleChoiceDtoList.forEach((e) => {
                   e.select = false;
                 });
@@ -111,63 +120,83 @@
             "
           >
             <img
-                style="width: 19px; height: 18px; cursor: pointer"
+              style="width: 19px; height: 18px; cursor: pointer"
-                :src="value.select ? checkbox : checkbox2"
+              :src="value.select ? checkbox : checkbox2"
             />
             <div class="people">{{ value.singleOptionName }}</div>
           </div>
         </div>
 
         <div
-            class="question"
+          class="question"
-            style="margin-top: 41px"
+          style="margin-top: 41px"
-            v-if="data.assessmentMultipleChoiceDtoList && data.assessmentMultipleChoiceDtoList.length"
+          v-if="
+            data.assessmentMultipleChoiceDtoList &&
+            data.assessmentMultipleChoiceDtoList.length
+          "
         >
-          <div class="text">{{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}</div>
+          <div class="text">
+            {{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}
+          </div>
           <div
-              v-for="(value, index) in data.assessmentMultipleChoiceDtoList"
+            v-for="(value, index) in data.assessmentMultipleChoiceDtoList"
-              :key="index"
+            :key="index"
-              style="display: flex; align-items: center"
+            style="display: flex; align-items: center"
-              :style="{
+            :style="{
               'margin-top': index === 0 ? '29px' : '22px',
               cursor: 'pointer',
             }"
-              @click="() => {
+            @click="
-                if(data.isSubmit){
+              () => {
-                      return
+                if (data.isSubmit) {
+                  return;
                 }
-              value.select = !value.select
+                value.select = !value.select;
-              }"
+              }
+            "
           >
             <img
-                style="width: 19px; height: 18px; cursor: pointer"
+              style="width: 19px; height: 18px; cursor: pointer"
-                :src="value.select ? checkbox : checkbox2"
+              :src="value.select ? checkbox : checkbox2"
             />
             <div class="people">{{ value.multipleOptionName }}</div>
           </div>
         </div>
         <div
-            class="question"
+          class="question"
-            style="margin-top: 41px"
+          style="margin-top: 41px"
-            v-for="(item, i) in data.assessmentEssayQuestionDtoList"
+          v-for="(item, i) in data.assessmentEssayQuestionDtoList"
-            :key="i"
+          :key="i"
         >
           <div class="text">{{ item.assessmentQaTitle }}</div>
           <div style="width: 713px; margin-top: 31px; position: relative">
             <el-input
-                v-model="item.content"
+              v-model="item.content"
-                :autosize="{ minRows: 5, maxRows: 5 }"
+              :autosize="{ minRows: 5, maxRows: 5 }"
-                resize="none"
+              resize="none"
-                maxlength="200"
+              maxlength="200"
-                type="textarea"
+              type="textarea"
-                :readonly="!!data.isSubmit"
+              :readonly="!!data.isSubmit"
             />
             <div class="words">{{ item.content?.length || 0 }}/200</div>
           </div>
         </div>
-        <div style="display: flex; justify-content: center"
+        <div
-             v-if="data.assessmentEssayQuestionDtoList?.length || data.assessmentMultipleChoiceDtoList?.length || data.assessmentSingleChoiceDtoList?.length || data.assessmentScoringQuestionDtoList?.length">
+          style="display: flex; justify-content: center"
-          <div class="submit" @click="submit" :style="{background: data.isSubmit?'#999':'#2478ff'}">提交</div>
+          v-if="
+            data.assessmentEssayQuestionDtoList?.length ||
+            data.assessmentMultipleChoiceDtoList?.length ||
+            data.assessmentSingleChoiceDtoList?.length ||
+            data.assessmentScoringQuestionDtoList?.length
+          "
+        >
+          <div
+            class="submit"
+            @click="submit"
+            :style="{ background: data.isSubmit ? '#999' : '#2478ff' }"
+          >
+            提交
+          </div>
         </div>
       </div>
     </div>
@@ -178,28 +207,33 @@
 <script setup>
 import checkbox from "@/assets/image/checkbox.png";
 import checkbox2 from "@/assets/image/checkbox2.png";
-import {useRoute} from "vue-router/dist/vue-router";
+import { useRoute, useRouter } from "vue-router/dist/vue-router";
-import {request, usePage, useRequest} from "@/api/request";
+import { request, usePage, useRequest } from "@/api/request";
-import {
+import { ASSESSMENT_QUERY, ASSESSMENT_SUBMIT } from "@/api/api";
-  ASSESSMENT_QUERY,
+import { ElMessage } from "element-plus";
-  ASSESSMENT_SUBMIT,
-} from "@/api/api";
-import {ElMessage} from "element-plus";
 
 const {
-  query: {courseId, id: taskId, type, pName, sName},
+  query: { courseId, id: taskId, type, pName, sName },
 } = useRoute();
-
+const router = useRouter();
-const {data} = useRequest(ASSESSMENT_QUERY(courseId), {id: courseId});
+const returnclick = () => {
-
+  router.back();
+};
+const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId });
+console.log("data", data);
 function submit() {
   if (data.value.isSubmit) {
-    return
+    return;
   }
-  data.value.isSubmit = !data.value.isSubmit
+  data.value.isSubmit = !data.value.isSubmit;
-  request(ASSESSMENT_SUBMIT, {assessmentId: courseId, taskId, type, result: JSON.stringify(data.value)})
+  request(ASSESSMENT_SUBMIT, {
+    assessmentId: courseId,
+    taskId,
+    type,
+    result: JSON.stringify(data.value),
+  });
   ElMessage.info("提交成功");
-  router.back()
+  router.back();
 }
 </script>
 <style lang="scss">
@@ -210,14 +244,14 @@ function submit() {
     font-size: 14px;
     line-height: 24px;
   }
-  .return{
+  .return {
     position: absolute;
     right: 10%;
-    .text{
+    .text {
       text-align: center;
-     display: flex;
+      display: flex;
-     flex-direction: row;
+      flex-direction: row;
-     align-items: center;
+      align-items: center;
     }
   }
   .prevnext {