feat:增加项目/路径图-外部考试列表详情及导出数据接口接入

src/api/indexTaskManage.js

@@ -46,3 +46,6 @@ export const AttendanceSign = (obj) => http.post('/stu/task/attendance/sign', ob
 
 // 查询项目管理的信息
 export const QueryProjectManageDetail = (obj) => http.post('/project/management/queryProjectManageDetail', obj)
+
+// 获取外部考试信息的接口
+export const QueryExternalExamManageDetail = (obj) => http.post('/admin/external/exam/manage/queryExternalExamManageDetail', obj)

src/components/drawers/project/ProjectExternalExamManage.vue

@@ -125,7 +125,6 @@
   import ExportAchievement from "../ExportAchievement.vue";
   import * as api from '../../../api/indexTaskManage';
   
-  // import * as api from "../../../api/index";
   export default {
     name: "ProjectExternalExamManage",
     components: {
@@ -165,13 +164,13 @@
           },
           {
             id: 2,
-            value: "10",
+            value: "1",
-            label: "未通过",
+            label: "进行中",
           },
           {
             id: 3,
-            value: "1",
+            value: "9",
-            label: "已通过",
+            label: "已完成",
           },
         ],
         selectedRowKeys: [],
@@ -184,15 +183,15 @@
         tablecolumns: [
           {
             title: "工号",
-            dataIndex: "studentUserNo",
+            dataIndex: "studentCode",
-            key: "studentUserNo",
+            key: "studentCode",
-            width: 60,
+            width: 120,
             align: "center",
             className: "h head",
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
+                  <span> {text.record.studentCode?text.record.studentCode:"-"}</span>
                 </div>
               );
             },
@@ -202,8 +201,8 @@
             dataIndex: "studentName",
             key: "studentName",
             width: 50,
-            align: "left",
+            align: "center",
-            className: "h head",
+            className: "h",
             customRender: (text) => {
               return (
                 <div class="racona">
@@ -219,7 +218,6 @@
             width: 60,
             align: "center",
             ellipsis: true,
-            className: "h",
             customRender: (text) => {
               return (
                 <div class="racona">
@@ -244,10 +242,26 @@
               );
             },
           },
+          {
+            title: "学员关卡",
+            dataIndex: "currentStageId",
+            key: "currentStageId",
+            width: 60,
+            align: "center",
+            ellipsis: true,
+            className: "h",
+            customRender: () => {
+            return (
+                <div class="racona">
+                  <span> {props.levelName}</span>
+                </div>
+              );
+            },
+          },
           {
             title: "考试次数",
-            dataIndex: "num",
+            dataIndex: "testNumber",
-            key: "num",
+            key: "testNumber",
             width: 60,
             align: "center",
             ellipsis: true,
@@ -255,15 +269,15 @@
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.num?text.record.num:"-"}</span>
+                  <span> {text.record.testNumber?text.record.testNumber:"-"}</span>
                 </div>
               );
             },
           },
           {
             title: "成绩",
-            dataIndex: "examinationScore",
+            dataIndex: "score",
-            key: "examinationScore",
+            key: "score",
             width: 60,
             align: "center",
             ellipsis: true,
@@ -271,7 +285,7 @@
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.examinationScore?text.record.examinationScore:"-"}</span>
+                  <span> {text.record.score?text.record.score:"-"}</span>
                 </div>
               );
             },
@@ -279,8 +293,8 @@
   
           {
             title: "完成时间",
-            dataIndex: "examinationSubmitTime",
+            dataIndex: "finishedTime",
-            key: "examinationSubmitTime",
+            key: "finishedTime",
             width: 60,
             align: "center",
             ellipsis: true,
@@ -288,20 +302,20 @@
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.examinationSubmitTime?text.record.examinationSubmitTime:"-"}</span>
+                  <span> {text.record.finishedTime?text.record.finishedTime:"-"}</span>
                 </div>
               );
             },
           },
           {
             title: "任务状态",
-            dataIndex: "finishStatus",
+            dataIndex: "status",
-            key: "finishStatus",
+            key: "status",
             width: 60,
             align: "center",
             ellipsis: true,
             className: "h",
-            customRender: ({record:{finishStatus}}) => ({1:'通过',2:'未通过'}[finishStatus] || '未开始'),
+            customRender: ({record:{status}}) => ({0:'未开始',1:'进行中',9:'已完成'}[status] || '未开始'),
           },
         ],
         loadingData: true
@@ -318,6 +332,7 @@
       const afterVisibleChange = (bol) => {
         if (bol == true) {
           state.loadingData = true;
+          console.log(props.datasource)
           getData();
         }
       };
