From f902de804426e203bb6ee20045fad07063adc13b Mon Sep 17 00:00:00 2001 From: "BOE\\10867418" Date: Fri, 18 Aug 2023 17:49:38 +0800 Subject: [PATCH 01/56] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexOvervoew.js | 2 +- src/api/indexProject.js | 2 +- src/views/report/Curriculum.vue | 31 +++++++++++++++------------- src/views/report/Learningpathmap.vue | 15 +++++++------- src/views/report/ReportProject.vue | 29 +++++++++++++++----------- 5 files changed, 43 insertions(+), 36 deletions(-) diff --git a/src/api/indexOvervoew.js b/src/api/indexOvervoew.js index 1d4353c8..933110f7 100644 --- a/src/api/indexOvervoew.js +++ b/src/api/indexOvervoew.js @@ -8,7 +8,7 @@ export const boeuExamPageList = (obj) => http.post('/boeu/exam/pageList', obj) //概览页面案例列表请求接口 export const boeuCasePageList = (obj) => http.post('/boeu/case/pageList', obj) // 请求组织接口 -export const userGetUserOrg = (obj) => http.post('/org/getUserOrg', obj) +export const userGetUserOrg = (obj) => https.get(`/organization/all/tree`,obj) // 请求所属组织接口 export const userInfo = (obj) => https.post('/user/info', obj) // 课程列表接口 diff --git a/src/api/indexProject.js b/src/api/indexProject.js index e3aafe5f..1b465964 100644 --- a/src/api/indexProject.js +++ b/src/api/indexProject.js @@ -1,7 +1,7 @@ import http from "./configz"; import https from './confign' // 请求组织接口 -export const userGetUserOrg = (obj) => https.post('/user/getUserOrg', obj) +export const userGetUserOrg = (obj) => http.post('/org/getUserOrg', obj) // 请求所属组织接口 export const userInfo = (obj) => https.post('/user/info', obj) // 项目列表 diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index f12da051..e22895d8 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -21,9 +21,9 @@ :allowClear="allowClear" style="width: 100%" :fieldNames="{ - label: 'name', - value: 'id', - children: 'treeChildList', + label: 'orgName', + value: 'organizationId', + children: 'childList', }" > @@ -141,9 +141,11 @@ import axios from "axios"; import Cookies from "vue-cookies"; import downLoad from "../../utils/downLoad"; import { message } from "ant-design-vue"; +import {useStore} from 'vuex' export default { name: "CurriculuM", setup() { + const store = useStore(); const state = reactive({ tableLoading: false, // table加载图标 tableDataTotal: 0, // 数据总条数 @@ -168,15 +170,16 @@ export default { const getOption = async () => {}; //请求组织接口 const getOrgList = async () => { - const result = await api.userGetUserOrg({}); - - if (result) { - state.option = result.data?.result?.list; - state.orgId = result.data?.result?.treeNodeList; - state.resetOrgId = result.data?.result?.treeNodeList; - result.data?.result?.userType === 1 - ? (state.allowClear = true) - : (state.allowClear = false); + let params = { + roleList: store.state.userInfo.roleList, + userId: store.state.userInfo.userId + } + const res = await api.userGetUserOrg(params); + if (res) { + state.option = res.data?.result; + state.orgId = [state.option[0]?.organizationId]; + state.resetOrgId = [state.option[0]?.organizationId]; + state.allowClear = true getTableData(); } }; @@ -194,8 +197,8 @@ export default { }; const res = await api.boeuCourseListPageV2(params); if (res) { - tableData.value = res.data.rows; - state.tableDataTotal = res.data.total; + tableData.value = res.data.result.rows; + state.tableDataTotal = res.data.result.total; state.tableLoading = false; } }; diff --git a/src/views/report/Learningpathmap.vue b/src/views/report/Learningpathmap.vue index 6f040d21..9cd646bb 100644 --- a/src/views/report/Learningpathmap.vue +++ b/src/views/report/Learningpathmap.vue @@ -5,6 +5,7 @@
{ - let params = { - roleList: store.state.userInfo.roleList, - userId: store.state.userInfo.userId - } - const res = await api.userGetUserOrg(params); + //todo 获取用户角色列表，判断里面是否有system-admin + // let roleList = store.state.userInfo.roleList; + const res = await api.userGetUserOrg(); if (res) { state.option = res.data?.result; - state.orgId = state.option[0]?.organizationId; - state.resetOrgId = state.option[0]?.organizationId; - state.allowClear = false + state.orgId = [state.option[0]?.organizationId]; + state.resetOrgId = [state.option[0]?.organizationId]; + state.allowClear = true; getTableData(); } }; diff --git a/src/views/report/ReportProject.vue b/src/views/report/ReportProject.vue index e426a46f..18b28a37 100644 --- a/src/views/report/ReportProject.vue +++ b/src/views/report/ReportProject.vue @@ -21,9 +21,9 @@ :allowClear="allowClear" style="width: 100%" :fieldNames="{ - label: 'name', - value: 'id', - children: 'treeChildList', + label: 'orgName', + value: 'organizationId', + children: 'childList', }" > @@ -169,9 +169,11 @@ import axios from "axios"; import Cookies from "vue-cookies"; import downLoad from "../../utils/downLoad"; import { message } from "ant-design-vue"; +import { useStore } from "vuex"; export default { name: "reportProject", setup() { + const store = useStore(); const state = reactive({ tableLoading: false, // table加载图标 tableDataTotal: 0, // 数据总条数 @@ -290,14 +292,16 @@ export default { }; //请求组织接口 const getOrgList = async () => { - const res = await api.userGetUserOrg({}); + let params = { + roleList: store.state.userInfo.roleList, + userId: store.state.userInfo.userId + } + const res = await api.userGetUserOrg(params); if (res) { - state.option = res.data?.result?.list; - state.orgId = res.data?.result?.treeNodeList; - state.resetOrgId = res.data?.result?.treeNodeList; - res.data?.result?.userType === 1 - ? (state.allowClear = true) - : (state.allowClear = false); + state.option = res.data?.result; + state.orgId = [state.option[0]?.organizationId]; + state.resetOrgId = [state.option[0]?.organizationId]; + state.allowClear = true getTableData(); } }; @@ -343,8 +347,9 @@ 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; + console.log("safgaga"+res.data.result.total) state.tableLoading = false; } }; From 55ca2e42731901221d544419fe25e74bffe940ea Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Fri, 18 Aug 2023 18:43:44 +0800 Subject: [PATCH 02/56] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexProject.js | 2 +- src/views/report/ReportProject.vue | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/api/indexProject.js b/src/api/indexProject.js index 1b465964..7807ef11 100644 --- a/src/api/indexProject.js +++ b/src/api/indexProject.js @@ -1,7 +1,7 @@ import http from "./configz"; import https from './confign' // 请求组织接口 -export const userGetUserOrg = (obj) => http.post('/org/getUserOrg', obj) +export const userGetUserOrg = (obj) => https.get('/organization/all/tree', obj) // 请求所属组织接口 export const userInfo = (obj) => https.post('/user/info', obj) // 项目列表 diff --git a/src/views/report/ReportProject.vue b/src/views/report/ReportProject.vue index 18b28a37..1c1e93a6 100644 --- a/src/views/report/ReportProject.vue +++ b/src/views/report/ReportProject.vue @@ -15,11 +15,12 @@
Date: Mon, 21 Aug 2023 17:14:59 +0800 Subject: [PATCH 03/56] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Learningpathmap.vue | 84 +++++++++++++++++++++------- 1 file changed, 63 insertions(+), 21 deletions(-) diff --git a/src/views/report/Learningpathmap.vue b/src/views/report/Learningpathmap.vue index 9cd646bb..10db54ad 100644 --- a/src/views/report/Learningpathmap.vue +++ b/src/views/report/Learningpathmap.vue @@ -32,13 +32,22 @@
+
+ +
@@ -150,6 +159,7 @@ export default { createName: "", // 创建者名称 startTime: "", // 开始时间 endTime: "", // 结束时间 + publishTime: "", // 创建时间 option: [], // 组织列表 boeRouterInfoName: "", // 路径名称 selectedRowKeys: [], // 选中的列 @@ -188,16 +198,16 @@ export default { // cloumns 表头 const columns = ref([ + // { + // title: "编号", + // dataIndex: "num", + // key: "num", + // ellipsis: true, + // align: "center", + // width: 120, + // }, { - title: "编号", - dataIndex: "num", - key: "num", - ellipsis: true, - align: "center", - width: 120, - }, - { - title: "路径名称", + title: "路径图名称", dataIndex: "boeRouterInfoName", ellipsis: true, key: "boeRouterInfoName", @@ -236,6 +246,22 @@ export default { align: "center", width: 120, }, + { + title: "参与人数", + dataIndex: "participantsTotal", + ellipsis: true, + key: "participantsTotal", + align: "center", + width: 120, + }, + { + title: "参与率", + dataIndex: "participantsRate", + ellipsis: true, + key: "participantsRate", + align: "center", + width: 120, + }, { title: "完成人数", dataIndex: "completionNumber", @@ -244,6 +270,14 @@ export default { align: "center", width: 120, }, + { + title: "完成率", + dataIndex: "completedRate", + ellipsis: true, + key: "completedRate", + align: "center", + width: 120, + }, { title: "发布时间", dataIndex: "publishTime", @@ -252,14 +286,6 @@ export default { align: "center", width: 120, }, - { - title: "创建人", - dataIndex: "createName", - ellipsis: true, - key: "createName", - align: "center", - width: 120, - }, { title: "路径状态", dataIndex: "status", @@ -268,6 +294,14 @@ export default { align: "center", width: 120, }, + { + title: "创建人", + dataIndex: "createName", + ellipsis: true, + key: "createName", + align: "center", + width: 120, + }, { title: "操作", dataIndex: "operation", @@ -342,8 +376,9 @@ export default { orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, routerName: state.routerName, createName: state.createName, - startTime: state.startTime, - endTime: state.endTime, + startTime: state.publishTime[0], + endTime: state.publishTime[1], + // publishTime: state.publishTime, name: state.name, }); if (res) { @@ -362,6 +397,7 @@ export default { const reset = async () => { state.tableLoading = true; state.createName = ""; + state.publishTime = []; state.routerName = ""; state.orgId = state.resetOrgId; state.selectedRowKeys = []; @@ -387,6 +423,9 @@ export default { } else { const params = { createName: state.createName, + // publishTime: state.publishTime, + startTime: state.publishTime[0], + endTime: state.publishTime[1], routerName: state.routerName, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, }; @@ -426,6 +465,9 @@ export default { } else { const params = { createName: state.createName, + // publishTime: state.publishTime, + startTime: state.publishTime[0], + endTime: state.publishTime[1], routerName: state.routerName, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, }; @@ -480,7 +522,7 @@ export default { .select { margin-right: 20px; margin-bottom: 20px; - width: calc((100% - 76px - 220px) / 3); + width: calc((100% - 76px - 240px) / 4); } .btnz { From 88f0f3e315d9e6bbfb1f7dbd0a0e466fa039e505 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Mon, 21 Aug 2023 18:25:16 +0800 Subject: [PATCH 04/56] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/ReportProject.vue | 66 +++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/src/views/report/ReportProject.vue b/src/views/report/ReportProject.vue index 1c1e93a6..96ec2155 100644 --- a/src/views/report/ReportProject.vue +++ b/src/views/report/ReportProject.vue @@ -13,6 +13,16 @@ >
+
+ + +
+ +
+
@@ -186,6 +195,7 @@ export default { resetOrgId: [], projectName: "", createName: "", + publishTime: "", // 发布时间 selectedRowKeys: [], // 选中的列 status: null, stateOptions: [ @@ -218,6 +228,9 @@ export default { params.orgId = state.orgId; params.createName = state.createName; params.projectName = state.projectName; + // params.publishTime = state.publishTime; + params.startTime = state.publishTime[0]; + params.endTime = state.publishTime[1]; params.page = state.pageNo; params.size = state.pageSize; params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null; @@ -264,6 +277,9 @@ export default { params.orgId = state.orgId; params.createName = state.createName; params.projectName = state.projectName; + // params.publishTime = state.publishTime; + params.startTime = state.publishTime[0]; + params.endTime = state.publishTime[1]; params.page = state.pageNo; params.size = state.pageSize; params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null; @@ -313,6 +329,7 @@ export default { state.pageSize = 10; state.projectName = ""; state.createName = ""; + state.publishTime = []; state.selectedRowKeys = []; state.status = null; getTableData(); @@ -329,6 +346,9 @@ export default { params.status = state.status; params.createName = state.createName; params.projectName = state.projectName; + // params.publishTime = state.publishTime; + params.startTime = state.publishTime[0]; + params.endTime = state.publishTime[1]; params.page = state.pageNo; params.size = state.pageSize; params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null; @@ -362,7 +382,7 @@ export default { // cloumns 表头 const columns = ref([ { - title: "名称", + title: "项目名称", dataIndex: "projectName", key: "projectName", width: 120, @@ -380,7 +400,7 @@ export default { fixed: "left", }, { - title: "分类", + title: "项目分类", dataIndex: "trainingType", ellipsis: true, key: "trainingType", @@ -389,7 +409,7 @@ export default { fixed: "left", }, { - title: "阶段总数", + title: "阶段数", dataIndex: "stageTotal", ellipsis: true, key: "stageTotal", @@ -397,7 +417,7 @@ export default { align: "center", }, { - title: "任务总数", + title: "任务数", dataIndex: "taskTotal", ellipsis: true, key: "taskTotal", @@ -420,6 +440,14 @@ export default { width: 120, align: "center", }, + { + title: "参与率", + dataIndex: "participantsRate", + ellipsis: true, + key: "participantsRate", + width: 120, + align: "center", + }, { title: "完成人数", dataIndex: "peopleCompletedTotal", @@ -428,6 +456,14 @@ export default { width: 120, align: "center", }, + { + title: "完成率", + dataIndex: "completedRate", + ellipsis: true, + key: "completedRate", + width: 120, + align: "center", + }, { title: "项目时间", dataIndex: "proTime", From d91308801f8e9feb9ab13ed82f8c175c6dd6bf94 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Mon, 21 Aug 2023 18:25:34 +0800 Subject: [PATCH 05/56] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 66 ++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 21 deletions(-) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index e22895d8..0f46fcb1 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -15,11 +15,12 @@
+ +
@@ -156,6 +166,7 @@ export default { name: "", type: null, createName: "", + publishTime: "", // 发布时间 allowClear: true, option: [], selectedRowKeys: [], @@ -194,6 +205,9 @@ export default { pageSize: state.pageSize, type: state.type ? state.type[state.type.length - 1]:null, createName: state.createName, + // publishTime: state.publishTime, + startTime: state.publishTime[0], + endTime: state.publishTime[1], }; const res = await api.boeuCourseListPageV2(params); if (res) { @@ -209,14 +223,14 @@ export default { }; // cloumns 表头 const columns = ref([ - { - title: "编号", - dataIndex: "num", - ellipsis: true, - key: "num", - align: "center", - width: 80, - }, + // { + // title: "编号", + // dataIndex: "num", + // ellipsis: true, + // key: "num", + // align: "center", + // width: 80, + // }, { title: "课程名称", dataIndex: "name", @@ -226,7 +240,7 @@ export default { width: 120, }, { - title: "类型", + title: "课程类型", dataIndex: "courseType", ellipsis: true, key: "courseType", @@ -241,14 +255,6 @@ export default { align: "center", width: 120, }, - { - title: "归属路径图", - dataIndex: "routerName", - ellipsis: true, - key: "routerName", - align: "center", - width: 120, - }, { title: "归属项目", dataIndex: "projectName", @@ -257,6 +263,14 @@ export default { align: "center", width: 120, }, + { + title: "归属路径图", + dataIndex: "routerName", + ellipsis: true, + key: "routerName", + align: "center", + width: 120, + }, { title: "一级分类", dataIndex: "oneType", @@ -298,7 +312,7 @@ export default { width: 120, }, { - title: "学习总人数", + title: "学习人数", dataIndex: "learnerNumber", ellipsis: true, key: "learnerNumber", @@ -399,6 +413,7 @@ export default { state.pageSize = 10; state.type = null; state.createName = ""; + state.publishTime = []; getTableData(); }; const exportList = () => { @@ -429,6 +444,9 @@ export default { pageSize: state.pageSize, type: state.type ? state.type[state.type.length - 1]:null, createName: state.createName, + // publishTime: state.publishTime, + startTime: state.publishTime[0], + endTime: state.publishTime[1], }; axios({ method: "post", @@ -476,6 +494,9 @@ export default { pageSize: state.pageSize, type: state.type ? state.type[state.type.length - 1]:null, createName: state.createName, + // publishTime: state.publishTime, + startTime: state.publishTime[0], + endTime: state.publishTime[1], }; axios({ method: "post", @@ -541,6 +562,9 @@ export default { pageSize: state.pageSize, type: state.type ? state.type[state.type.length - 1]:null, createName: state.createName, + // publishTime: state.publishTime, + startTime: state.publishTime[0], + endTime: state.publishTime[1], }; axios({ method: "post", @@ -617,7 +641,7 @@ export default { .select { margin-right: 20px; margin-bottom: 20px; - width: calc((100% - 76px - 240px) / 4); + width: calc((100% - 76px - 220px) / 3); } .btnz { From f48f12936ede40b56c061abc659c93eff06b2483 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Mon, 21 Aug 2023 18:25:52 +0800 Subject: [PATCH 06/56] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Caseess.vue | 113 ++++++++++++++++++++++++++++------- 1 file changed, 93 insertions(+), 20 deletions(-) diff --git a/src/views/report/Caseess.vue b/src/views/report/Caseess.vue index 3c82db44..4f041e93 100644 --- a/src/views/report/Caseess.vue +++ b/src/views/report/Caseess.vue @@ -23,6 +23,31 @@ >
+
+ +
+
+ + +
@@ -112,7 +137,12 @@ export default { title: "", author: "", authorName: "", + publishTime: "", // 发布时间 selectedRowKeys: [], + orgId: null, // 状态值 + option: [], // 组织列表 + allowClear: true, + resetOrgId: [], }); // 表格数据 let tableData = ref([]); @@ -123,15 +153,28 @@ export default { return item.id; }); }; + //请求组织接口 + const getOrgList = async () => { + //todo 获取用户角色列表，判断里面是否有system-admin + // let roleList = store.state.userInfo.roleList; + const res = await api.userGetUserOrg(); + if (res) { + state.option = res.data?.result; + state.orgId = [state.option[0]?.organizationId]; + state.resetOrgId = [state.option[0]?.organizationId]; + state.allowClear = true; + // getTableData(); + } + }; // cloumns 表头 const columns = ref([ - { - title: "编号", - dataIndex: "num", - ellipsis: true, - key: "num", - align: "center", - }, + // { + // title: "编号", + // dataIndex: "num", + // ellipsis: true, + // key: "num", + // align: "center", + // }, { title: "案例名称", dataIndex: "title", @@ -146,6 +189,13 @@ export default { key: "orgDomain", align: "center", }, + // { + // title: "案例分类", + // dataIndex: "majorType1", + // ellipsis: true, + // key: "majorType1", + // align: "center", + // }, { title: "专业分类", dataIndex: "majorType", @@ -160,6 +210,13 @@ export default { key: "views", align: "center", }, + { + title: "点赞量", + dataIndex: "praises", + ellipsis: true, + key: "praises", + align: "center", + }, { title: "评论数", dataIndex: "comments", @@ -167,13 +224,13 @@ export default { key: "comments", align: "center", }, - { - title: "分享量", - dataIndex: "shares", - ellipsis: true, - key: "shares", - align: "center", - }, + // { + // title: "分享量", + // dataIndex: "shares", + // ellipsis: true, + // key: "shares", + // align: "center", + // }, { title: "收藏数", dataIndex: "favorites", @@ -189,12 +246,19 @@ export default { align: "center", }, { - title: "状态", - dataIndex: "caseScope", + title: "创建人/作者", + dataIndex: "authorName", ellipsis: true, - key: "caseScope", + key: "authorName", align: "center", }, + // { + // title: "状态", + // dataIndex: "caseScope", + // ellipsis: true, + // key: "caseScope", + // align: "center", + // }, ]); // table 分页事件 const changePagination = (page) => { @@ -207,15 +271,19 @@ export default { const res = await api.boeuCasePlatePageList({ page: state.pageNo, size: state.pageSize, + orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, title: state.title, author: state.author, authorName: state.authorName, + // publishTime: state.publishTime, + startTime: state.publishTime[0], + endTime: state.publishTime[1], boeRouterInfoName: state.boeRouterInfoName, }); if (res) { console.log(res.data, "res.data"); - 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, @@ -232,6 +300,7 @@ export default { state.title = ""; state.authorName = ""; state.author = ""; + state.publishTime = []; getTableData(); }; const searchData = async () => { @@ -262,6 +331,9 @@ export default { size: state.pageSize, title: state.title, author: state.author, + // publishTime: state.publishTime, + startTime: state.publishTime[0], + endTime: state.publishTime[1], }; axios({ method: "post", @@ -280,6 +352,7 @@ export default { } }; onMounted(() => { + getOrgList(); getTableData(); state.tableLoading = true; }); @@ -313,7 +386,7 @@ export default { .select { margin-right: 20px; margin-bottom: 20px; - width: calc((100% - 76px - 200px) / 2); + width: calc((100% - 76px - 240px) / 4); } .btnz { From 05324f2b7808f257d8cc23f86a79f045526b410d Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Mon, 21 Aug 2023 18:26:10 +0800 Subject: [PATCH 07/56] =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/ReportArticle.vue | 70 +++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 21 deletions(-) diff --git a/src/views/report/ReportArticle.vue b/src/views/report/ReportArticle.vue index e7fce52e..0c3fb423 100644 --- a/src/views/report/ReportArticle.vue +++ b/src/views/report/ReportArticle.vue @@ -23,6 +23,15 @@ >
+
+ +
@@ -127,6 +136,7 @@ export default { pageSize: 10, // 每页条数 pageNo: 1, //当前页码 createName: "", //创建者名称 + publishTime: "", // 发布时间 title: "", // 文章名称 selectedRowKeys: [], // 选中的列 }); @@ -157,6 +167,11 @@ export default { if (state.createName) { params.createName = state.createName; } + if (state.publishTime.length>0) { + // params.publishTime = state.publishTime; + params.startTime = state.publishTime[0]; + params.endTime = state.publishTime[1]; + } axios({ method: "post", url: "/report/boeu/article/exportAll", @@ -183,19 +198,31 @@ export default { } const getTableData = async () => { state.tableLoading = true; - const params = { page: state.pageNo, size: state.pageSize }; + const params = { + title: state.title, + createName: state.createName, + // publishTime: state.publishTime, + startTime: state.publishTime[0], + endTime: state.publishTime[1], + page: state.pageNo, + size: state.pageSize + }; if (state.title) { params.title = state.title; } if (state.createName) { params.createName = state.createName; } - + if (state.publishTime.length>0) { + // params.publishTime = state.publishTime; + params.startTime = state.publishTime[0]; + params.endTime = state.publishTime[1]; + } const res = await api.boeuArticlePageList(params); if (res) { state.tableLoading = false; - 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 { ...item, key: item.id, @@ -207,6 +234,7 @@ export default { const resetClick = () => { state.selectedRowKeys = []; state.createName = ""; + state.publishTime = []; state.title = ""; getTableData(); }; @@ -228,12 +256,19 @@ export default { align: "center", }, { - title: "浏览量", + title: "浏览数", dataIndex: "views", ellipsis: true, key: "views", align: "center", }, + { + title: "点赞数", + dataIndex: "praises", + ellipsis: true, + key: "praises", + align: "center", + }, { title: "评论数", dataIndex: "comments", @@ -242,19 +277,12 @@ export default { align: "center", }, { - title: "分享量", + title: "分享数", dataIndex: "shares", ellipsis: true, key: "shares", align: "center", }, - { - title: "点赞量", - dataIndex: "praises", - ellipsis: true, - key: "praises", - align: "center", - }, { title: "收藏数", dataIndex: "favorites", @@ -269,13 +297,13 @@ export default { key: "publishTime", align: "center", }, - { - title: "文章状态", - dataIndex: "status", - ellipsis: true, - key: "status", - align: "center", - }, + // { + // title: "文章状态", + // dataIndex: "status", + // ellipsis: true, + // key: "status", + // align: "center", + // }, { title: "创建人", dataIndex: "sysCreateBy", @@ -327,7 +355,7 @@ export default { .select { margin-right: 20px; margin-bottom: 20px; - width: calc((100% - 76px - 200px) / 2); + width: calc((100% - 76px - 220px) / 3); } .btnz { From d0256f0ae3f53253a9471b93237392cae0c53559 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Mon, 21 Aug 2023 18:38:03 +0800 Subject: [PATCH 08/56] =?UTF-8?q?=E9=97=AE=E7=AD=94=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Questionsandanswers.vue | 59 +++++++++++++++--------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/src/views/report/Questionsandanswers.vue b/src/views/report/Questionsandanswers.vue index fce76518..9d76fbf0 100644 --- a/src/views/report/Questionsandanswers.vue +++ b/src/views/report/Questionsandanswers.vue @@ -23,6 +23,15 @@ >
+
+ +
@@ -104,11 +113,13 @@ export default { pageSize: 10, // 每页条数 pageNo: 1, //当前页码 createName: "", + publishTime: "", // 发布时间 title: "", selectedRowKeys: [], }); const reset = async () => { state.createName = ""; + state.publishTime = []; state.title = ""; state.selectedRowKeys = [] getTableData(); @@ -118,13 +129,16 @@ export default { const params = { title: state.title, createName: state.createName, + // publishTime: state.publishTime, + startTime: state.publishTime[0], + endTime: state.publishTime[1], pageNo: state.pageNo, pageSize: state.pageSize, }; const res = await api.boeuQuestionPageList(params); if (res) { - tableData.value = res.data.rows; - state.tableDataTotal = res.data.total; + tableData.value = res.data.result.rows; + state.tableDataTotal = res.data.result.total; state.tableLoading = false; } }; @@ -133,47 +147,47 @@ export default { // cloumns 表头 const columns = ref([ { - title: "问答标题", + title: "问答名称", dataIndex: "title", ellipsis: true, key: "title", align: "center", }, + // { + // title: "归属组织", + // dataIndex: "organizationName", + // ellipsis: true, + // key: "organizationName", + // align: "center", + // }, { - title: "归属组织", - dataIndex: "organizationName", - ellipsis: true, - key: "organizationName", - align: "center", - }, - { - title: "浏览量", + title: "浏览数", dataIndex: "views", ellipsis: true, key: "views", align: "center", }, { - title: "评论数", + title: "点赞数", + dataIndex: "praises", + ellipsis: true, + key: "praises", + align: "center", + }, + { + title: "回答数", dataIndex: "answers", ellipsis: true, key: "answers", align: "center", }, { - title: "分享量", + title: "分享数", dataIndex: "shares", ellipsis: true, key: "shares", align: "center", }, - { - title: "点赞量", - dataIndex: "praises", - ellipsis: true, - key: "praises", - align: "center", - }, { title: "收藏数", dataIndex: "favorites", @@ -227,6 +241,9 @@ export default { const params = { title: state.title, createName: state.createName, + // publishTime: state.publishTime, + startTime: state.publishTime[0], + endTime: state.publishTime[1], pageNo: state.pageNo, pageSize: state.pageSize, }; @@ -294,7 +311,7 @@ export default { .select { margin-right: 20px; margin-bottom: 20px; - width: calc((100% - 76px - 200px) / 2); + width: calc((100% - 76px - 220px) / 3); } .btnz { padding: 0px 26px 0px 26px; From 7b5ca6dc8e9a69fb4fcadadda4145cf9890a5ad6 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Mon, 21 Aug 2023 18:38:19 +0800 Subject: [PATCH 09/56] =?UTF-8?q?=E8=80=83=E8=AF=95=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/ReportExamination.vue | 250 ++++++++++++++++++------- 1 file changed, 180 insertions(+), 70 deletions(-) diff --git a/src/views/report/ReportExamination.vue b/src/views/report/ReportExamination.vue index 4a53c9ea..958636d3 100644 --- a/src/views/report/ReportExamination.vue +++ b/src/views/report/ReportExamination.vue @@ -12,24 +12,25 @@ allowClear > --> + >
@@ -38,22 +39,21 @@
- - +
@@ -94,6 +94,38 @@ onChange: onSelectChange, }" > +
@@ -136,7 +168,10 @@ export default { selectedRowKeys: [], // 选中的列 ids: [], allowClear:true, - resetOrgId:[] + resetOrgId:[], + creator: "", + testName: "", + publishTime: [], }); // table选中 const onSelectChange = (selectedRowKeys, record) => { @@ -149,9 +184,9 @@ export default { const getOrgList = async () => { const res = await api.userGetUserOrg({}); if (res) { - state.option = res.data?.result?.list; - state.orgId = res.data?.result?.treeNodeList; - state.resetOrgId = res.data?.result?.treeNodeList; + state.option = res.data?.result; + state.orgId = [state.option[0]?.organizationId]; + state.resetOrgId = [state.option[0]?.organizationId]; res.data?.result?.userType === 1 ? (state.allowClear = true) : (state.allowClear = false); @@ -181,98 +216,162 @@ export default { // cloumns 表头 const columns = ref([ { - title: "工号", - dataIndex: "userNo", - key: "userNo", + title: "考试名称", + dataIndex: "testName", + key: "testName", width: 120, ellipsis: true, align: "center", }, { - title: "姓名", - dataIndex: "name", + title: "归属组织", + dataIndex: "resOwner", ellipsis: true, - key: "name", + key: "resOwner", width: 120, align: "center", }, { - title: "组织信息", - dataIndex: "departmentName", + title: "归属课程", + dataIndex: "pertainCourse", ellipsis: true, - key: "departmentName", + key: "pertainCourse", width: 120, align: "center", }, { - title: "岗位", - dataIndex: "jobName", + title: "归属项目", + dataIndex: "pertainProject", ellipsis: true, - key: "jobName", + key: "pertainProject", + align: "center", + width: 120, + }, + { + title: "归属路径", + dataIndex: "pertainRouter", + ellipsis: true, + key: "pertainRouter", + align: "center", + width: 120, + }, + { + title: "题量", + dataIndex: "numOfQuest", + ellipsis: true, + key: "numOfQuest", width: 120, align: "center", }, { - title: "Band", - dataIndex: "bandCode", + title: "考试人数", + dataIndex: "totalNumber", ellipsis: true, - key: "bandCode", + key: "totalNumber", width: 120, align: "center", }, { - title: "授课次数", - dataIndex: "teachingTotal", + title: "参加人数", + dataIndex: "numOfAnswer", ellipsis: true, - key: "teachingTotal", + key: "numOfAnswer", width: 120, align: "center", }, { - title: "授课时长(分钟)", - dataIndex: "teachingTime", + title: "参加率", + dataIndex: "answerRate", ellipsis: true, - key: "teachingTime", + key: "answerRate", width: 120, align: "center", }, { - title: "案例数", - dataIndex: "caseTotal", + title: "考试次数", + dataIndex: "testTimes", ellipsis: true, - key: "caseTotal", + key: "testTimes", width: 120, align: "center", }, { - title: "学习项目", - dataIndex: "studyProject", + title: "考试时长", + dataIndex: "testDuration", ellipsis: true, - key: "studyProject", + key: "testDuration", width: 120, align: "center", }, { - title: "学习路径", - dataIndex: "studyRouter", + title: "考试满分", + dataIndex: "totalScore", ellipsis: true, - key: "studyRouter", + key: "totalScore", width: 120, align: "center", }, { - title: "学习课程", - dataIndex: "studyClass", + title: "考试合格分", + dataIndex: "passLine", ellipsis: true, - key: "studyClass", + key: "passLine", width: 120, align: "center", }, { - title: "累计学习时长(分钟)", - dataIndex: "studyTimeSum", + title: "平均答题时长", + dataIndex: "averageAnswerTime", ellipsis: true, - key: "studyTimeSum", + key: "averageAnswerTime", + width: 120, + align: "center", + }, + { + title: "平均得分", + dataIndex: "averageScore", + ellipsis: true, + key: "averageScore", + width: 120, + align: "center", + }, + { + title: "通过人数", + dataIndex: "numOfPass", + ellipsis: true, + key: "numOfPass", + width: 120, + align: "center", + }, + { + title: "通过率", + dataIndex: "passRate", + ellipsis: true, + key: "passRate", + width: 120, + align: "center", + }, + { + title: "发布时间", + dataIndex: "publishTime", + ellipsis: true, + key: "publishTime", + width: 120, + align: "center", + }, + { + title: "考试状态", + dataIndex: "published", + ellipsis: true, + key: "published", + width: 120, + align: "center", + }, + { + title: "创建人", + dataIndex: "creator", + ellipsis: true, + key: "creator", width: 120, align: "center", }, @@ -319,17 +418,21 @@ export default { // 获取数据 const getTableData = async () => { state.tableLoading = true; - const res = await api.boeuStudyDataPageList({ + const res = await api.boeuExamPageListV2({ page: state.pageNo, size: state.pageSize, - userNo: state.userNo, - name: state.name, + // userNo: state.userNo, + testName: state.testName, + creator: state.creator, + startTime: state.publishTime[0], + endTime: state.publishTime[1], + // name: state.name, departmentId: state.orgId ? state.orgId[state.orgId.length - 1] : null, - bandCode: state.band, + // bandCode: state.band, }); 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, @@ -342,9 +445,12 @@ export default { // 重置按钮 const reset = async () => { state.tableLoading = true; - state.name = ""; - state.band = ""; - state.userNo = ""; + // state.name = ""; + // state.band = ""; + // state.userNo = ""; + state.testName = ""; + state.creator = ""; + state.publishTime = []; state.orgId = state.resetOrgId; getTableData(); }; @@ -355,10 +461,14 @@ export default { method: "post", url: "/report/boeu/studyData/exportAll", data: { - userNo: state.userNo, - name: state.name, + // userNo: state.userNo, + // name: state.name, + testName: state.testName, + creator: state.creator, + startTime: state.publishTime[0], + endTime: state.publishTime[1], departmentId: state.orgId ? state.orgId[state.orgId.length - 1] : null, - bandCode: state.band, + // bandCode: state.band, }, responseType: "blob", headers: { From c287b3d86e13c2f5c9cd6e645f64f14645a05cb6 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Mon, 21 Aug 2023 18:42:53 +0800 Subject: [PATCH 10/56] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexOvervoew.js | 2 + src/views/report/Employeelearning.vue | 75 ++++++++++++++------------- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/src/api/indexOvervoew.js b/src/api/indexOvervoew.js index 933110f7..8eafa8a5 100644 --- a/src/api/indexOvervoew.js +++ b/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) // 路径图列表 diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index 4a53c9ea..8f42034a 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -12,17 +12,18 @@ allowClear > --> + >
@@ -149,9 +150,9 @@ export default { const getOrgList = async () => { const res = await api.userGetUserOrg({}); if (res) { - state.option = res.data?.result?.list; - state.orgId = res.data?.result?.treeNodeList; - state.resetOrgId = res.data?.result?.treeNodeList; + state.option = res.data?.result; + state.orgId = [state.option[0]?.organizationId]; + 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: "组织信息", - dataIndex: "departmentName", + title: "所属组织", + 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: "授课时长(分钟)", - dataIndex: "teachingTime", + title: "授课时长", + dataIndex: "teachingDuration", ellipsis: true, - key: "teachingTime", + key: "teachingDuration", width: 120, align: "center", }, { - title: "案例数", - dataIndex: "caseTotal", + title: "案例创建", + dataIndex: "cases", ellipsis: true, - key: "caseTotal", + key: "cases", width: 120, align: "center", }, { - title: "学习项目", - dataIndex: "studyProject", + title: "课程学习", + dataIndex: "courseStudy", ellipsis: true, - key: "studyProject", + key: "courseStudy", width: 120, align: "center", }, { - title: "学习路径", - dataIndex: "studyRouter", + title: "项目学习", + dataIndex: "projectStudy", ellipsis: true, - key: "studyRouter", + key: "projectStudy", width: 120, align: "center", }, { - title: "学习课程", - dataIndex: "studyClass", + title: "路径图学习", + dataIndex: "routerStudy", ellipsis: true, - key: "studyClass", + key: "routerStudy", width: 120, align: "center", }, { - title: "累计学习时长(分钟)", - dataIndex: "studyTimeSum", + title: "学习时长", + 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; - 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, From a246b16a8350c0a3b7fe7d77930375c993781f4e Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Tue, 22 Aug 2023 10:07:47 +0800 Subject: [PATCH 11/56] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 2 +- src/views/report/Questionsandanswers.vue | 21 ++++++++++++++------- src/views/report/ReportArticle.vue | 21 ++++++++++++++------- src/views/report/ReportExamination.vue | 4 ++-- src/views/report/ReportProject.vue | 20 ++++++++++---------- 5 files changed, 41 insertions(+), 27 deletions(-) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index 0f46fcb1..164acd54 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -245,7 +245,7 @@ export default { ellipsis: true, key: "courseType", align: "center", - width: 80, + width: 120, }, { title: "归属组织", diff --git a/src/views/report/Questionsandanswers.vue b/src/views/report/Questionsandanswers.vue index 9d76fbf0..f1bffe83 100644 --- a/src/views/report/Questionsandanswers.vue +++ b/src/views/report/Questionsandanswers.vue @@ -166,6 +166,7 @@ export default { ellipsis: true, key: "views", align: "center", + width: 100, }, { title: "点赞数", @@ -173,6 +174,7 @@ export default { ellipsis: true, key: "praises", align: "center", + width: 100, }, { title: "回答数", @@ -180,6 +182,7 @@ export default { ellipsis: true, key: "answers", align: "center", + width: 100, }, { title: "分享数", @@ -187,6 +190,7 @@ export default { ellipsis: true, key: "shares", align: "center", + width: 100, }, { title: "收藏数", @@ -194,6 +198,7 @@ export default { ellipsis: true, key: "favorites", align: "center", + width: 100, }, { title: "发布时间", @@ -201,20 +206,22 @@ export default { ellipsis: true, key: "sysCreateTime", align: "center", + width: 140, }, - { - title: "问答状态", - dataIndex: "status", - ellipsis: true, - key: "status", - align: "center", - }, + // { + // title: "问答状态", + // dataIndex: "status", + // ellipsis: true, + // key: "status", + // align: "center", + // }, { title: "创建人", dataIndex: "sysCreateBy", ellipsis: true, key: "sysCreateBy", align: "center", + width: 140, }, ]); // 导出事件 diff --git a/src/views/report/ReportArticle.vue b/src/views/report/ReportArticle.vue index 0c3fb423..0392304e 100644 --- a/src/views/report/ReportArticle.vue +++ b/src/views/report/ReportArticle.vue @@ -248,19 +248,20 @@ export default { key: "title", align: "center", }, - { - title: "归属组织", - dataIndex: "orgName", - ellipsis: true, - key: "orgName", - align: "center", - }, + // { + // title: "归属组织", + // dataIndex: "orgName", + // ellipsis: true, + // key: "orgName", + // align: "center", + // }, { title: "浏览数", dataIndex: "views", ellipsis: true, key: "views", align: "center", + width: 100, }, { title: "点赞数", @@ -268,6 +269,7 @@ export default { ellipsis: true, key: "praises", align: "center", + width: 100, }, { title: "评论数", @@ -275,6 +277,7 @@ export default { ellipsis: true, key: "comments", align: "center", + width: 100, }, { title: "分享数", @@ -282,6 +285,7 @@ export default { ellipsis: true, key: "shares", align: "center", + width: 100, }, { title: "收藏数", @@ -289,6 +293,7 @@ export default { ellipsis: true, key: "favorites", align: "center", + width: 100, }, { title: "发布时间", @@ -296,6 +301,7 @@ export default { ellipsis: true, key: "publishTime", align: "center", + width: 140, }, // { // title: "文章状态", @@ -310,6 +316,7 @@ export default { ellipsis: true, key: "sysCreateBy", align: "center", + width: 120, }, ]); // table选中 diff --git a/src/views/report/ReportExamination.vue b/src/views/report/ReportExamination.vue index 958636d3..be239b9d 100644 --- a/src/views/report/ReportExamination.vue +++ b/src/views/report/ReportExamination.vue @@ -280,7 +280,7 @@ export default { align: "center", }, { - title: "参加率", + title: "参与率", dataIndex: "answerRate", ellipsis: true, key: "answerRate", @@ -356,7 +356,7 @@ export default { dataIndex: "publishTime", ellipsis: true, key: "publishTime", - width: 120, + width: 140, align: "center", }, { diff --git a/src/views/report/ReportProject.vue b/src/views/report/ReportProject.vue index 96ec2155..d7014fa7 100644 --- a/src/views/report/ReportProject.vue +++ b/src/views/report/ReportProject.vue @@ -464,24 +464,24 @@ export default { width: 120, align: "center", }, - { - title: "项目时间", - dataIndex: "proTime", - ellipsis: true, - key: "proTime", - width: 120, - align: "center", - }, + // { + // title: "项目时间", + // dataIndex: "proTime", + // ellipsis: true, + // key: "proTime", + // width: 120, + // align: "center", + // }, { title: "发布时间", dataIndex: "publishTime", ellipsis: true, key: "publishTime", - width: 120, + width: 140, align: "center", }, { - title: "状态", + title: "项目状态", dataIndex: "status", ellipsis: true, key: "projectStatus", From 825d697ee5bde3479d5593e0fccffc94a25f9bb7 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Tue, 22 Aug 2023 11:24:35 +0800 Subject: [PATCH 12/56] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=A0=91=E5=90=8E=E8=B0=83table?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Caseess.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/report/Caseess.vue b/src/views/report/Caseess.vue index 4f041e93..f9893b85 100644 --- a/src/views/report/Caseess.vue +++ b/src/views/report/Caseess.vue @@ -163,7 +163,7 @@ export default { state.orgId = [state.option[0]?.organizationId]; state.resetOrgId = [state.option[0]?.organizationId]; state.allowClear = true; - // getTableData(); + getTableData(); } }; // cloumns 表头 @@ -353,7 +353,7 @@ export default { }; onMounted(() => { getOrgList(); - getTableData(); + // getTableData(); state.tableLoading = true; }); return { From ab12f070d6aefbee0972306b6445460ecb201b3b Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Tue, 22 Aug 2023 11:25:17 +0800 Subject: [PATCH 13/56] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Employeelearning.vue | 87 +++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 6 deletions(-) diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index 8f42034a..3ae8339f 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -47,14 +47,35 @@
- +
+
+ +
@@ -137,8 +158,55 @@ export default { selectedRowKeys: [], // 选中的列 ids: [], allowClear:true, - resetOrgId:[] + resetOrgId:[], + valueBand: null, + valueCourseType: null, + optionsBand:[ + {value: 'Band1',label: 'Band1',}, + {value: 'Band2',label: 'Band2',}, + {value: 'Band3',label: 'Band3',}, + {value: 'Band4',label: 'Band4',}, + {value: 'Band5',label: 'Band5',}, + {value: 'Band6',label: 'Band6',}, + {value: 'Band7',label: 'Band7',}, + {value: 'Band8',label: 'Band8',}, + {value: 'Band9',label: 'Band9',}, + {value: 'Band10',label: 'Band10',}, + {value: 'Band11',label: 'Band11',}, + {value: 'Band12',label: 'Band12',}, + {value: 'Band13',label: 'Band13',}, + {value: 'Band14',label: 'Band14',}, + {value: 'Band15',label: 'Band15',}, + {value: 'Band16',label: 'Band16',}, + {value: 'Band17',label: 'Band17',}, + {value: 'Band18',label: 'Band18',}, + {value: 'Band19',label: 'Band19',}, + {value: 'Band20',label: 'Band20',}, + ], + optionsCourseType: [ + { + value: true, + label: '是', + }, + { + value: false, + label: '否', + }, + ], }); + + const focusBand = () => { + console.log('focus band'); + }; + + const handleBandChange = (value) => { + console.log(`selected handleBandChange ${value}`); + state.valueBand = value; + }; + const handleCourseTypeChange = (value) => { + console.log(`selected handleCourseTypeChange ${value}`); + state.valueCourseType = value; + }; // table选中 const onSelectChange = (selectedRowKeys, record) => { state.selectedRowKeys = selectedRowKeys; @@ -326,7 +394,8 @@ export default { userNo: state.userNo, name: state.name, departmentId: state.orgId ? state.orgId[state.orgId.length - 1] : null, - bandCode: state.band, + bandCode: state.valueBand, + hasTeach: state.valueCourseType, }); if (res) { state.tableDataTotal = res.data.result.total; @@ -346,6 +415,8 @@ export default { state.name = ""; state.band = ""; state.userNo = ""; + state.valueBand = ""; + state.valueCourseType = ""; state.orgId = state.resetOrgId; getTableData(); }; @@ -359,7 +430,8 @@ export default { userNo: state.userNo, name: state.name, departmentId: state.orgId ? state.orgId[state.orgId.length - 1] : null, - bandCode: state.band, + bandCode: state.valueBand, + hasTeach: state.valueCourseType, }, responseType: "blob", headers: { @@ -374,6 +446,9 @@ export default { state.tableLoading = true; }); return { + focusBand, + handleBandChange, + handleCourseTypeChange, exportAllbtnz, onSelectChange, exportbtnz, @@ -402,7 +477,7 @@ export default { .select { margin-right: 20px; margin-bottom: 20px; - width: calc((100% - 76px - 240px) / 4); + width: calc((100% - 76px - 220px) / 3); } .btnz { From 3df0281430df6e6d18cf1d7c036c7e3fcaddc777 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Tue, 22 Aug 2023 19:03:42 +0800 Subject: [PATCH 14/56] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Caseess.vue | 6 +++--- src/views/report/Curriculum.vue | 6 +++--- src/views/report/Employeelearning.vue | 6 +++--- src/views/report/Learningpathmap.vue | 9 ++++++--- src/views/report/ReportExamination.vue | 6 +++--- src/views/report/ReportProject.vue | 6 +++--- 6 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/views/report/Caseess.vue b/src/views/report/Caseess.vue index f9893b85..e9f2c963 100644 --- a/src/views/report/Caseess.vue +++ b/src/views/report/Caseess.vue @@ -159,9 +159,9 @@ export default { // let roleList = store.state.userInfo.roleList; const res = await api.userGetUserOrg(); if (res) { - state.option = res.data?.result; - state.orgId = [state.option[0]?.organizationId]; - state.resetOrgId = [state.option[0]?.organizationId]; + state.option = res.data?.result.orgTreeList; + state.orgId = res.data?.result.treeNodeList; + state.resetOrgId = res.data?.result.treeNodeList; state.allowClear = true; getTableData(); } diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index 164acd54..83fa8184 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -187,9 +187,9 @@ export default { } const res = await api.userGetUserOrg(params); if (res) { - state.option = res.data?.result; - state.orgId = [state.option[0]?.organizationId]; - state.resetOrgId = [state.option[0]?.organizationId]; + state.option = res.data?.result.orgTreeList; + state.orgId = res.data?.result.treeNodeList; + state.resetOrgId = res.data?.result.treeNodeList; state.allowClear = true getTableData(); } diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index 3ae8339f..9d150f10 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -218,9 +218,9 @@ export default { const getOrgList = async () => { const res = await api.userGetUserOrg({}); if (res) { - state.option = res.data?.result; - state.orgId = [state.option[0]?.organizationId]; - state.resetOrgId = [state.option[0]?.organizationId]; + state.option = res.data?.result.orgTreeList; + state.orgId = res.data?.result.treeNodeList; + state.resetOrgId = res.data?.result.treeNodeList; res.data?.result?.userType === 1 ? (state.allowClear = true) : (state.allowClear = false); diff --git a/src/views/report/Learningpathmap.vue b/src/views/report/Learningpathmap.vue index 10db54ad..4b7fadc6 100644 --- a/src/views/report/Learningpathmap.vue +++ b/src/views/report/Learningpathmap.vue @@ -188,9 +188,12 @@ export default { // let roleList = store.state.userInfo.roleList; const res = await api.userGetUserOrg(); if (res) { - state.option = res.data?.result; - state.orgId = [state.option[0]?.organizationId]; - state.resetOrgId = [state.option[0]?.organizationId]; + // state.option = res.data?.result; + // state.orgId = [state.option[0]?.organizationId]; + // state.resetOrgId = [state.option[0]?.organizationId]; + state.option = res.data?.result.orgTreeList; + state.orgId = res.data?.result.treeNodeList; + state.resetOrgId = res.data?.result.treeNodeList; state.allowClear = true; getTableData(); } diff --git a/src/views/report/ReportExamination.vue b/src/views/report/ReportExamination.vue index be239b9d..f5c4ba12 100644 --- a/src/views/report/ReportExamination.vue +++ b/src/views/report/ReportExamination.vue @@ -184,9 +184,9 @@ export default { const getOrgList = async () => { const res = await api.userGetUserOrg({}); if (res) { - state.option = res.data?.result; - state.orgId = [state.option[0]?.organizationId]; - state.resetOrgId = [state.option[0]?.organizationId]; + state.option = res.data?.result.orgTreeList; + state.orgId = res.data?.result.treeNodeList; + state.resetOrgId = res.data?.result.treeNodeList; res.data?.result?.userType === 1 ? (state.allowClear = true) : (state.allowClear = false); diff --git a/src/views/report/ReportProject.vue b/src/views/report/ReportProject.vue index d7014fa7..0d793773 100644 --- a/src/views/report/ReportProject.vue +++ b/src/views/report/ReportProject.vue @@ -315,9 +315,9 @@ export default { } const res = await api.userGetUserOrg(params); if (res) { - state.option = res.data?.result; - state.orgId = [state.option[0]?.organizationId]; - state.resetOrgId = [state.option[0]?.organizationId]; + state.option = res.data?.result.orgTreeList; + state.orgId = res.data?.result.treeNodeList; + state.resetOrgId = res.data?.result.treeNodeList; state.allowClear = true getTableData(); } 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 15/56] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E6=95=B0=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", From 482eca3d5f770e4d886748fbb69788bfadec209f Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Wed, 23 Aug 2023 10:38:39 +0800 Subject: [PATCH 16/56] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A6=82=E8=A7=88=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Overvoew.vue | 106 ++++++++++++++++++++++++---------- 1 file changed, 75 insertions(+), 31 deletions(-) diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index 7c4b2792..75c71194 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -46,6 +46,15 @@ >
+
+ +
@@ -310,6 +319,7 @@ export default { resetOrgId: [], allowClear: true, type: null, + publishTime: [], // 创建时间 }); // 获取tab数据 const getTabData = async () => { @@ -339,6 +349,7 @@ export default { const reset = async () => { state.tableLoading = true; state.creator = ""; + state.publishTime = []; state.name = ""; state.orgId = state.resetOrgId; getTableData(); @@ -450,6 +461,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, + startTime: state.publishTime[0], + endTime: state.publishTime[1], }, responseType: "blob", headers: { @@ -468,6 +481,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, + startTime: state.publishTime[0], + endTime: state.publishTime[1], }, responseType: "blob", headers: { @@ -486,6 +501,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, + startTime: state.publishTime[0], + endTime: state.publishTime[1], }, responseType: "blob", headers: { @@ -504,6 +521,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, + startTime: state.publishTime[0], + endTime: state.publishTime[1], }, responseType: "blob", headers: { @@ -522,6 +541,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, + startTime: state.publishTime[0], + endTime: state.publishTime[1], }, responseType: "blob", headers: { @@ -538,6 +559,8 @@ export default { name: state.name, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, + startTime: state.publishTime[0], + endTime: state.publishTime[1], }, responseType: "blob", headers: { @@ -560,6 +583,8 @@ export default { //考试列表 const res = await api.boeuExamPageList({ creator: state.creator, + startTime: state.publishTime[0], + endTime: state.publishTime[1], orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, testName: state.name, page: state.pageNo, @@ -580,6 +605,8 @@ export default { //案例列表 const res = await api.boeuCasePageList({ author: state.creator, + startTime: state.publishTime[0], + endTime: state.publishTime[1], orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, title: state.name, page: state.pageNo, @@ -605,6 +632,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, + startTime: state.publishTime[0], + endTime: state.publishTime[1], }); const list = res.data.result.rows.map((item) => { return { @@ -622,6 +651,8 @@ export default { teachingName: state.name, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, + startTime: state.publishTime[0], + endTime: state.publishTime[1], }); const list = res.data.result.rows?.map((item) => { return { @@ -639,6 +670,8 @@ export default { routerName: state.name, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, + startTime: state.publishTime[0], + endTime: state.publishTime[1], }); const list = res.data.result.rows?.map((item) => { return { @@ -656,6 +689,8 @@ export default { orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, projectName: state.name, + startTime: state.publishTime[0], + endTime: state.publishTime[1], }); if (res) { const fun = (arr) => { @@ -930,7 +965,7 @@ export default { } else if (index === 4) { columns.value = [ { - title: "名称", + title: "考试名称", dataIndex: "testName", key: "id", width: 120, @@ -948,8 +983,8 @@ export default { fixed: "left", }, { - title: "参加人数", - dataIndex: "totalNumber", + title: "题量", + dataIndex: "numOfQuest", ellipsis: true, width: 120, @@ -964,13 +999,22 @@ export default { align: "center", }, { - title: "题量", - dataIndex: "numOfQuest", + title: "参加人数", + dataIndex: "totalNumber", ellipsis: true, width: 120, align: "center", }, + { + title: "参与率", + dataIndex: "answerRate", + ellipsis: true, + + width: 120, + align: "center", + }, + { title: "通过人数", dataIndex: "numOfPass", @@ -988,10 +1032,10 @@ export default { align: "center", }, { - title: "发布时间", - dataIndex: "publishTime", + title: "创建时间", + dataIndex: "createTime", ellipsis: true, - key: "publishTime", + key: "createTime", width: 120, align: "center", }, @@ -1223,7 +1267,7 @@ export default { } else if (index === 2) { columns.value = [ { - title: "开课名称", + title: "课程名称", dataIndex: "name", key: "name", width: 120, @@ -1241,7 +1285,7 @@ export default { fixed: "left", }, { - title: "分类", + title: "课程分类", dataIndex: "typeName", ellipsis: true, key: "typeName", @@ -1250,19 +1294,11 @@ export default { fixed: "left", }, { - title: "授课时长(分钟)", + title: "授课时长（小时）", dataIndex: "teachingLength", ellipsis: true, key: "teachingLength", - width: 120, - align: "center", - }, - { - title: "授课教师", - dataIndex: "teacher", - ellipsis: true, - key: "teacher", - width: 120, + width: 150, align: "center", }, { @@ -1274,21 +1310,13 @@ export default { align: "center", }, { - title: "评分", + title: "课程评分", dataIndex: "score", ellipsis: true, key: "score", width: 120, align: "center", }, - { - title: "授课时间", - dataIndex: "teachingTime", - ellipsis: true, - key: "teachingTime", - width: 120, - align: "center", - }, { title: "创建时间", dataIndex: "createTime", @@ -1297,6 +1325,14 @@ export default { width: 120, align: "center", }, + { + title: "授课时间", + dataIndex: "teachingTime", + ellipsis: true, + key: "teachingTime", + width: 120, + align: "center", + }, { title: "状态", dataIndex: "status", @@ -1313,6 +1349,14 @@ export default { width: 120, align: "center", }, + // { + // title: "授课教师", + // dataIndex: "teacher", + // ellipsis: true, + // key: "teacher", + // width: 120, + // align: "center", + // }, ]; } else if (index === 1) { columns.value = [ @@ -1371,9 +1415,9 @@ export default { }, { title: "参与率", - dataIndex: "participantsTotal", + dataIndex: "participantsRate", ellipsis: true, - key: "participantsTotal", + key: "participantsRate", width: 120, align: "center", }, From 935ca5f09afbe6063a3028b173f9c045113f5c9b Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Thu, 24 Aug 2023 13:38:12 +0800 Subject: [PATCH 17/56] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A6=82=E8=A7=88total=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=B8=A6=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Overvoew.vue | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index 75c71194..a47e07e6 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -325,11 +325,25 @@ export default { const getTabData = async () => { console.log("getTabData 111111:",state.type); console.log("getTabData 222222:",store.state.userInfo.roleList); + var manageFlag = false; + for(let i=0;i Date: Thu, 24 Aug 2023 15:25:17 +0800 Subject: [PATCH 18/56] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A6=82=E8=A7=88=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Operational.vue | 70 ++++++++++++++++---------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/views/report/Operational.vue b/src/views/report/Operational.vue index 0afc7969..23bc415a 100644 --- a/src/views/report/Operational.vue +++ b/src/views/report/Operational.vue @@ -68,7 +68,7 @@
学习情况
-
+
导出学习情况
@@ -83,27 +83,27 @@ @change="modalChange" :options="[ { - label: '项目', + label: '课程', value: 1, }, { - label: '学习路径图', + label: '案例', value: 2, }, { - label: '课程', + label: '文章', value: 3, }, { - label: '案例', + label: '问答', value: 4, }, { - label: '文章', + label: '项目', value: 5, }, { - label: '问答', + label: '学习路径图', value: 6, }, ]" @@ -115,8 +115,8 @@ placeholder="请选择日期格式" @change="twoSelectChange" :options="[ - { label: '按日查找', value: 0 }, - { label: '按月查找', value: 1 }, + { label: '按日查找', value: 1 }, + { label: '按月查找', value: 2 }, ]" v-model:value="towParmasn.dateType" > @@ -124,7 +124,7 @@
{ + res?.data?.result.forEach((item) => { xData.push(item.xdata.slice(item.xdata.indexOf("-") + 1)); item?.list?.forEach((iten) => { if (iten.name == "case") { @@ -406,7 +406,7 @@ export default { const course = []; const project = []; const router = []; - res?.data?.forEach((item) => { + res?.data?.result.forEach((item) => { xData.push(item.xdata); item?.list?.forEach((iten) => { if (iten.name == "case") { @@ -445,7 +445,7 @@ export default { const course = []; const project = []; const router = []; - res?.data?.forEach((item) => { + res?.data?.result.forEach((item) => { xData.push(item.xdata); item?.list?.forEach((iten) => { if (iten.name == "course") { @@ -481,7 +481,7 @@ export default { const course = []; const project = []; const router = []; - res?.data?.forEach((item) => { + res?.data?.result.forEach((item) => { xData.push(item.xdata.slice(item.xdata.indexOf("-") + 1)); item?.list?.forEach((iten) => { if (iten.name == "course") { @@ -504,7 +504,7 @@ export default { } }; const exportTwoData = async () => { - if (state.towParmasn.dateType == 0) { + if (state.towParmasn.dateType == 1) { if (!state.towParmasn.day?.length || state.towParmasn.day?.length < 1) { message.error("请选择要导出的时间日期后再进行导出"); } else { @@ -536,7 +536,7 @@ export default { } ); } - } else if (state.towParmasn.dateType == 1) { + } else if (state.towParmasn.dateType == 2) { if ( !state.towParmasn.time?.length || state.towParmasn.time?.length < 1 @@ -573,9 +573,9 @@ export default { } }; const modalChange = async () => { - if (state.towParmasn.dateType == 1) { + if (state.towParmasn.dateType == 2) { twoMonthChange(state.towParmasn.time); - } else if (state.towParmasn.dateType == 0) { + } else if (state.towParmasn.dateType == 1) { twoDatChange(state.towParmasn.day); } }; @@ -633,7 +633,7 @@ export default { if (e?.length > 0) { const monthEnd = dayjs(e[1]) .endOf("month") - .format("YYYY-MM-DD hh:mm:ss"); + .format("YYYY-MM-DD 23:59:59"); const res = await api.boeuStudyDataGetStudyStaisticsList({ beginTime: dayjs(e[0]).format("YYYY-MM-01 00:00:01"), endTime: monthEnd, @@ -650,9 +650,9 @@ export default { const avgDuration = []; const count = []; const duration = []; - res?.data?.forEach((item) => { - xData.push(item.month); - avgDuration.push(item.viewCount); + res?.data?.result.forEach((item) => { + xData.push(item.day); + avgDuration.push(item.avgDuration); count.push(item.count); duration.push(item.duration); }); @@ -668,8 +668,8 @@ export default { const avgDuration = []; const count = []; const duration = []; - res?.data?.forEach((item) => { - xData.push(item.month); + res?.data?.result.forEach((item) => { + xData.push(item.day); avgDuration.push(item.avgDuration); count.push(item.count); duration.push(item.duration); @@ -690,7 +690,7 @@ export default { const dayStart = dayjs(e[0]) .startOf("day") .format("YYYY-MM-DD 00:00:01"); - const dayEnd = dayjs(e[1]).endOf("day").format("YYYY-MM-DD hh:mm:ss"); + const dayEnd = dayjs(e[1]).endOf("day").format("YYYY-MM-DD 23:59:59"); const res = await api.boeuStudyDataGetStudyStaisticsList({ beginTime: dayStart, endTime: dayEnd, @@ -707,9 +707,9 @@ export default { const avgDuration = []; const count = []; const duration = []; - res?.data?.forEach((item) => { + res?.data?.result.forEach((item) => { xData.push(item.day); - avgDuration.push(item.viewCount); + avgDuration.push(item.avgDuration); count.push(item.count); duration.push(item.duration); }); @@ -725,7 +725,7 @@ export default { const avgDuration = []; const count = []; const duration = []; - res?.data?.forEach((item) => { + res?.data?.result.forEach((item) => { xData.push(item.day); avgDuration.push(item.avgDuration); count.push(item.count); @@ -758,7 +758,7 @@ export default { const course = []; const project = []; const router = []; - res?.data?.forEach((item) => { + res?.data?.result.forEach((item) => { xData.push(item.xdata); item?.list?.forEach((iten) => { if (iten.name == "course") { @@ -794,7 +794,7 @@ export default { const course = []; const project = []; const router = []; - res?.data?.forEach((item) => { + res?.data?.result.forEach((item) => { xData.push(item.xdata.slice(item.xdata.indexOf("-") + 1)); item?.list?.forEach((iten) => { if (iten.name == "course") { @@ -909,7 +909,7 @@ export default { const course = []; const project = []; const router = []; - res?.data?.forEach((item) => { + res?.data?.result.forEach((item) => { xData.push(item.xdata); item?.list?.forEach((iten) => { if (iten.name == "case") { @@ -945,7 +945,7 @@ export default { const course = []; const project = []; const router = []; - res?.data?.forEach((item) => { + res?.data?.result.forEach((item) => { xData.push(item.xdata.slice(item.xdata.indexOf("-") + 1)); item?.list?.forEach((iten) => { if (iten.name == "case") { @@ -1072,7 +1072,7 @@ export default { }, }, { - name: "人均学习时长", + name: "人均学习时长111", type: "line", data: [], yAxisIndex: 1, From 1dc8e4591768ce96c7b9b5f47295f83b95f0ff1f Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Thu, 24 Aug 2023 17:31:50 +0800 Subject: [PATCH 19/56] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A6=82=E8=A7=88=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Operational.vue | 120 ++++++++++++++++++++++++++----- 1 file changed, 104 insertions(+), 16 deletions(-) diff --git a/src/views/report/Operational.vue b/src/views/report/Operational.vue index 23bc415a..8d5e7791 100644 --- a/src/views/report/Operational.vue +++ b/src/views/report/Operational.vue @@ -144,6 +144,9 @@ />
+
+ +
@@ -339,6 +342,9 @@ export default { day: [], }, modalFlag: false, + checkedList: [], + limitCheckedList: [], + plainOptions: ['学习人数', '总学习时长', '人均学习时长'], }); const surfaceRef = ref(null); const surface1Ref = ref(null); @@ -350,6 +356,19 @@ export default { const datess = ref(); const hackValues = ref(); + + const checkboxChange = (event) => { + console.log("checkboxChange event:",event); + if(event.length>2){ + message.warning("最多选两个"); + console.log("checkboxChange checkedList:",state.checkedList); + state.checkedList = state.limitCheckedList; + }else{ + state.limitCheckedList = event; + modalChange(); + } + }; + const eChartClickRight = async () => { state.modalFlag = true; @@ -658,10 +677,27 @@ export default { }); option.value.xAxis.data = xData; // 右侧坐标轴数据 - option.value.series[0].data = count; - //左侧坐标轴数据 - option.value.series[1].data = avgDuration; - option.value.series[2].data = duration; + // option.value.series[0].data = count; + // //左侧坐标轴数据 + // option.value.series[1].data = avgDuration; + // option.value.series[2].data = duration; + option.value.series[0].data = []; + option.value.series[1].data = []; + option.value.series[2].data = []; + console.log("checkedList:",state.checkedList); + for(let i=0;i Date: Thu, 24 Aug 2023 17:40:31 +0800 Subject: [PATCH 20/56] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A6=82=E8=A7=88=E6=97=B6=E9=97=B4=E5=8F=82=E6=95=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Overvoew.vue | 52 +++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index a47e07e6..af1058da 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -341,8 +341,8 @@ export default { name: state.name, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, creator: state.creator, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", }, headers: { token: Cookies.get("token"), @@ -475,8 +475,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", }, responseType: "blob", headers: { @@ -495,8 +495,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", }, responseType: "blob", headers: { @@ -515,8 +515,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", }, responseType: "blob", headers: { @@ -535,8 +535,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", }, responseType: "blob", headers: { @@ -555,8 +555,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", }, responseType: "blob", headers: { @@ -573,8 +573,8 @@ export default { name: state.name, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startCreateTime: state.publishTime[0]+" 00:00:01", + endCreateTime: state.publishTime[1]+" 23:59:59", }, responseType: "blob", headers: { @@ -597,8 +597,8 @@ export default { //考试列表 const res = await api.boeuExamPageList({ creator: state.creator, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, testName: state.name, page: state.pageNo, @@ -619,8 +619,8 @@ export default { //案例列表 const res = await api.boeuCasePageList({ author: state.creator, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, title: state.name, page: state.pageNo, @@ -646,8 +646,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", }); const list = res.data.result.rows.map((item) => { return { @@ -665,8 +665,8 @@ export default { teachingName: state.name, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", }); const list = res.data.result.rows?.map((item) => { return { @@ -684,8 +684,8 @@ export default { routerName: state.name, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", }); const list = res.data.result.rows?.map((item) => { return { @@ -703,8 +703,8 @@ export default { orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, projectName: state.name, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startCreateTime: state.publishTime[0]+" 00:00:01", + endCreateTime: state.publishTime[1]+" 23:59:59", }); if (res) { const fun = (arr) => { From 04ba1e3a5a9aa7b7272b4232ad1666c86d12ecc9 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Thu, 24 Aug 2023 17:42:36 +0800 Subject: [PATCH 21/56] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/ReportProject.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/report/ReportProject.vue b/src/views/report/ReportProject.vue index 0d793773..9338b12c 100644 --- a/src/views/report/ReportProject.vue +++ b/src/views/report/ReportProject.vue @@ -195,7 +195,7 @@ export default { resetOrgId: [], projectName: "", createName: "", - publishTime: "", // 发布时间 + publishTime: [], // 发布时间 selectedRowKeys: [], // 选中的列 status: null, stateOptions: [ @@ -229,8 +229,8 @@ export default { params.createName = state.createName; params.projectName = state.projectName; // params.publishTime = state.publishTime; - params.startTime = state.publishTime[0]; - params.endTime = state.publishTime[1]; + params.startPublishTime = state.publishTime[0]; + params.endPublishTime = state.publishTime[1]; params.page = state.pageNo; params.size = state.pageSize; params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null; @@ -278,8 +278,8 @@ export default { params.createName = state.createName; params.projectName = state.projectName; // params.publishTime = state.publishTime; - params.startTime = state.publishTime[0]; - params.endTime = state.publishTime[1]; + params.startPublishTime = state.publishTime[0]; + params.endPublishTime = state.publishTime[1]; params.page = state.pageNo; params.size = state.pageSize; params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null; @@ -347,8 +347,8 @@ export default { params.createName = state.createName; params.projectName = state.projectName; // params.publishTime = state.publishTime; - params.startTime = state.publishTime[0]; - params.endTime = state.publishTime[1]; + params.startPublishTime = state.publishTime[0]; + params.endPublishTime = state.publishTime[1]; params.page = state.pageNo; params.size = state.pageSize; params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null; From 77403942c57db7043543024a215ac58e4d3c69f8 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Thu, 24 Aug 2023 17:44:12 +0800 Subject: [PATCH 22/56] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/ReportProject.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/report/ReportProject.vue b/src/views/report/ReportProject.vue index 9338b12c..1b07942e 100644 --- a/src/views/report/ReportProject.vue +++ b/src/views/report/ReportProject.vue @@ -229,8 +229,8 @@ export default { params.createName = state.createName; params.projectName = state.projectName; // params.publishTime = state.publishTime; - params.startPublishTime = state.publishTime[0]; - params.endPublishTime = state.publishTime[1]; + params.startPublishTime = state.publishTime[0]+" 00:00:01"; + params.endPublishTime = state.publishTime[1]+" 23:59:59"; params.page = state.pageNo; params.size = state.pageSize; params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null; @@ -278,8 +278,8 @@ export default { params.createName = state.createName; params.projectName = state.projectName; // params.publishTime = state.publishTime; - params.startPublishTime = state.publishTime[0]; - params.endPublishTime = state.publishTime[1]; + params.startPublishTime = state.publishTime[0]+" 00:00:01"; + params.endPublishTime = state.publishTime[1]+" 23:59:59"; params.page = state.pageNo; params.size = state.pageSize; params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null; @@ -347,8 +347,8 @@ export default { params.createName = state.createName; params.projectName = state.projectName; // params.publishTime = state.publishTime; - params.startPublishTime = state.publishTime[0]; - params.endPublishTime = state.publishTime[1]; + params.startPublishTime = state.publishTime[0]+" 00:00:01"; + params.endPublishTime = state.publishTime[1]+" 23:59:59"; params.page = state.pageNo; params.size = state.pageSize; params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null; From a6008c248ba9c9cc5e83d98cc350c9a86f12f749 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Thu, 24 Aug 2023 17:45:25 +0800 Subject: [PATCH 23/56] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Learningpathmap.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/report/Learningpathmap.vue b/src/views/report/Learningpathmap.vue index 4b7fadc6..2f39ffb1 100644 --- a/src/views/report/Learningpathmap.vue +++ b/src/views/report/Learningpathmap.vue @@ -379,8 +379,8 @@ export default { orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, routerName: state.routerName, createName: state.createName, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", // publishTime: state.publishTime, name: state.name, }); @@ -427,8 +427,8 @@ export default { const params = { createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", routerName: state.routerName, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, }; @@ -469,8 +469,8 @@ export default { const params = { createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", routerName: state.routerName, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, }; From fbe0d103b36776c4c49389068e26e7a217285c1c Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Thu, 24 Aug 2023 17:47:16 +0800 Subject: [PATCH 24/56] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index 83fa8184..ac788f7a 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -206,8 +206,8 @@ export default { type: state.type ? state.type[state.type.length - 1]:null, createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", }; const res = await api.boeuCourseListPageV2(params); if (res) { @@ -445,8 +445,8 @@ export default { type: state.type ? state.type[state.type.length - 1]:null, createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", }; axios({ method: "post", @@ -495,8 +495,8 @@ export default { type: state.type ? state.type[state.type.length - 1]:null, createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", }; axios({ method: "post", @@ -563,8 +563,8 @@ export default { type: state.type ? state.type[state.type.length - 1]:null, createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", }; axios({ method: "post", From eb69140296833b71fef0f8116b3b7227b6d80a42 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Thu, 24 Aug 2023 17:48:11 +0800 Subject: [PATCH 25/56] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Caseess.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/report/Caseess.vue b/src/views/report/Caseess.vue index e9f2c963..6f6773fe 100644 --- a/src/views/report/Caseess.vue +++ b/src/views/report/Caseess.vue @@ -276,8 +276,8 @@ export default { author: state.author, authorName: state.authorName, // publishTime: state.publishTime, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:00", + endTime: state.publishTime[1]+" 23:59:59", boeRouterInfoName: state.boeRouterInfoName, }); if (res) { @@ -332,8 +332,8 @@ export default { title: state.title, author: state.author, // publishTime: state.publishTime, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:00", + endTime: state.publishTime[1]+" 23:59:59", }; axios({ method: "post", From 69c9ac4c4c502ab26ad2f65fda6a891c0e8555ac Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Thu, 24 Aug 2023 17:49:21 +0800 Subject: [PATCH 26/56] =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/ReportArticle.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/report/ReportArticle.vue b/src/views/report/ReportArticle.vue index 0392304e..afe83fce 100644 --- a/src/views/report/ReportArticle.vue +++ b/src/views/report/ReportArticle.vue @@ -169,8 +169,8 @@ export default { } if (state.publishTime.length>0) { // params.publishTime = state.publishTime; - params.startTime = state.publishTime[0]; - params.endTime = state.publishTime[1]; + params.startTime = state.publishTime[0]+" 00:00:00"; + params.endTime = state.publishTime[1]+" 23:59:59"; } axios({ method: "post", @@ -202,8 +202,8 @@ export default { title: state.title, createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:00", + endTime: state.publishTime[1]+" 23:59:59", page: state.pageNo, size: state.pageSize }; @@ -215,8 +215,8 @@ export default { } if (state.publishTime.length>0) { // params.publishTime = state.publishTime; - params.startTime = state.publishTime[0]; - params.endTime = state.publishTime[1]; + params.startTime = state.publishTime[0]+" 00:00:00"; + params.endTime = state.publishTime[1]+" 23:59:59"; } const res = await api.boeuArticlePageList(params); if (res) { From a50ae19ad4f4d76031e9d1825fd1b21286204fd3 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Thu, 24 Aug 2023 17:50:13 +0800 Subject: [PATCH 27/56] =?UTF-8?q?=E9=97=AE=E7=AD=94=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Questionsandanswers.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/report/Questionsandanswers.vue b/src/views/report/Questionsandanswers.vue index f1bffe83..80fb7bba 100644 --- a/src/views/report/Questionsandanswers.vue +++ b/src/views/report/Questionsandanswers.vue @@ -130,8 +130,8 @@ export default { title: state.title, createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", pageNo: state.pageNo, pageSize: state.pageSize, }; @@ -249,8 +249,8 @@ export default { title: state.title, createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", pageNo: state.pageNo, pageSize: state.pageSize, }; From 0d6bc6bd55802ce8763e336d17decdd7ab3ac9ed Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Thu, 24 Aug 2023 17:51:08 +0800 Subject: [PATCH 28/56] =?UTF-8?q?=E8=80=83=E8=AF=95=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/ReportExamination.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/report/ReportExamination.vue b/src/views/report/ReportExamination.vue index f5c4ba12..70c66604 100644 --- a/src/views/report/ReportExamination.vue +++ b/src/views/report/ReportExamination.vue @@ -424,8 +424,8 @@ export default { // userNo: state.userNo, testName: state.testName, creator: state.creator, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", // name: state.name, departmentId: state.orgId ? state.orgId[state.orgId.length - 1] : null, // bandCode: state.band, @@ -465,8 +465,8 @@ export default { // name: state.name, testName: state.testName, creator: state.creator, - startTime: state.publishTime[0], - endTime: state.publishTime[1], + startTime: state.publishTime[0]+" 00:00:01", + endTime: state.publishTime[1]+" 23:59:59", departmentId: state.orgId ? state.orgId[state.orgId.length - 1] : null, // bandCode: state.band, }, From a24364923697458fefc787f7001a453eed78ae9c Mon Sep 17 00:00:00 2001 From: "BOE\\10867418" Date: Fri, 25 Aug 2023 09:28:18 +0800 Subject: [PATCH 29/56] =?UTF-8?q?undefined=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Caseess.vue | 8 ++-- src/views/report/Curriculum.vue | 16 ++++---- src/views/report/Learningpathmap.vue | 12 +++--- src/views/report/Overvoew.vue | 52 ++++++++++++------------ src/views/report/Questionsandanswers.vue | 8 ++-- src/views/report/ReportArticle.vue | 8 ++-- src/views/report/ReportExamination.vue | 8 ++-- src/views/report/ReportProject.vue | 12 +++--- 8 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/views/report/Caseess.vue b/src/views/report/Caseess.vue index 6f6773fe..a2ac1bb9 100644 --- a/src/views/report/Caseess.vue +++ b/src/views/report/Caseess.vue @@ -276,8 +276,8 @@ export default { author: state.author, authorName: state.authorName, // publishTime: state.publishTime, - startTime: state.publishTime[0]+" 00:00:00", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00", + endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59", boeRouterInfoName: state.boeRouterInfoName, }); if (res) { @@ -332,8 +332,8 @@ export default { title: state.title, author: state.author, // publishTime: state.publishTime, - startTime: state.publishTime[0]+" 00:00:00", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00", + endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59", }; axios({ method: "post", diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index ac788f7a..2f88e19f 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -206,8 +206,8 @@ export default { type: state.type ? state.type[state.type.length - 1]:null, createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00", + endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59", }; const res = await api.boeuCourseListPageV2(params); if (res) { @@ -445,8 +445,8 @@ export default { type: state.type ? state.type[state.type.length - 1]:null, createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00", + endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59", }; axios({ method: "post", @@ -495,8 +495,8 @@ export default { type: state.type ? state.type[state.type.length - 1]:null, createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00", + endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59", }; axios({ method: "post", @@ -563,8 +563,8 @@ export default { type: state.type ? state.type[state.type.length - 1]:null, createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00", + endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59", }; axios({ method: "post", diff --git a/src/views/report/Learningpathmap.vue b/src/views/report/Learningpathmap.vue index 2f39ffb1..cb06ca47 100644 --- a/src/views/report/Learningpathmap.vue +++ b/src/views/report/Learningpathmap.vue @@ -379,8 +379,8 @@ export default { orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, routerName: state.routerName, createName: state.createName, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] + " 00:00:01", + endTime: typeof state.publishTime[1] == 'undefined' ? null : state.publishTime[1] + " 23:59:59", // publishTime: state.publishTime, name: state.name, }); @@ -427,8 +427,8 @@ export default { const params = { createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] + " 00:00:01", + endTime: typeof state.publishTime[1] == 'undefined' ? null : state.publishTime[1] + " 23:59:59", routerName: state.routerName, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, }; @@ -469,8 +469,8 @@ export default { const params = { createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] + " 00:00:01", + endTime: typeof state.publishTime[1] == 'undefined' ? null : state.publishTime[1] + " 23:59:59", routerName: state.routerName, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, }; diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index af1058da..892fa04b 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -341,8 +341,8 @@ export default { name: state.name, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, creator: state.creator, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", }, headers: { token: Cookies.get("token"), @@ -475,8 +475,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", }, responseType: "blob", headers: { @@ -495,8 +495,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", }, responseType: "blob", headers: { @@ -515,8 +515,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", }, responseType: "blob", headers: { @@ -535,8 +535,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", }, responseType: "blob", headers: { @@ -555,8 +555,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", }, responseType: "blob", headers: { @@ -573,8 +573,8 @@ export default { name: state.name, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startCreateTime: state.publishTime[0]+" 00:00:01", - endCreateTime: state.publishTime[1]+" 23:59:59", + startCreateTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endCreateTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", }, responseType: "blob", headers: { @@ -597,8 +597,8 @@ export default { //考试列表 const res = await api.boeuExamPageList({ creator: state.creator, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, testName: state.name, page: state.pageNo, @@ -619,8 +619,8 @@ export default { //案例列表 const res = await api.boeuCasePageList({ author: state.creator, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, title: state.name, page: state.pageNo, @@ -646,8 +646,8 @@ export default { ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", }); const list = res.data.result.rows.map((item) => { return { @@ -665,8 +665,8 @@ export default { teachingName: state.name, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", }); const list = res.data.result.rows?.map((item) => { return { @@ -684,8 +684,8 @@ export default { routerName: state.name, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", }); const list = res.data.result.rows?.map((item) => { return { @@ -703,8 +703,8 @@ export default { orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, projectName: state.name, - startCreateTime: state.publishTime[0]+" 00:00:01", - endCreateTime: state.publishTime[1]+" 23:59:59", + startCreateTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endCreateTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", }); if (res) { const fun = (arr) => { diff --git a/src/views/report/Questionsandanswers.vue b/src/views/report/Questionsandanswers.vue index 80fb7bba..c633e39a 100644 --- a/src/views/report/Questionsandanswers.vue +++ b/src/views/report/Questionsandanswers.vue @@ -130,8 +130,8 @@ export default { title: state.title, createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", pageNo: state.pageNo, pageSize: state.pageSize, }; @@ -249,8 +249,8 @@ export default { title: state.title, createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0] +" 00:00:01", + endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", pageNo: state.pageNo, pageSize: state.pageSize, }; diff --git a/src/views/report/ReportArticle.vue b/src/views/report/ReportArticle.vue index afe83fce..a210253c 100644 --- a/src/views/report/ReportArticle.vue +++ b/src/views/report/ReportArticle.vue @@ -169,8 +169,8 @@ export default { } if (state.publishTime.length>0) { // params.publishTime = state.publishTime; - params.startTime = state.publishTime[0]+" 00:00:00"; - params.endTime = state.publishTime[1]+" 23:59:59"; + params.startTime = typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+" 00:00:00"; + params.endTime = typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59"; } axios({ method: "post", @@ -202,8 +202,8 @@ export default { title: state.title, createName: state.createName, // publishTime: state.publishTime, - startTime: state.publishTime[0]+" 00:00:00", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+" 00:00:00", + endTime: typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59", page: state.pageNo, size: state.pageSize }; diff --git a/src/views/report/ReportExamination.vue b/src/views/report/ReportExamination.vue index 70c66604..06948b28 100644 --- a/src/views/report/ReportExamination.vue +++ b/src/views/report/ReportExamination.vue @@ -424,8 +424,8 @@ export default { // userNo: state.userNo, testName: state.testName, creator: state.creator, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00", + endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59", // name: state.name, departmentId: state.orgId ? state.orgId[state.orgId.length - 1] : null, // bandCode: state.band, @@ -465,8 +465,8 @@ export default { // name: state.name, testName: state.testName, creator: state.creator, - startTime: state.publishTime[0]+" 00:00:01", - endTime: state.publishTime[1]+" 23:59:59", + startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00", + endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59", departmentId: state.orgId ? state.orgId[state.orgId.length - 1] : null, // bandCode: state.band, }, diff --git a/src/views/report/ReportProject.vue b/src/views/report/ReportProject.vue index 1b07942e..3cc50578 100644 --- a/src/views/report/ReportProject.vue +++ b/src/views/report/ReportProject.vue @@ -229,8 +229,8 @@ export default { params.createName = state.createName; params.projectName = state.projectName; // params.publishTime = state.publishTime; - params.startPublishTime = state.publishTime[0]+" 00:00:01"; - params.endPublishTime = state.publishTime[1]+" 23:59:59"; + params.startPublishTime =typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+" 00:00:01"; + params.endPublishTime = typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59"; params.page = state.pageNo; params.size = state.pageSize; params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null; @@ -278,8 +278,8 @@ export default { params.createName = state.createName; params.projectName = state.projectName; // params.publishTime = state.publishTime; - params.startPublishTime = state.publishTime[0]+" 00:00:01"; - params.endPublishTime = state.publishTime[1]+" 23:59:59"; + params.startPublishTime =typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+" 00:00:01"; + params.endPublishTime = typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59"; params.page = state.pageNo; params.size = state.pageSize; params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null; @@ -347,8 +347,8 @@ export default { params.createName = state.createName; params.projectName = state.projectName; // params.publishTime = state.publishTime; - params.startPublishTime = state.publishTime[0]+" 00:00:01"; - params.endPublishTime = state.publishTime[1]+" 23:59:59"; + params.startPublishTime =typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+" 00:00:01"; + params.endPublishTime = typeof state.publishTime[1] === 'undefined' ? null : state.publishTime[1]+" 23:59:59"; params.page = state.pageNo; params.size = state.pageSize; params.orgId = state.orgId ? state.orgId[state.orgId.length - 1] : null; From 207dfd73f117e507dd6532bcc5c129a6cadbfa6b Mon Sep 17 00:00:00 2001 From: "BOE\\10867418" Date: Fri, 25 Aug 2023 10:26:20 +0800 Subject: [PATCH 30/56] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=91=E4=B8=8D?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=8E=BB=E9=99=A4=E5=8B=BE=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 4 ++-- src/views/report/Employeelearning.vue | 5 +---- src/views/report/Examination.vue | 2 +- src/views/report/Overvoew.vue | 2 +- src/views/report/ReportExamination.vue | 2 +- src/views/report/ReportProject.vue | 2 +- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index 2f88e19f..915ab694 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -167,7 +167,7 @@ export default { type: null, createName: "", publishTime: "", // 发布时间 - allowClear: true, + allowClear: false, option: [], selectedRowKeys: [], typeOption:[] @@ -190,7 +190,7 @@ export default { state.option = res.data?.result.orgTreeList; state.orgId = res.data?.result.treeNodeList; state.resetOrgId = res.data?.result.treeNodeList; - state.allowClear = true + state.allowClear = false getTableData(); } }; diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index 9d150f10..15f958e9 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -17,7 +17,7 @@ v-model:value="orgId" style="width: 100%" placeholder="请选择归属组织" - :allowClear="allowClear" + :allowClear = false :fieldNames="{ label: 'orgName', value: 'organizationId', @@ -221,9 +221,6 @@ export default { state.option = res.data?.result.orgTreeList; state.orgId = res.data?.result.treeNodeList; state.resetOrgId = res.data?.result.treeNodeList; - res.data?.result?.userType === 1 - ? (state.allowClear = true) - : (state.allowClear = false); getTableData(); } }; diff --git a/src/views/report/Examination.vue b/src/views/report/Examination.vue index 0ae8ebe3..f0dac1fe 100644 --- a/src/views/report/Examination.vue +++ b/src/views/report/Examination.vue @@ -28,7 +28,7 @@ :options="option" placeholder="请选择组织" v-model:value="orgId" - :allowClear="allowClear" + :allowClear= false style="width: 100%" :fieldNames="{ label: 'name', diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index 892fa04b..9ad0dfea 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -17,7 +17,7 @@ v-model:value="orgId" style="width: 100%" placeholder="请选择归属组织" - :allowClear="allowClear" + :allowClear=false :fieldNames="{ label: 'orgName', value: 'organizationId', diff --git a/src/views/report/ReportExamination.vue b/src/views/report/ReportExamination.vue index 06948b28..671e21f0 100644 --- a/src/views/report/ReportExamination.vue +++ b/src/views/report/ReportExamination.vue @@ -17,7 +17,7 @@ v-model:value="orgId" style="width: 100%" placeholder="请选择归属组织" - :allowClear="allowClear" + :allowClear=false :fieldNames="{ label: 'orgName', value: 'organizationId', diff --git a/src/views/report/ReportProject.vue b/src/views/report/ReportProject.vue index 3cc50578..c2ff5827 100644 --- a/src/views/report/ReportProject.vue +++ b/src/views/report/ReportProject.vue @@ -30,7 +30,7 @@ v-model:value="orgId" style="width: 100%" placeholder="请选择归属组织" - :allowClear="allowClear" + :allowClear=false :fieldNames="{ label: 'orgName', value: 'organizationId', From 4d12dcf3b27f3c0b0957d56b705d2d8b3c8c8100 Mon Sep 17 00:00:00 2001 From: "BOE\\10867418" Date: Fri, 25 Aug 2023 11:13:13 +0800 Subject: [PATCH 31/56] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E7=A6=81=E7=94=A8=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Learningpathmap.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/report/Learningpathmap.vue b/src/views/report/Learningpathmap.vue index cb06ca47..e67ba079 100644 --- a/src/views/report/Learningpathmap.vue +++ b/src/views/report/Learningpathmap.vue @@ -10,7 +10,7 @@ v-model:value="orgId" style="width: 100%" placeholder="请选择归属组织" - :allowClear="allowClear" + :allowClear = false :fieldNames="{ label: 'orgName', value: 'organizationId', @@ -143,11 +143,9 @@ import downLoad from "../../utils/downLoad"; import Cookies from "vue-cookies"; import axios from "axios"; import dayjs from "dayjs"; -import { useStore } from "vuex"; export default { name: "LearningPathMap", setup() { - const store = useStore(); const state = reactive({ tableLoading: false, // table加载图标 tableDataTotal: 0, // 数据总条数 From 35995b736c9c472bf5e882b6e66fad156a5b728f Mon Sep 17 00:00:00 2001 From: "BOE\\10867418" Date: Fri, 25 Aug 2023 11:17:44 +0800 Subject: [PATCH 32/56] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=A6=81=E6=AD=A2=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Caseess.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/report/Caseess.vue b/src/views/report/Caseess.vue index a2ac1bb9..2d207078 100644 --- a/src/views/report/Caseess.vue +++ b/src/views/report/Caseess.vue @@ -39,7 +39,7 @@ v-model:value="orgId" style="width: 100%" placeholder="请选择归属组织" - :allowClear="allowClear" + :allowClear = false :fieldNames="{ label: 'orgName', value: 'organizationId', @@ -162,7 +162,6 @@ export default { state.option = res.data?.result.orgTreeList; state.orgId = res.data?.result.treeNodeList; state.resetOrgId = res.data?.result.treeNodeList; - state.allowClear = true; getTableData(); } }; From d3a5c29cf4e8cd09270c6ac7cdb4174eca92ad31 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Fri, 25 Aug 2023 13:56:46 +0800 Subject: [PATCH 33/56] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8D=95=E4=B8=AA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Employeelearning.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index 9d150f10..1c4fd80f 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -370,8 +370,8 @@ export default { const oneExport = (record) => { axios({ method: "get", - url: "/report/boeu/studyData/export", - params: { ids: `${record.record.basicBoeUserId}` }, + url: "/report/boeu/studyData/exportDetailed", + params: { ids: `${record.record.userId}` }, responseType: "blob", headers: { token: Cookies.get("token"), From 21a9a76ec436ffe4215f8b44c5dfc1c6f4dbc399 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Fri, 25 Aug 2023 14:13:22 +0800 Subject: [PATCH 34/56] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=92=8C=E8=80=83=E8=AF=95=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Employeelearning.vue | 3 ++- src/views/report/ReportExamination.vue | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index 9d144683..7d8fc43c 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -211,7 +211,7 @@ export default { const onSelectChange = (selectedRowKeys, record) => { state.selectedRowKeys = selectedRowKeys; state.ids = record?.map((item) => { - return item.basicBoeUserId; + return item.userId; }); }; //请求组织接口 @@ -229,6 +229,7 @@ export default { if (!state.selectedRowKeys?.length) { return message.warning("请至少选择一条数据进行导出"); } else { + console.log("导出 state.ids:",state.ids); axios({ method: "get", url: "/report/boeu/studyData/export", diff --git a/src/views/report/ReportExamination.vue b/src/views/report/ReportExamination.vue index 671e21f0..eb69e84d 100644 --- a/src/views/report/ReportExamination.vue +++ b/src/views/report/ReportExamination.vue @@ -177,7 +177,7 @@ export default { const onSelectChange = (selectedRowKeys, record) => { state.selectedRowKeys = selectedRowKeys; state.ids = record?.map((item) => { - return item.basicBoeUserId; + return item.id; }); }; //请求组织接口 @@ -401,7 +401,7 @@ export default { axios({ method: "get", url: "/report/boeu/studyData/export", - params: { ids: `${record.record.basicBoeUserId}` }, + params: { ids: `${record.record.id}` }, responseType: "blob", headers: { token: Cookies.get("token"), From 39889738688040a4bd88a959c781fb839b6d2607 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Fri, 25 Aug 2023 14:30:12 +0800 Subject: [PATCH 35/56] =?UTF-8?q?=E8=80=83=E8=AF=95=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/ReportExamination.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/report/ReportExamination.vue b/src/views/report/ReportExamination.vue index eb69e84d..dde2131c 100644 --- a/src/views/report/ReportExamination.vue +++ b/src/views/report/ReportExamination.vue @@ -200,7 +200,7 @@ export default { } else { axios({ method: "get", - url: "/report/boeu/studyData/export", + url: "/report/boeu/exam/export", params: { ids: `${state.ids}` }, responseType: "blob", headers: { @@ -399,9 +399,9 @@ export default { // 行内单条下载 const oneExport = (record) => { axios({ - method: "get", - url: "/report/boeu/studyData/export", - params: { ids: `${record.record.id}` }, + method: "post", + url: "/report/boeu/exam/export/detail/v2", + data: { ids: [`${record.record.id}`] }, responseType: "blob", headers: { token: Cookies.get("token"), @@ -459,7 +459,7 @@ export default { const exportAllbtnz = async () => { axios({ method: "post", - url: "/report/boeu/studyData/exportAll", + url: "/report/boeu/exam/export/list/v2", data: { // userNo: state.userNo, // name: state.name, From 0e4675b8bf2db5562bd059f98f1c83e3d15ebaf5 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Fri, 25 Aug 2023 14:33:05 +0800 Subject: [PATCH 36/56] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=A1=B6=E9=83=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Employeelearning.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index 7d8fc43c..d733ebb8 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -211,7 +211,7 @@ export default { const onSelectChange = (selectedRowKeys, record) => { state.selectedRowKeys = selectedRowKeys; state.ids = record?.map((item) => { - return item.userId; + return item.id; }); }; //请求组织接口 @@ -229,7 +229,6 @@ export default { if (!state.selectedRowKeys?.length) { return message.warning("请至少选择一条数据进行导出"); } else { - console.log("导出 state.ids:",state.ids); axios({ method: "get", url: "/report/boeu/studyData/export", From 4fdb2a1f53adb7c98b3db59f8981c11d09eb6eb2 Mon Sep 17 00:00:00 2001 From: "BOE\\10867418" Date: Fri, 25 Aug 2023 14:38:34 +0800 Subject: [PATCH 37/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/ReportExamination.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/report/ReportExamination.vue b/src/views/report/ReportExamination.vue index dde2131c..ccb7fb63 100644 --- a/src/views/report/ReportExamination.vue +++ b/src/views/report/ReportExamination.vue @@ -207,7 +207,7 @@ export default { token: Cookies.get("token"), }, }).then((res) => { - downLoad(res.data, "学习员工数据.xlsx"); + downLoad(res.data, "考试列表.xlsx"); }); } }; From 0d2a5b1b7db8d8b80a5d6406c8dfad7c6df3fa34 Mon Sep 17 00:00:00 2001 From: "BOE\\10867418" Date: Fri, 25 Aug 2023 14:40:54 +0800 Subject: [PATCH 38/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=83=E8=AF=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/ReportExamination.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/report/ReportExamination.vue b/src/views/report/ReportExamination.vue index ccb7fb63..48d80d03 100644 --- a/src/views/report/ReportExamination.vue +++ b/src/views/report/ReportExamination.vue @@ -407,7 +407,7 @@ export default { token: Cookies.get("token"), }, }).then((res) => { - downLoad(res.data, "学习员工数据.xlsx"); + downLoad(res.data, "考试详细数据.xlsx"); }); }; //table 分页事件 From 683c78c29fa34c5f1299e0a328bfd9ff125cfb0a Mon Sep 17 00:00:00 2001 From: "BOE\\10867418" Date: Fri, 25 Aug 2023 14:48:49 +0800 Subject: [PATCH 39/56] =?UTF-8?q?=E8=80=83=E8=AF=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/ReportExamination.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/report/ReportExamination.vue b/src/views/report/ReportExamination.vue index 48d80d03..412f49f5 100644 --- a/src/views/report/ReportExamination.vue +++ b/src/views/report/ReportExamination.vue @@ -475,7 +475,7 @@ export default { token: Cookies.get("token"), }, }).then((res) => { - downLoad(res.data, "学习员工数据.xlsx"); + downLoad(res.data, "考试列表.xlsx"); }); }; onMounted(() => { From 687ed835bb9d5937a6f3159a80dd5a6277581c87 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Fri, 25 Aug 2023 17:42:48 +0800 Subject: [PATCH 40/56] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A6=82=E8=A7=88=E8=B0=83tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Overvoew.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index 9ad0dfea..7ee3b063 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -367,6 +367,7 @@ export default { state.name = ""; state.orgId = state.resetOrgId; getTableData(); + getTabData(); }; //请求组织接口 const getOrgList = async () => { @@ -732,6 +733,7 @@ export default { state.pageSize = 10; state.tableDataTotal = 0; getTableData(); + getTabData(); }; // cloumns 表头 const columns = ref([ From 1644672c977f71b206f5ce12268cf1cf58aa8e1b Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Mon, 28 Aug 2023 13:44:30 +0800 Subject: [PATCH 41/56] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A6=82=E8=A7=88=E9=BB=98=E8=AE=A4=E5=AD=A6=E4=B9=A0=E4=BA=BA?= =?UTF-8?q?=E6=95=B0=E5=92=8C=E6=80=BB=E5=AD=A6=E4=B9=A0=E6=97=B6=E9=95=BF?= =?UTF-8?q?=EF=BC=8C=E6=9C=88=E4=BB=BD=E5=88=B0=E6=9C=AC=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Operational.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/report/Operational.vue b/src/views/report/Operational.vue index 8d5e7791..4e948001 100644 --- a/src/views/report/Operational.vue +++ b/src/views/report/Operational.vue @@ -342,7 +342,7 @@ export default { day: [], }, modalFlag: false, - checkedList: [], + checkedList: ['学习人数', '总学习时长'], limitCheckedList: [], plainOptions: ['学习人数', '总学习时长', '人均学习时长'], }); @@ -1159,7 +1159,7 @@ export default { }, }, { - name: "人均学习时长111", + name: "人均学习时长", type: "line", data: [], yAxisIndex: 1, @@ -1493,7 +1493,9 @@ export default { }); }; const initTime = () => { - const monthEnd = dayjs(new Date()).endOf("year").format("YYYY-MM"); + console.log("initTime:",dayjs(new Date()).year()+"-"+(dayjs(new Date()).month())); + // const monthEnd = dayjs(new Date()).endOf("year").format("YYYY-MM"); + const monthEnd = dayjs(new Date()).year()+"-"+(dayjs(new Date()).month()+1); const start = dayjs(new Date()).startOf("year").format("YYYY-MM"); state.threeTime = [dayjs(start), dayjs(monthEnd)]; state.forTime = [dayjs(start), dayjs(monthEnd)]; From df6abbd53d79a405eefe339e99a2cec645783f11 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Mon, 28 Aug 2023 16:22:26 +0800 Subject: [PATCH 42/56] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A6=82=E8=A7=88=E6=8A=98=E7=BA=BF=E5=9B=BE=E5=9B=BE=E4=BE=8B?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Operational.vue | 85 ++++++++++++++++++++++++-------- 1 file changed, 64 insertions(+), 21 deletions(-) diff --git a/src/views/report/Operational.vue b/src/views/report/Operational.vue index 4e948001..fbfc3985 100644 --- a/src/views/report/Operational.vue +++ b/src/views/report/Operational.vue @@ -155,19 +155,19 @@
-
总学习人数
-
-
-
-
-
-
人均学习时长
+
{{chartLabel.one}}
-
总学习时长
+
{{chartLabel.two}}
+
+
+
+
+
+
{{chartLabel.three}}
@@ -345,6 +345,11 @@ export default { checkedList: ['学习人数', '总学习时长'], limitCheckedList: [], plainOptions: ['学习人数', '总学习时长', '人均学习时长'], + chartLabel: { + one: "学习人数", + two: "总学习时长", + three: "人均学习时长", + } }); const surfaceRef = ref(null); const surface1Ref = ref(null); @@ -597,6 +602,29 @@ export default { } else if (state.towParmasn.dateType == 1) { twoDatChange(state.towParmasn.day); } + console.log("modalChange type:",state.towParmasn.type); + if(state.towParmasn.type==2 || state.towParmasn.type==3){ + state.chartLabel.one = "总阅读人数"; + state.chartLabel.two = "总阅读时长"; + state.chartLabel.three = "人均阅读时长"; + state.plainOptions = ["总阅读人数","总阅读时长","人均阅读时长"]; + state.checkedList = ["总阅读人数","总阅读时长"]; + }else if(state.towParmasn.type==4){ + state.chartLabel.one = "总查看人数"; + state.chartLabel.two = "总提问人数"; + state.chartLabel.three = "总回答人数"; + state.plainOptions = ["总查看人数","总提问人数","总回答人数"]; + state.checkedList = ["总查看人数","总提问人数"]; + }else { + state.chartLabel.one = "学习人数"; + state.chartLabel.two = "总学习时长"; + state.chartLabel.three = "人均学习时长"; + state.plainOptions = ["学习人数","总学习时长","人均学习时长"]; + state.checkedList = ["学习人数","总学习时长"]; + } + option.value.series[0].name = state.chartLabel.one; + option.value.series[1].name = state.chartLabel.two; + option.value.series[2].name = state.chartLabel.two; }; const onCalendarChange = (val) => { dates.value = val; @@ -686,16 +714,19 @@ export default { option.value.series[2].data = []; console.log("checkedList:",state.checkedList); for(let i=0;i Date: Tue, 29 Aug 2023 17:17:45 +0800 Subject: [PATCH 43/56] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A6=82=E8=A7=88=E6=8A=98=E7=BA=BF=E5=9B=BE=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=9C=88=E6=97=A5=EF=BC=8C=E5=8F=8A=E5=9B=BE=E4=BE=8B=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Operational.vue | 38 +++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/src/views/report/Operational.vue b/src/views/report/Operational.vue index fbfc3985..46cbfca4 100644 --- a/src/views/report/Operational.vue +++ b/src/views/report/Operational.vue @@ -343,7 +343,7 @@ export default { }, modalFlag: false, checkedList: ['学习人数', '总学习时长'], - limitCheckedList: [], + limitCheckedList: ['学习人数', '总学习时长'], plainOptions: ['学习人数', '总学习时长', '人均学习时长'], chartLabel: { one: "学习人数", @@ -370,7 +370,12 @@ export default { state.checkedList = state.limitCheckedList; }else{ state.limitCheckedList = event; - modalChange(); + // modalChange(); + if (state.towParmasn.dateType == 2) { + twoMonthChange(state.towParmasn.time); + } else if (state.towParmasn.dateType == 1) { + twoDatChange(state.towParmasn.day); + } } }; @@ -597,11 +602,6 @@ export default { } }; const modalChange = async () => { - if (state.towParmasn.dateType == 2) { - twoMonthChange(state.towParmasn.time); - } else if (state.towParmasn.dateType == 1) { - twoDatChange(state.towParmasn.day); - } console.log("modalChange type:",state.towParmasn.type); if(state.towParmasn.type==2 || state.towParmasn.type==3){ state.chartLabel.one = "总阅读人数"; @@ -609,22 +609,30 @@ export default { state.chartLabel.three = "人均阅读时长"; state.plainOptions = ["总阅读人数","总阅读时长","人均阅读时长"]; state.checkedList = ["总阅读人数","总阅读时长"]; + state.limitCheckedList = ["总阅读人数","总阅读时长"]; }else if(state.towParmasn.type==4){ state.chartLabel.one = "总查看人数"; state.chartLabel.two = "总提问人数"; state.chartLabel.three = "总回答人数"; state.plainOptions = ["总查看人数","总提问人数","总回答人数"]; state.checkedList = ["总查看人数","总提问人数"]; + state.limitCheckedList = ["总查看人数","总提问人数"]; }else { state.chartLabel.one = "学习人数"; state.chartLabel.two = "总学习时长"; state.chartLabel.three = "人均学习时长"; state.plainOptions = ["学习人数","总学习时长","人均学习时长"]; state.checkedList = ["学习人数","总学习时长"]; + state.limitCheckedList = ["学习人数","总学习时长"]; } option.value.series[0].name = state.chartLabel.one; option.value.series[1].name = state.chartLabel.two; option.value.series[2].name = state.chartLabel.two; + if (state.towParmasn.dateType == 2) { + twoMonthChange(state.towParmasn.time); + } else if (state.towParmasn.dateType == 1) { + twoDatChange(state.towParmasn.day); + } }; const onCalendarChange = (val) => { dates.value = val; @@ -669,20 +677,22 @@ export default { return tooEarly || tooLate; }; const twoSelectChange = async (e) => { - if (e == 1) { + if (e == 2) { twoMonthChange(state.towParmasn.time); - } else if (e == 0) { + } else if (e == 1) { twoDatChange(state.towParmasn.day); } }; // 获取图表2月份数据 const twoMonthChange = async (e) => { - if (e?.length > 0) { - const monthEnd = dayjs(e[1]) + console.log("twoMonthChange e:",e); + // if (e?.length > 0) { + if (true) { + const monthEnd = dayjs(state.towParmasn.time[1]) .endOf("month") .format("YYYY-MM-DD 23:59:59"); const res = await api.boeuStudyDataGetStudyStaisticsList({ - beginTime: dayjs(e[0]).format("YYYY-MM-01 00:00:01"), + beginTime: dayjs(state.towParmasn.time[0]).format("YYYY-MM-01 00:00:01"), endTime: monthEnd, dateType: state.towParmasn.dateType, type: state.towParmasn.type, @@ -775,7 +785,9 @@ export default { } }; const twoDatChange = async (e) => { - if (e?.length > 0) { + console.log("twoDatChange e:",e); + // if (e?.length > 0) { + if (true) { const dayStart = dayjs(e[0]) .startOf("day") .format("YYYY-MM-DD 00:00:01"); From a9c461eb7f75c7652548f5e8a8686ea751044c2a Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Tue, 29 Aug 2023 18:08:41 +0800 Subject: [PATCH 44/56] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A6=82=E8=A7=88=E5=88=9D=E5=A7=8B=E6=97=B6=E9=97=B4=E6=94=B9?= =?UTF-8?q?=E6=9C=80=E8=BF=916=E4=B8=AA=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Operational.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/views/report/Operational.vue b/src/views/report/Operational.vue index 46cbfca4..8fe8511b 100644 --- a/src/views/report/Operational.vue +++ b/src/views/report/Operational.vue @@ -1547,10 +1547,21 @@ export default { }); }; const initTime = () => { - console.log("initTime:",dayjs(new Date()).year()+"-"+(dayjs(new Date()).month())); + // console.log("initTime:",dayjs(new Date()).year()+"-"+(dayjs(new Date()).month())); // const monthEnd = dayjs(new Date()).endOf("year").format("YYYY-MM"); + var year = dayjs(new Date()).year(); + var month = dayjs(new Date()).month()+1; + console.log("initTime year:",year,"month:",month); + var year1 = year; + var month1 = parseInt(month) - 5; + if(month1<=0){ + year1 = parseInt(year1) - 1; + month1 = 12 - (Math.abs(month1)%12); + } + console.log("initTime year1:",year1,"month1:",month1); const monthEnd = dayjs(new Date()).year()+"-"+(dayjs(new Date()).month()+1); - const start = dayjs(new Date()).startOf("year").format("YYYY-MM"); + // const start = dayjs(new Date()).startOf("year").format("YYYY-MM"); + const start = year1 + "-" + month1; state.threeTime = [dayjs(start), dayjs(monthEnd)]; state.forTime = [dayjs(start), dayjs(monthEnd)]; state.towParmasn.time = [dayjs(start), dayjs(monthEnd)]; From 34ab7f2df14050f90581a7e91d3709d86992251c Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Tue, 29 Aug 2023 18:23:43 +0800 Subject: [PATCH 45/56] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=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 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index 7ee3b063..f1a219d4 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -75,7 +75,13 @@ :class="currentTab === index ? 'tabActive' : 'tabItem'" @click="tabClick(index)" > - {{ item.text }} ({{ item.num }}) + + + {{ item.text }} ({{ item.num }}) + + {{ item.text }} ({{ item.num }})
From cfc975e2e72cd8cc2885e9dbbbb0ba23f006e4c2 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Wed, 30 Aug 2023 14:04:52 +0800 Subject: [PATCH 46/56] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A6=82=E8=A7=88=E9=A1=B9=E7=9B=AEhover?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Overvoew.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index f1a219d4..da25e649 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -75,9 +75,9 @@ :class="currentTab === index ? 'tabActive' : 'tabItem'" @click="tabClick(index)" > - + {{ item.text }} ({{ item.num }}) From 40291379084c0d4d6d0f6503d4ed4c7582974ff2 Mon Sep 17 00:00:00 2001 From: "BOE\\10867418" Date: Wed, 30 Aug 2023 14:53:19 +0800 Subject: [PATCH 47/56] =?UTF-8?q?=E8=80=83=E8=AF=95=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87id?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Overvoew.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index f1a219d4..77cc8b22 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -498,7 +498,7 @@ export default { url: "/report/boeu/exam/exportAll", data: { name: state.name, - organizationId: state.orgId + orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, createName: state.creator, From c013ff62cedc6706f3c90d55a5cb0b996a31e494 Mon Sep 17 00:00:00 2001 From: "BOE\\10867418" Date: Fri, 1 Sep 2023 15:21:10 +0800 Subject: [PATCH 48/56] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/NavLeft.vue | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 6a17eac6..8eb41165 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -369,7 +369,7 @@
- +
- + 学习路径图 - + 项目 - + 课程 - + 案例 - + 文章 - + 问答 - +
- + 概览 - + Date: Fri, 1 Sep 2023 15:48:35 +0800 Subject: [PATCH 49/56] =?UTF-8?q?=E7=88=B6=E7=BA=A7=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/NavLeft.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 8eb41165..156d7c1a 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -300,7 +300,7 @@ --> - + - + 案例管理 - + 下载中心 - +