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

src/api/api.js

@@ -120,6 +120,9 @@ export const GetMoreComments = `/statement/getMoreComments`
 // 查询讨论下的帖子
 export const PostList = `/statement/list`
 
+// 查询单个测评的状态 
+export const QueryEvaluationTaskStatusOne = `/evaluation/queryEvaluationTaskStatusOne`
+
 
 
 

src/views/faceteach/FaceTeachNoCommon.vue

@@ -66,13 +66,13 @@
             <!-- <el-tab-pane label="课程评论" name="third" :disabed=dayjs().isBefore(dayjs(data.planDto.beginTime))>
 
             </el-tab-pane> -->
-            <el-tab-pane label="材料下载" name="third" :disabed=dayjs().isBefore(dayjs(data.planDto.beginTime))>
+            <el-tab-pane label="材料下载" name="third" >
-              <div v-if="!data.planDto?.attach"
+              <div v-if="!data.offcourseDto?.attach"
                    style="font-size: 14px;font-weight: 400; line-height: 24px; cursor: pointer;margin-left: 40px; margin-top: 20px;">
                 此课程无附件
               </div>
               <div v-else>
-                <div v-for="(el, index) in formateArr(data.planDto.attach)" :key="index" class="enclosure"
+                <div v-for="(el, index) in formateArr(data.offcourseDto.attach)" :key="index" class="enclosure"
                      :style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
                   <div class="enclosureL">
                     <FileTypeImg :v-model="el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.'))" :style="{

src/views/faceteach/FaceTeachNoCourse.vue

@@ -66,13 +66,13 @@
             <!-- <el-tab-pane label="课程评论" name="third" :disabed=dayjs().isBefore(dayjs(data.planDto.beginTime))>
 
             </el-tab-pane> -->
-            <el-tab-pane label="材料下载" name="third" :disabed=dayjs().isBefore(dayjs(data.planDto.beginTime))>
+            <el-tab-pane label="材料下载" name="third" >
-              <div v-if="!data.planDto?.attach"
+              <div v-if="!data.offcourseDto?.attach"
                    style="font-size: 14px;font-weight: 400; line-height: 24px; cursor: pointer;margin-left: 40px; margin-top: 20px;">
                 此课程无附件
               </div>
               <div v-else>
-                <div v-for="(el, index) in formateArr(data.planDto.attach)" :key="index" class="enclosure"
+                <div v-for="(el, index) in formateArr(data.offcourseDto.attach)" :key="index" class="enclosure"
                      :style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
                   <div class="enclosureL">
                     <FileTypeImg :v-model="el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.'))" :style="{

src/views/faceteach/FaceTeachSignUp.vue

@@ -66,7 +66,7 @@
             <!-- <el-tab-pane label="课程评论" name="third" :disabed=dayjs().isBefore(dayjs(data.planDto.beginTime))>
 
             </el-tab-pane> -->
-            <el-tab-pane label="材料下载" name="third" :disabed=dayjs().isBefore(dayjs(data.planDto.beginTime))>
+            <el-tab-pane label="材料下载" name="third" >
               <div v-if="data.offcourseDto?.attach == ''"
                    style="font-size: 14px;font-weight: 400; line-height: 24px; cursor: pointer;margin-left: 40px; margin-top: 20px;">
                 此课程无附件

src/views/project/ProjectDetails.vue

@@ -228,7 +228,7 @@
                       font-weight: 500;
                       color: #277aff;
                       margin-left: 10px;color:#677d86;">
-                    {{ parseInt(data.compulsoryProgress * 100) }}%
+                    {{ parseInt(data.compulsoryProgress?data.compulsoryProgress:0 * 100) }}%
                   </div>
                 </div>
               </div>
@@ -406,7 +406,7 @@
 import {computed, onMounted, ref, watch} from "vue";
 import {ElLoading, ElMessage} from 'element-plus'
 import {request} from "@/api/request";
-import {CompletionList, EvaluationToLearn, PointList, STUDY_RECORD, SubmitExternalExam} from "@/api/api";
+import {CompletionList, EvaluationToLearn, PointList, STUDY_RECORD, SubmitExternalExam, QueryEvaluationTaskStatusOne} from "@/api/api";
 import {useRoute, useRouter} from "vue-router";
 import {PROJECT, TASK_TYPES} from "@/api/CONST";
 import FileTypeImg from "@/components/FileTypeImg.vue";