@@ -348,17 +363,17 @@
   
       // 获取数据
       function getData() {
-        api.AssessmentManagementMessage({
+        api.QueryExternalExamManageDetail({
+          chapterId: props.datasource.stageId,
           pageNo: state.currentPage,
           pageSize: state.pageSize,
-          currentStageId: props.datasource.stageId,
-          type: 1,
-          pid: props.datasource.projectId,
-          taskId: props.datasource.projectTaskId,
-          taskType: props.datasource.type,
           status: state.projectName,
           studentName: state.name,
+          targetId: props.datasource.projectId,
+          taskId: props.datasource.projectTaskId,
+          type: 2,
         }).then(res=>{
+          console.log(res)
           state.tabledata = res.data.data.records;
           state.tableDataTotal = res.data.data.total;
           state.loadingData = false;
@@ -387,7 +402,7 @@
   
       {/* 导出数据 */}
       function  exportData() {
-        window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}`)
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/external/exam/manage/exportExternalExam?chapterId=${props.datasource.stageId}&type=${2}&targetId=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}`)
       }
   
       return {

src/components/drawers/router/RouterExaminationExternalManage.vue

@@ -168,13 +168,13 @@
           },
           {
             id: 2,
-            value: "10",
+            value: "1",
-            label: "未通过",
+            label: "进行中",
           },
           {
             id: 3,
-            value: "1",
+            value: "9",
-            label: "已通过",
+            label: "已完成",
           },
         ],
         selectedRowKeys: [],
@@ -187,15 +187,15 @@
         tablecolumns: [
           {
             title: "工号",
-            dataIndex: "studentUserNo",
+            dataIndex: "studentCode",
-            key: "studentUserNo",
+            key: "studentCode",
             width: 120,
             align: "center",
             className: "h head",
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
+                  <span> {text.record.studentCode?text.record.studentCode:"-"}</span>
                 </div>
               );
             },
@@ -264,8 +264,8 @@
           },
           {
             title: "考试次数",
-            dataIndex: "num",
+            dataIndex: "testNumber",
-            key: "num",
+            key: "testNumber",
             width: 60,
             align: "center",
             ellipsis: true,
@@ -273,7 +273,7 @@
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.num?text.record.num:"-"}</span>
+                  <span> {text.record.testNumber?text.record.testNumber:"-"}</span>
                 </div>
               );
             },
@@ -289,7 +289,7 @@
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.examinationScore?text.record.examinationScore:"-"}</span>
+                  <span> {text.record.score?text.record.score:"-"}</span>
                 </div>
               );
             },
@@ -297,8 +297,8 @@
   
           {
             title: "完成时间",
-            dataIndex: "examinationSubmitTime",
+            dataIndex: "finishedTime",
-            key: "examinationSubmitTime",
+            key: "finishedTime",
             width: 60,
             align: "center",
             ellipsis: true,
@@ -306,20 +306,20 @@
             customRender: (text) => {
               return (
                 <div class="racona">
-                  <span> {text.record.examinationSubmitTime?text.record.examinationSubmitTime:"-"}</span>
+                  <span> {text.record.finishedTime?text.record.finishedTime:"-"}</span>
                 </div>
               );
             },
           },
           {
             title: "任务状态",
-            dataIndex: "finishStatus",
+            dataIndex: "status",
-            key: "finishStatus",
+            key: "status",
             width: 60,
             align: "center",
             ellipsis: true,
             className: "h",
-            customRender: ({record:{finishStatus}}) => ({1:'通过',2:'未通过'}[finishStatus] || '未开始'),
+            customRender: ({record:{status}}) => ({0:'未开始',1:'进行中',9:'已完成'}[status] || '未开始'),
           },
         ],
         loadingData: true
@@ -366,17 +366,17 @@
   
       // 获取数据
       function getData() {
-        api.AssessmentManagementMessage({
+        api.QueryExternalExamManageDetail({
+          chapterId: props.datasource.chapterId,
           pageNo: state.currentPage,
           pageSize: state.pageSize,
-          currentStageId: props.datasource.chapterId,
-          type: 2,
-          pid: props.datasource.routerId,
-          taskId: props.datasource.routerTaskId,
-          taskType: props.datasource.type,
           status: state.projectName,
           studentName: state.name,
+          targetId: props.datasource.routerId,
+          taskId: props.datasource.routerTaskId,
+          type: 1,
         }).then(res=>{
+          console.log(res)
           state.tabledata = res.data.data.records;
           state.tableDataTotal = res.data.data.total;
           state.loadingData = false;
@@ -406,19 +406,7 @@
   
       {/* 导出数据 */}
       function  exportData() {
-        // window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`)
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/external/exam/manage/exportExternalExam?chapterId=${props.datasource.chapterId}&type=${1}&targetId=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}`)
-        window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}`)
-  
-        {/* api.ExportExam({
-          "chapterId": props.datasource.chapterId,
-          "targetId": props.datasource.routerId,
-          "taskId": props.datasource.courseId,
-          "type": 1
-        }).then(res=>{
-          console.log(res)
-        }).catch(err=>{
-          console.log(err)
-        }) */}
       }
       return {
         ...toRefs(state),