员工学习数据

src/api/indexOvervoew.js

@@ -21,6 +21,8 @@ export const boeuRoterPageList = (obj) => http.post('/boeu/router/pageList', obj
 export const boeuProjectPageList = (obj) => http.post('/boeu/project/pageList', obj)
 // 学习数据列表
 export const boeuStudyDataPageList = (obj) => http.post('/boeu/studyData/pageList', obj)
+// 考试列表分页
+export const boeuExamPageListV2 = (obj) => http.post('/boeu/exam/pageList/v2', obj )
 // 概览页面 tab头数据
 export const boeuAllTotal = (obj) => http.get('/boeu/all/total', obj)
 // 路径图列表

src/views/report/Employeelearning.vue

@@ -12,15 +12,16 @@
           allowClear
         ></a-select> -->
         <a-cascader
+          change-on-select
           :options="option"
-          placeholder="请选择组织"
           v-model:value="orgId"
-          :allowClear="allowClear"
           style="width: 100%"
+          placeholder="请选择归属组织"
+          :allowClear="allowClear"
           :fieldNames="{
-            label: 'name',
+            label: 'orgName',
-            value: 'id',
+            value: 'organizationId',
-            children: 'treeChildList',
+            children: 'childList',
           }"
         >
         </a-cascader>
@@ -149,9 +150,9 @@ export default {
     const getOrgList = async () => {
       const res = await api.userGetUserOrg({});
       if (res) {
-        state.option = res.data?.result?.list;
+        state.option = res.data?.result;
-        state.orgId = res.data?.result?.treeNodeList;
+        state.orgId = [state.option[0]?.organizationId];
-        state.resetOrgId = res.data?.result?.treeNodeList;
+        state.resetOrgId = [state.option[0]?.organizationId];
         res.data?.result?.userType === 1
           ? (state.allowClear = true)
           : (state.allowClear = false);
@@ -190,25 +191,25 @@ export default {
       },
       {
         title: "姓名",
-        dataIndex: "name",
+        dataIndex: "userName",
         ellipsis: true,
-        key: "name",
+        key: "userName",
         width: 120,
         align: "center",
       },
       {
-        title: "组织信息",
+        title: "所属组织",
-        dataIndex: "departmentName",
+        dataIndex: "orgName",
         ellipsis: true,
-        key: "departmentName",
+        key: "orgName",
         width: 120,
         align: "center",
       },
       {
         title: "岗位",
-        dataIndex: "jobName",
+        dataIndex: "positionName",
         ellipsis: true,
-        key: "jobName",
+        key: "positionName",
         width: 120,
         align: "center",
       },
@@ -222,57 +223,57 @@ export default {
       },
       {
         title: "授课次数",
-        dataIndex: "teachingTotal",
+        dataIndex: "teachingTimes",
         ellipsis: true,
         key: "teachingTotal",
         width: 120,
         align: "center",
       },
       {
-        title: "授课时长(分钟)",
+        title: "授课时长",
-        dataIndex: "teachingTime",
+        dataIndex: "teachingDuration",
         ellipsis: true,
-        key: "teachingTime",
+        key: "teachingDuration",
         width: 120,
         align: "center",
       },
       {
-        title: "案例数",
+        title: "案例创建",
-        dataIndex: "caseTotal",
+        dataIndex: "cases",
         ellipsis: true,
-        key: "caseTotal",
+        key: "cases",
         width: 120,
         align: "center",
       },
       {
-        title: "学习项目",
+        title: "课程学习",
-        dataIndex: "studyProject",
+        dataIndex: "courseStudy",
         ellipsis: true,
-        key: "studyProject",
+        key: "courseStudy",
         width: 120,
         align: "center",
       },
       {
-        title: "学习路径",
+        title: "项目学习",
-        dataIndex: "studyRouter",
+        dataIndex: "projectStudy",
         ellipsis: true,
-        key: "studyRouter",
+        key: "projectStudy",
         width: 120,
         align: "center",
       },
       {
-        title: "学习课程",
+        title: "路径图学习",
-        dataIndex: "studyClass",
+        dataIndex: "routerStudy",
         ellipsis: true,
-        key: "studyClass",
+        key: "routerStudy",
         width: 120,
         align: "center",
       },
       {
-        title: "累计学习时长(分钟)",
+        title: "学习时长",
-        dataIndex: "studyTimeSum",
+        dataIndex: "learningDuration",
         ellipsis: true,
-        key: "studyTimeSum",
+        key: "learningDuration",
         width: 120,
         align: "center",
       },
@@ -328,8 +329,8 @@ export default {
         bandCode: state.band,
       });
       if (res) {
-        state.tableDataTotal = res.data.total;
+        state.tableDataTotal = res.data.result.total;
-        const list = res.data.rows?.map((item) => {
+        const list = res.data.result.rows?.map((item) => {
           return {
             key: item.id,
             ...item,