@@ -681,52 +681,89 @@ async function toFinish(d, sName, chapterOrStageId) {
   }
   // 测评模块 请求接口跳转新的页面 - 新增 暂时未调试 目前无测评数据 2023-02-04
   if (d.type == 10) {
-    // 此处判断测评跳转详情界面
+    if(d.quizTaskId==null){
-    router.push({
+      // 肯定没有完成测评
-      path: '/evaluation',
+      // 调用接口 跳转页面 
-      query: {
+      console.log('我是查询测评跳转链接所传递得参数', {
-        id: d.id,
+        "businessType": "project",
-        type: PROJECT,
+        "chapterId": chapterOrStageId,
-        infoId: data.value.projectId,
+        "courseId": d.courseId,
-        courseId: d.courseId,
+        "quizKid": d.targetId,
-        pName: data.value.name,
+        "routerOrProjectId": projectId,
-        sName,
+        "studentId": userInfo.value.projectId,
-        chapterOrStageId,
+        "studentName": userInfo.value.realName
-        exname: d.name, // 测评名称
+      })
-        btype: 1 // 1项目 2 路径图
+      request(EvaluationToLearn, {
-      },
+        "businessType": "project",
-    });
+        "chapterId": chapterOrStageId,
-    return
+        "courseId": d.courseId,
-
+        "quizKid": d.targetId,
-    // 调用接口 跳转页面
+        "routerOrProjectId": projectId,
-    console.log('我是查询测评跳转链接所传递得参数', {
+        "studentId": userInfo.value.projectId,
-      "businessType": "project",
+        "studentName": userInfo.value.realName
-      "chapterId": chapterOrStageId,
+      }).then(res => {
-      "courseId": d.courseId,
+        console.log(res)
-      "quizKid": d.targetId,
+        if (res.code == 200) {
-      "routerOrProjectId": projectId,
+          let jumpUrl = res.data.quizUrl
-      "studentId": userInfo.value.projectId,
+          // 此处写跳转url
-      "studentName": userInfo.value.realName
+          window.open(jumpUrl, '_top')
-    })
+        }
-    request(EvaluationToLearn, {
+      }).catch(err => {
-      "businessType": "project",
+        console.log(err)
-      "chapterId": chapterOrStageId,
+      })
-      "courseId": d.courseId,
+      return
-      "quizKid": d.targetId,
+    }else{
-      "routerOrProjectId": projectId,
+      // 进行中 或者 已完成 
-      "studentId": userInfo.value.projectId,
+      // 调用接口 判断当前测评状态 跳转页面 
-      "studentName": userInfo.value.realName
+      console.log('我是查询测评跳转链接所传递得参数', {
-    }).then(res => {
+        "quizTaskId": d.quizTaskId
-      console.log(res)
+      })
-      if (res.code == 200) {
+      request(QueryEvaluationTaskStatusOne, {
-        let jumpUrl = res.data.quizUrl
+        "quizTaskId": d.quizTaskId
-        // 此处写跳转url
+      }).then(res => {
-        window.open(jumpUrl, '_top')
+        console.log(res)
-      }
+        if (res.code == 200) {
-    }).catch(err => {
+          if(res.data.complete_status==2){
-      console.log(err)
+            ElMessage.error("您已完成测评")
-    })
+            return
-    return
+          }else{  
+            // 重新查询跳转
+            // 调用接口 跳转页面 
+            console.log('我是查询测评跳转链接所传递得参数', {
+              "businessType": "project",
+              "chapterId": chapterOrStageId,
+              "courseId": d.courseId,
+              "quizKid": d.targetId,
+              "routerOrProjectId": projectId,
+              "studentId": userInfo.value.projectId,
+              "studentName": userInfo.value.realName
+            })
+            request(EvaluationToLearn, {
+              "businessType": "project",
+              "chapterId": chapterOrStageId,
+              "courseId": d.courseId,
+              "quizKid": d.targetId,
+              "routerOrProjectId": projectId,
+              "studentId": userInfo.value.projectId,
+              "studentName": userInfo.value.realName
+            }).then(res => {
+              console.log(res)
+              if (res.code == 200) {
+                let jumpUrl = res.data.quizUrl
+                // 此处写跳转url
+                window.open(jumpUrl, '_top')
+              }
+            }).catch(err => {
+              console.log(err)
+            })
+            return
+          }
+        }
+      }).catch(err => {
+        console.log(err)
+      })
+      return
+    }
   }
 
   if (!TASK_TYPES.path[d.type]) {

src/views/roadmap/PathDetails.vue

@@ -251,7 +251,7 @@
 		5: 'rgba(57, 219, 183, 1)',
 	}[parseInt((data.currentReqCnt / data.totalReqCnt * 100) / 20)],
 }">
-                    {{ parseInt(data.currentReqCnt / data.totalReqCnt * 100) }}%
+                    {{ parseInt(data.currentReqCnt?data.currentReqCnt:0 / data.totalReqCnt?data.totalReqCnt:0 * 100) }}%
                   </div>
                 </div>
               </div>
