From e18c3801d46ea99e7a5ec9f7a6a5498b13232dfd Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Tue, 22 Aug 2023 19:04:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=AD=A6=E4=B9=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=A6=82=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Overvoew.vue | 226 +++++++++++++++++++++++----------- 1 file changed, 151 insertions(+), 75 deletions(-) diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index 0e0cde69..7c4b2792 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -12,17 +12,19 @@ allowClear > --> + > +
{ - console.log(state.type); + console.log("getTabData 111111:",state.type); + console.log("getTabData 222222:",store.state.userInfo.roleList); axios({ - method: "get", + method: "post", url: "/report/boeu/all/total", - params: { type: state.type }, + // params: { manager: true }, + data: { manager: true }, headers: { token: Cookies.get("token"), }, }).then((res) => { const list = [ - { text: "项目", num: res.data.data?.projectTotal }, - { text: "学习路径图", num: res.data.data?.routerTotal }, - { text: "授课", num: res.data.data?.teachingTotal }, - { text: "课程", num: res.data.data?.courseTotal }, - { text: "考试", num: res.data.data?.examTotal }, - { text: "案例", num: res.data.data?.caseTotal }, + { text: "项目", num: res.data.result?.projectTotal }, + { text: "学习路径图", num: res.data.result?.routerTotal }, + { text: "授课", num: res.data.result?.teachingTotal }, + { text: "课程", num: res.data.result?.courseTotal }, + { text: "考试", num: res.data.result?.examTotal }, + { text: "案例", num: res.data.result?.caseTotal }, ]; tabData.value = list; }); @@ -341,7 +347,7 @@ export default { const getOrgList = async () => { const res = await api.userGetUserOrg({}); if (res) { - state.option = res.data?.result?.list; + state.option = res.data?.result?.orgTreeList; state.orgId = res.data?.result?.treeNodeList; state.resetOrgId = res.data?.result?.treeNodeList; state.type = res.data?.result?.userType; @@ -560,8 +566,8 @@ export default { size: state.pageSize, }); if (res) { - state.tableDataTotal = res.data.total; - const list = res.data.rows?.map((item) => { + state.tableDataTotal = res.data.result.total; + const list = res.data.result.rows?.map((item) => { return { key: item.id, ...item, @@ -580,8 +586,8 @@ export default { size: state.pageSize, }); if (res) { - state.tableDataTotal = res.data.total; - const list = res.data.rows?.map((item) => { + state.tableDataTotal = res.data.result.total; + const list = res.data.result.rows?.map((item) => { return { key: item.id, ...item, @@ -600,14 +606,14 @@ export default { : null, createName: state.creator, }); - const list = res.data.rows.map((item) => { + const list = res.data.result.rows.map((item) => { return { key: item.boeCourseId, ...item, }; }); tableData.value = list; - state.tableDataTotal = res.data.total; + state.tableDataTotal = res.data.result.total; state.tableLoading = false; } else if (state.currentTab === 2) { const res = await api.boeuTeachingPageList({ @@ -617,14 +623,14 @@ export default { orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, }); - const list = res.data.rows?.map((item) => { + const list = res.data.result.rows?.map((item) => { return { key: item.boeOffcoursePlanId, ...item, }; }); tableData.value = list; - state.tableDataTotal = res.data.total; + state.tableDataTotal = res.data.result.total; state.tableLoading = false; } else if (state.currentTab === 1) { const res = await api.boeuRoterPageList({ @@ -634,7 +640,7 @@ export default { orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, }); - const list = res.data.rows?.map((item) => { + const list = res.data.result.rows?.map((item) => { return { key: item.boeRouterInfoId, ...item, @@ -642,7 +648,7 @@ export default { }); tableData.value = list; state.tableLoading = false; - state.tableDataTotal = res.data.total; + state.tableDataTotal = res.data.result.total; } else if (state.currentTab === 0) { const res = await api.boeuProjectPageList({ page: state.pageNo, @@ -666,8 +672,8 @@ export default { }); return list; }; - tableData.value = fun(res.data.rows); - state.tableDataTotal = res.data.total; + tableData.value = fun(res.data.result.rows); + state.tableDataTotal = res.data.result.total; state.tableLoading = false; } } @@ -798,7 +804,7 @@ export default { if (index === 0) { columns.value = [ { - title: "名称", + title: "项目名称", dataIndex: "projectName", key: "projectName", width: 120, @@ -816,7 +822,7 @@ export default { fixed: "left", }, { - title: "分类", + title: "项目分类", dataIndex: "trainingType", ellipsis: true, key: "trainingType", @@ -840,6 +846,14 @@ export default { width: 120, align: "center", }, + { + title: "学习人数", + dataIndex: "startLearnerTotal", + ellipsis: true, + key: "startLearnerTotal", + width: 120, + align: "center", + }, { title: "参与人数", dataIndex: "participantsTotal", @@ -849,10 +863,10 @@ export default { align: "center", }, { - title: "学习人数", - dataIndex: "startLearnerTotal", + title: "参与率", + dataIndex: "participantsRate", ellipsis: true, - key: "startLearnerTotal", + key: "participantsRate", width: 120, align: "center", }, @@ -864,6 +878,14 @@ export default { width: 120, align: "center", }, + { + title: "完成率", + dataIndex: "completedRate", + ellipsis: true, + key: "completedRate", + width: 120, + align: "center", + }, { title: "项目时间", dataIndex: "proTime", @@ -872,6 +894,14 @@ export default { width: 120, align: "center", }, + { + title: "创建时间", + dataIndex: "createTime", + ellipsis: true, + key: "createTime", + width: 120, + align: "center", + }, { title: "发布时间", dataIndex: "publishTime", @@ -985,7 +1015,7 @@ export default { } else if (index === 5) { columns.value = [ { - title: "名称", + title: "案例名称", dataIndex: "title", ellipsis: true, }, @@ -995,6 +1025,12 @@ export default { ellipsis: true, align: "center", }, + // { + // title: "案例分类", + // dataIndex: "majorType", + // ellipsis: true, + // align: "center", + // }, { title: "专业分类", dataIndex: "majorType", @@ -1002,47 +1038,47 @@ export default { align: "center", }, { - title: "浏览量", + title: "浏览数", dataIndex: "views", ellipsis: true, align: "center", }, { - title: "点赞量", + title: "点赞数", dataIndex: "praises", ellipsis: true, align: "center", }, { - title: "收藏量", - dataIndex: "favorites", - ellipsis: true, - align: "center", - }, - { - title: "评论量", + title: "评论数", dataIndex: "comments", ellipsis: true, align: "center", }, { - title: "发布时间", + title: "收藏数", + dataIndex: "favorites", + ellipsis: true, + align: "center", + }, + { + title: "创建时间", dataIndex: "sysCreateTime", key: "sysCreateTime", ellipsis: true, align: "center", }, - { - title: "创建人/作者", - dataIndex: "authorName", - ellipsis: true, - align: "center", - }, + // { + // title: "创建人/作者", + // dataIndex: "authorName", + // ellipsis: true, + // align: "center", + // }, ]; } else if (index === 3) { columns.value = [ { - title: "名称", + title: "课程名称", dataIndex: "name", key: "name", width: 120, @@ -1060,19 +1096,19 @@ export default { fixed: "left", }, { - title: "类型", - dataIndex: "courseType", + title: "课程分类", + dataIndex: "type", ellipsis: true, - key: "courseType", + key: "type", width: 120, align: "center", fixed: "left", }, { - title: "分类", - dataIndex: "type", + title: "类型", + dataIndex: "courseType", ellipsis: true, - key: "type", + key: "courseType", width: 120, align: "center", fixed: "left", @@ -1095,22 +1131,6 @@ export default { align: "center", fixed: "left", }, - { - title: "评论数", - dataIndex: "commentTotal", - ellipsis: true, - key: "commentTotal", - width: 120, - align: "center", - }, - { - title: "浏览量", - dataIndex: "viewTotal", - ellipsis: true, - key: "viewTotal", - width: 120, - align: "center", - }, { title: "开课次数", dataIndex: "classTotal", @@ -1119,6 +1139,14 @@ export default { width: 120, align: "center", }, + { + title: "浏览次数", + dataIndex: "viewTotal", + ellipsis: true, + key: "viewTotal", + width: 120, + align: "center", + }, { title: "学习人数", dataIndex: "learnerNumber", @@ -1143,6 +1171,30 @@ export default { width: 120, align: "center", }, + { + title: "完成率", + dataIndex: "completedRate", + ellipsis: true, + key: "completedRate", + width: 120, + align: "center", + }, + { + title: "评论数", + dataIndex: "commentTotal", + ellipsis: true, + key: "commentTotal", + width: 120, + align: "center", + }, + { + title: "创建时间", + dataIndex: "createTime", + ellipsis: true, + key: "createTime", + width: 120, + align: "center", + }, { title: "发布时间", dataIndex: "publishTime", @@ -1265,7 +1317,7 @@ export default { } else if (index === 1) { columns.value = [ { - title: "名称", + title: "路径图名称", dataIndex: "boeRouterInfoName", key: "boeRouterInfoName", width: 120, @@ -1317,6 +1369,14 @@ export default { width: 120, align: "center", }, + { + title: "参与率", + dataIndex: "participantsTotal", + ellipsis: true, + key: "participantsTotal", + width: 120, + align: "center", + }, { title: "完成人数", dataIndex: "completionNumber", @@ -1326,13 +1386,29 @@ export default { align: "center", }, { - title: "发布时间", + title: "完成率", + dataIndex: "completedRate", + ellipsis: true, + key: "completedRate", + width: 120, + align: "center", + }, + { + title: "创建时间", dataIndex: "createTime", ellipsis: true, key: "createTime", width: 120, align: "center", }, + { + title: "发布时间", + dataIndex: "publishTime", + ellipsis: true, + key: "publishTime", + width: 120, + align: "center", + }, { title: "状态", dataIndex: "status",