From 87120ddac3d0488503e0d6e3e9524ab6d8e9a1dc Mon Sep 17 00:00:00 2001 From: Pengxiansen <2422914688@qq.com> Date: Fri, 28 Feb 2025 20:51:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/configGrowth.js | 4 ++-- src/components/NavLeft.vue | 4 ++-- src/views/report/Employeelearning.vue | 16 ++++++++-------- src/views/report/Operational.vue | 8 ++++---- src/views/report/Overvoew.vue | 4 ++-- vue.config.js | 16 ++++++++-------- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/api/configGrowth.js b/src/api/configGrowth.js index ab3fedbe..2f010b28 100644 --- a/src/api/configGrowth.js +++ b/src/api/configGrowth.js @@ -18,8 +18,8 @@ import { boeRequest } from "@/api/request"; // "application/x-www-form-urlencoded"; axios.defaults.withCredentials = true; const http = axios.create({ - // baseURL: '/growth', - baseURL: process.env.VUE_APP_BASE_API_GROWTH, + baseURL: '/growth', + // baseURL: process.env.VUE_APP_BASE_API_GROWTH, timeout: 1000 * 15, // headers: { "Content-Type": "multipart/form-data" }, headers: { "Content-Type": "application/json" }, diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index d3c2bb85..aa4fe5c2 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -668,7 +668,7 @@
- + diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index c673753b..b6bd7ba6 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -392,7 +392,7 @@ export default { { text: "课程", num: res.data.result?.courseTotal }, { text: "考试", num: res.data.result?.examTotal }, { text: "案例", num: res.data.result?.caseTotal }, - // { text: "专业力", num: res.data.result?.growthTotal }, + { text: "专业力", num: res.data.result?.growthTotal }, ]; tabData.value = list; }); @@ -1009,7 +1009,7 @@ export default { { text: "课程", num: "11" }, { text: "考试", num: "10" }, { text: "案例", num: "10" }, - // { text: "专业力必修", num: "10" }, + { text: "专业力必修", num: "10" }, ]); const tabClick = (index) => { state.selectedRowKeys = []; diff --git a/vue.config.js b/vue.config.js index 326395b2..dd446eb2 100644 --- a/vue.config.js +++ b/vue.config.js @@ -18,16 +18,16 @@ module.exports = defineConfig({ overlay: false,// 解决代码抛出异常 }, proxy: { - "/professional": { - target: 'http://192.168.31.211:32002', - // target: 'http://192.168.50.195:32002', - // target: 'http://192.168.86.195:32002', - changeOrigin: true, - }, - // "/growth": { - // target: 'https:' + process.env.VUE_APP_BOE_API_URL, + // "/professional": { + // target: 'http://192.168.31.211:32002', + // // target: 'http://192.168.50.195:32002', + // // target: 'http://192.168.86.195:32002', // changeOrigin: true, // }, + "/growth": { + target: 'https:' + process.env.VUE_APP_BOE_API_URL, + changeOrigin: true, + }, "/manageApi": { target: 'https:' + process.env.VUE_APP_PROXY_URL, changeOrigin: true, //表示是否改变原域名 From 515efe913d28c6e5b7a29481a9a66d095f48e2eb Mon Sep 17 00:00:00 2001 From: Pengxiansen <2422914688@qq.com> Date: Fri, 28 Feb 2025 21:00:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/configGrowth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/configGrowth.js b/src/api/configGrowth.js index 2f010b28..345a98a9 100644 --- a/src/api/configGrowth.js +++ b/src/api/configGrowth.js @@ -54,7 +54,7 @@ http.interceptors.response.use( const { data: { code, msg, show }, } = response; - if (code === 0 || code === 200) { + if (code === 0 || code === 200 || response?.data?.status == 200) { return response; } else if (code === 1000) { window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath) From 577b3b5dc2af77cd748fa4cc4c8cf361aaa7fa53 Mon Sep 17 00:00:00 2001 From: Pengxiansen <2422914688@qq.com> Date: Sat, 1 Mar 2025 01:03:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/growthpath.js | 2 +- src/api/indexOvervoew.js | 2 +- src/views/report/Operational.vue | 2 +- src/views/report/Overvoew.vue | 63 ++++++-- src/views/report/growthpathmap.vue | 222 ++++++++++++----------------- 5 files changed, 148 insertions(+), 143 deletions(-) diff --git a/src/api/growthpath.js b/src/api/growthpath.js index 526ec549..aaf46d06 100644 --- a/src/api/growthpath.js +++ b/src/api/growthpath.js @@ -87,7 +87,7 @@ export const taskCompletionRate = (growthId) => http.get('/professional/manageme export const getStudyStatisticsList = (data) => http.post('/professional/statics/getStudyStatisticsList', data) // 专业力列表 -export const boeuGrowthPlatePageList = (obj) => http.post('/boeu/growth/pageList', obj) +export const boeuGrowthPlatePageList = (obj) => http.post('/boeu/grow/pageList', obj) // 是否按顺序学习 diff --git a/src/api/indexOvervoew.js b/src/api/indexOvervoew.js index 4230c132..f73cd516 100644 --- a/src/api/indexOvervoew.js +++ b/src/api/indexOvervoew.js @@ -32,4 +32,4 @@ export const boeuCasePlatePageList = (obj) => http.post('/boeu/case/pageList', o // 专业力列表 -export const boeuGrowthPlatePageList = (obj) => http.post('/boeu/growth/pageList', obj) \ No newline at end of file +export const boeuGrowthPlatePageList = (obj) => http.post('/boeu/grow/pageList', obj) \ No newline at end of file diff --git a/src/views/report/Operational.vue b/src/views/report/Operational.vue index aedf7211..56129bd4 100644 --- a/src/views/report/Operational.vue +++ b/src/views/report/Operational.vue @@ -68,7 +68,7 @@
学习情况
-
+
导出学习情况
diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index b6bd7ba6..1de67b98 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -8,7 +8,7 @@ @@ -17,7 +17,7 @@ @@ -460,7 +460,19 @@ export default { if (!state.selectedRowKeys?.length) { return message.warning("请至少选择一条数据进行导出"); } else { - if (state.currentTab === 5) { + if (state.currentTab === 6) { + axios({ + method: "get", + url: "/report/boeu/grow/export", + params: { ids: `${state.selectedRowKeys}` }, + responseType: "blob", + headers: { + token: Cookies.get("token"), + }, + }).then((res) => { + downLoad(res.data, "专业力必修.xlsx"); + }); + } else if (state.currentTab === 5) { axios({ method: "get", url: "/report/boeu/case/export", @@ -537,7 +549,32 @@ export default { }; // 全部导出接口 const exportClickAll = async () => { - if (state.currentTab === 5) { + if (state.currentTab === 6) { + axios({ + method: "post", + url: "/report/boeu/grow/exportAll", + data: { + 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", + qualsLevelDesr: state.qualsLevelDesr, + stdPositionDesr: state.stdPositionDesr, + page: state.pageNo, + size: state.pageSize, + }, + responseType: "blob", + headers: { + token: Cookies.get("token"), + }, + }).then((res) => { + downLoad(res.data, "专业力必修.xlsx"); + }); + } else if (state.currentTab === 5) { axios({ method: "post", url: "/report/boeu/case/exportAll", @@ -1670,15 +1707,15 @@ export default { ]; } else if (index === 6) { columns.value = [ - { - title: "专业力必修", - dataIndex: "growthName", - key: "growthName", - width: 200, - ellipsis: true, - align: "center", - fixed: "left", - }, + // { + // title: "专业力必修", + // dataIndex: "growthName", + // key: "growthName", + // width: 200, + // ellipsis: true, + // align: "center", + // fixed: "left", + // }, { title: "标准岗位名称", dataIndex: "stdPositionDesr", diff --git a/src/views/report/growthpathmap.vue b/src/views/report/growthpathmap.vue index 91aa65e9..d2364d6e 100644 --- a/src/views/report/growthpathmap.vue +++ b/src/views/report/growthpathmap.vue @@ -48,7 +48,7 @@
- +
- `${((comLearnNum / learnNum) * 100).toFixed()}%`, + learnNum && `${((comLearnNum / learnNum) * 100).toFixed()}%`, }, { title: "发布时间", @@ -252,7 +250,7 @@ export default { ellipsis: true, key: "publishTime", align: "center", - width: 120, + width: 140, }, { title: "发布状态", @@ -270,38 +268,38 @@ export default { ellipsis: true, key: "createTime", align: "center", - width: 120, + width: 140, + }, + { + title: "操作", + dataIndex: "operation", + key: "operation", + width: 200, + align: "center", + fixed: "right", + customRender: ({ record }) => { + return ( +
+ { + oneCurrentExport(record); + }} + > + 导出学习记录 + +
+ ); + }, }, - // { - // title: "操作", - // dataIndex: "operation", - // key: "operation", - // width: 200, - // align: "center", - // fixed: "right", - // customRender: (record) => { - // return ( - //
- // { - // oneCurrentExport(record); - // }} - // > - // 导出学习记录 - // - //
- // ); - // }, - // }, ]); // 导出当前数据 const oneCurrentExport = (record) => { axios({ - method: "post", - url: "/report/boeu/router/exportCurrentRecord", - data: { routerId: `${record.record.boeRouterInfoId}` }, + method: "get", + url: "/report/boeu/grow/exportGrowth", + params: { ids: `${record.id}` }, responseType: "blob", headers: { token: Cookies.get("token"), @@ -357,103 +355,73 @@ export default { }; //导出详细信息 const exportbtnz = async () => { - if (state.selectedRowKeys?.length > 0) { - axios({ - method: "post", - url: "/report/boeu/router/exportCurrentRecord", - data: { routerIdList: state.selectedRowKeys }, - responseType: "blob", - headers: { - token: Cookies.get("token"), - }, - }).then((res) => { - downLoad(res.data, "专业力详细信息.xlsx"); - }), - (err) => { - message.error(err); - }; - } else { - const params = { - createName: state.createName, - // publishTime: state.publishTime, - 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, - }; - axios({ - method: "post", - url: "/report/boeu/router/exportCurrentRecord", - data: params, - responseType: "blob", - headers: { - token: Cookies.get("token"), - }, - }).then((res) => { - if (res.data.status && res.data.status == 600) { - message.error(res.data.status); - } else { - downLoad(res.data, "专业力必修详细信息.xlsx"); - } - }), - (err) => { - message.error(err); - }; + if (!state.selectedRowKeys?.length) { + message.warning("请选择要导出的数据"); + return; } + const params = { + pageNum: state.pageNum, + pageSize: state.pageSize, + stdPositionDesr: state.stdPositionDesr, + qualsLevelDesr: state.qualsLevelDesr, + isPublished: state.isPublished, + ids: state.selectedRowKeys.toString(), + 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", + }; + axios({ + method: "get", + url: "/report/boeu/grow/exportGrowth", + params, + responseType: "blob", + headers: { + token: Cookies.get("token"), + }, + }).then((res) => { + downLoad(res.data, "专业力详细信息.xlsx"); + }), + (err) => { + message.error(err); + }; }; // 导出列表信息 const exportAllbtnz = async () => { - if (state.selectedRowKeys?.length > 0) { - axios({ - method: "post", - url: "/report/boeu/router/exportList", - data: { routerIdList: state.selectedRowKeys }, - responseType: "blob", - headers: { - token: Cookies.get("token"), - }, - }).then((res) => { - downLoad(res.data, "专业力必修列表信息.xlsx"); - }), - (err) => { - message.error(err); - }; - } else { - const params = { - createName: state.createName, - // publishTime: state.publishTime, - 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, + const params = { + pageNum: state.pageNum, + pageSize: state.pageSize, + stdPositionDesr: state.stdPositionDesr, + qualsLevelDesr: state.qualsLevelDesr, + isPublished: state.isPublished, + ids: state.selectedRowKeys.toString(), + 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", + }; + axios({ + method: "post", + url: "/report/boeu/grow/exportGrowthAll", + data: params, + responseType: "blob", + headers: { + token: Cookies.get("token"), + }, + }).then((res) => { + downLoad(res.data, "专业力必修信息.xlsx"); + }), + (err) => { + message.error(err); }; - axios({ - method: "post", - url: "/report/boeu/router/exportList", - data: params, - responseType: "blob", - headers: { - token: Cookies.get("token"), - }, - }).then((res) => { - downLoad(res.data, "专业力必修信息.xlsx"); - }), - (err) => { - message.error(err); - }; - } }; onMounted(() => { state.tableLoading = true;