@@ -280,7 +280,7 @@ import {computed, onMounted, ref} from "vue";
 import circle from '@/assets/image/pathdetails/circle.png';
 import circle2 from '@/assets/image/pathdetails/circle2.png';
 import {request} from "@/api/request";
-import {STUDY_RECORD, UPDATE_CURRENT_TASK} from "@/api/api";
+import {STUDY_RECORD, UPDATE_CURRENT_TASK, QueryEvaluationTaskStatusOne, EvaluationToLearn} from "@/api/api";
 import {useRoute, useRouter} from "vue-router";
 import {ElMessage} from "element-plus";
 import {ROUTER, TASK_TYPES} from "@/api/CONST";
@@ -445,22 +445,89 @@ async function toFinish(d) {
 
   // 测评模块 请求接口跳转新的页面 - 新增 暂时未调试 目前无测评数据 2023-02-04
   if (d.type == 10) {
-    // 此处判断测评跳转详情界面
+    if(d.quizTaskId==null){
-    router.push({
+      // 肯定没有完成测评
-      path: '/evaluation',
+      // 调用接口 跳转页面 
-      query: {
+      console.log('我是查询测评跳转链接所传递得参数', {
-        id: d.id,
+        "businessType": "learningpath",
-        type: ROUTER,
+        "chapterId": data.value.currentStageId,
-        infoId: routerId,
+        "courseId": d.courseId,
-        courseId: d.courseId,
+        "quizKid": d.targetId,
-        pName: data.value.name,
+        "routerOrProjectId": routerId,
-        sName: data.value.currentStageName,
+        "studentId": userInfo.value.id,
-        chapterOrStageId: data.value.currentStageId,
+        "studentName": userInfo.value.realName
-        exname: d.name, // 测评名称
+      })
-        btype: 2 // 1项目 2 路径图
+      request(EvaluationToLearn, {
-      },
+        "businessType": "learningpath",
-    });
+        "chapterId": data.value.currentStageId,
-    return
+        "courseId": d.courseId,
+        "quizKid": d.targetId,
+        "routerOrProjectId": routerId,
+        "studentId": userInfo.value.id,
+        "studentName": userInfo.value.realName
+      }).then(res => {
+        console.log(res)
+        if (res.code == 200) {
+          let jumpUrl = res.data.quizUrl
+          // 此处写跳转url
+          window.open(jumpUrl, '_top')
+        }
+      }).catch(err => {
+        console.log(err)
+      })
+      return
+    }else{
+      // 进行中 或者 已完成 
+      // 调用接口 判断当前测评状态 跳转页面 
+      console.log('我是查询测评跳转链接所传递得参数', {
+        "quizTaskId": d.quizTaskId
+      })
+      request(QueryEvaluationTaskStatusOne, {
+        "quizTaskId": d.quizTaskId
+      }).then(res => {
+        console.log(res)
+        if (res.code == 200) {
+          if(res.data.complete_status==2){
+            ElMessage.error("您已完成测评")
+            return
+          }else{  
+            // 重新查询跳转
+            // 调用接口 跳转页面 
+            console.log('我是查询测评跳转链接所传递得参数', {
+              "businessType": "learningpath",
+              "chapterId": data.value.currentStageId,
+              "courseId": d.courseId,
+              "quizKid": d.targetId,
+              "routerOrProjectId": routerId,
+              "studentId": userInfo.value.id,
+              "studentName": userInfo.value.realName
+            })
+            request(EvaluationToLearn, {
+              "businessType": "learningpath",
+              "chapterId": data.value.currentStageId,
+              "courseId": d.courseId,
+              "quizKid": d.targetId,
+              "routerOrProjectId": routerId,
+              "studentId": userInfo.value.id,
+              "studentName": userInfo.value.realName
+            }).then(res => {
+              console.log(res)
+              if (res.code == 200) {
+                let jumpUrl = res.data.quizUrl
+                // 此处写跳转url
+                window.open(jumpUrl, '_top')
+              }
+            }).catch(err => {
+              console.log(err)
+            })
+            return
+          }
+        }
+      }).catch(err => {
+        console.log(err)
+      })
+      return
+    }
   }
 
   // 项目任务 直接跳转项目详情

vite.config.js

@@ -161,6 +161,9 @@ export default defineConfig(({ command, mode }) =>
 			},'/vote/queryVoteById': {
 				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
 				changeOrigin: true,
+			},'/evaluation/queryEvaluationTaskStatusOne': {
+				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
+				changeOrigin: true,
 			}
 		}
 	}