mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-07 18:06:46 +08:00
Merge branch 'refs/heads/250429-report-wjh' into 250605-added-yzt
This commit is contained in:
yztopen
@@ -12,7 +12,7 @@ import Cookies from 'vue-cookies'
|
||||
// export const BATCH_IMPORT_SCORE = process.env.VUE_APP_BASE_API + '/admin/offcourse/batchImportScore'
|
||||
axios.defaults.withCredentials = true;
|
||||
const http = axios.create({
|
||||
baseURL: '/report',
|
||||
baseURL: '/',
|
||||
timeout: 1000 * 15,
|
||||
// headers: { "Content-Type": "multipart/form-data" },
|
||||
headers: {"Content-Type": "application/json"},
|
||||
|
||||
@@ -4,32 +4,48 @@ import https from './confign'
|
||||
// export const boeuCaseExport = (obj,options) => http.get('/boeu/case/export', { params: obj },options)
|
||||
|
||||
//概览页面考试列表请求接口
|
||||
export const boeuExamPageList = (obj) => http.post('/boeu/exam/pageList', obj)
|
||||
export const boeuExamPageList = (obj) => http.post('/report/boeu/exam/pageList', obj)
|
||||
//概览页面案例列表请求接口
|
||||
export const boeuCasePageList = (obj) => http.post('/boeu/case/pageList', obj)
|
||||
export const boeuCasePageList = (obj) => http.post('/report/boeu/case/pageList', obj)
|
||||
// 请求组织接口
|
||||
export const userGetUserOrg = (obj) => https.get(`/organization/all/tree`,obj)
|
||||
// 请求所属组织接口
|
||||
export const userInfo = (obj) => https.post('/user/info', obj)
|
||||
export const userInfo = (obj) => https.post('/report/user/info', obj)
|
||||
// 课程列表接口
|
||||
export const boeuCoursePageList = (obj) => http.post('/boeu/course/pageList', obj)
|
||||
export const boeuCoursePageList = (obj) => http.post('/report/boeu/course/pageList', obj)
|
||||
// 授课列表
|
||||
export const boeuTeachingPageList = (obj) => http.post('/boeu/teaching/pageList', obj)
|
||||
export const boeuTeachingPageList = (obj) => http.post('/report/boeu/teaching/pageList', obj)
|
||||
// 学习路径图页面
|
||||
export const boeuRoterPageList = (obj) => http.post('/boeu/router/pageList', obj)
|
||||
export const boeuRoterPageList = (obj) => http.post('/report/boeu/router/pageList', obj)
|
||||
// 项目列表
|
||||
export const boeuProjectPageList = (obj) => http.post('/boeu/project/pageList', obj)
|
||||
export const boeuProjectPageList = (obj) => http.post('/report/boeu/project/pageList', obj)
|
||||
// 学习数据列表
|
||||
export const boeuStudyDataPageList = (obj) => http.post('/boeu/studyData/pageList', obj)
|
||||
export const boeuStudyDataPageList = (obj) => http.post('/report/boeu/studyData/pageList', obj)
|
||||
// 考试列表分页
|
||||
export const boeuExamPageListV2 = (obj) => http.post('/boeu/exam/pageList/v2', obj )
|
||||
export const boeuExamPageListV2 = (obj) => http.post('/report/boeu/exam/pageList/v2', obj )
|
||||
// 概览页面 tab头数据
|
||||
export const boeuAllTotal = (obj) => http.get('/boeu/all/total', obj)
|
||||
export const boeuAllTotal = (obj) => http.get('/report/boeu/all/total', obj)
|
||||
// 路径图列表
|
||||
export const boeuRouterPlatePageList = (obj) => http.post('/boeu/routerPlate/pageList', obj)
|
||||
export const boeuRouterPlatePageList = (obj) => http.post('/report/boeu/routerPlate/pageList', obj)
|
||||
// 案例列表
|
||||
export const boeuCasePlatePageList = (obj) => http.post('/boeu/case/pageList', obj)
|
||||
|
||||
export const boeuCasePlatePageList = (obj) => http.post('/report/boeu/case/pageList', obj);
|
||||
|
||||
//=============版本2=======================
|
||||
// 项目列表
|
||||
export const projectPageList = (obj) => http.post('/reportsnake/report/getProjectReportPage', obj);
|
||||
//路径图列表
|
||||
export const routerPageList = (obj) => http.post('/reportsnake/report/getRouterReportPage', obj);
|
||||
//面授列表
|
||||
export const facePageList = (obj) => http.post('/reportsnake/report/getFaceReportPage', obj);
|
||||
//在线课程列表
|
||||
export const coursePageList = (obj) => http.post('/reportsnake/report/getCourseReportPage', obj);
|
||||
//考试列表
|
||||
export const examPageList = (obj) => http.post('/reportsnake/report/getExamReportPage', obj);
|
||||
//案例列表
|
||||
export const casePageList = (obj) => http.post('/reportsnake/report/getCaseReportPage', obj);
|
||||
//专注力列表
|
||||
export const professionalPageList = (obj) => http.post('/reportsnake/report/getProfessionalReportPage', obj);
|
||||
//所有模块总数
|
||||
export const reportAllTotal = (obj) => http.post('/reportsnake/report/getReportAllTotal', obj);
|
||||
// 专业力列表
|
||||
export const boeuGrowthPlatePageList = (obj) => http.post('/boeu/grow/pageList', obj)
|
||||
@@ -633,7 +633,7 @@
|
||||
key="sub17"
|
||||
v-if="
|
||||
checkMenu(
|
||||
'operational,learningpathmap,reportproject,curriculum,caseess,reportarticle,questionsandanswers,reportexamination,overvoew,employeelearning'
|
||||
'operational,learningpathmap,reportproject,curriculum,caseess,reportarticle,questionsandanswers,reportexamination,overvoew,employeelearning,overvoewnew'
|
||||
)
|
||||
"
|
||||
>
|
||||
@@ -747,7 +747,7 @@
|
||||
<a-sub-menu
|
||||
key="sub17-3"
|
||||
class="treeMenu"
|
||||
v-if="checkMenu('overvoew,employeelearning')"
|
||||
v-if="checkMenu('overvoew,employeelearning,overvoewnew')"
|
||||
>
|
||||
<template #icon>
|
||||
<div class="img"></div>
|
||||
@@ -771,6 +771,15 @@
|
||||
></span>
|
||||
<router-link to="/employeelearning">员工学习数据</router-link>
|
||||
</a-menu-item>
|
||||
<a-menu-item key="sub17-3-3" v-if="checkMenu('overvoewnew')">
|
||||
<span
|
||||
:class="{
|
||||
circleActive: selectedKeys[0] === 'sub17-3-3' ? true : false,
|
||||
circle: selectedKeys[0] === 'sub17-3-3' ? false : true,
|
||||
}"
|
||||
></span>
|
||||
<router-link to="/overvoewnew">组织机构学习数据报表</router-link>
|
||||
</a-menu-item>
|
||||
</a-sub-menu>
|
||||
<a-menu-item
|
||||
key="sub17-4"
|
||||
@@ -1312,6 +1321,13 @@ export default {
|
||||
selectedKeys: "sub17-3-2",
|
||||
pagename: "员工学习数据",
|
||||
},
|
||||
{
|
||||
href: "/overvoewnew",
|
||||
openKeys: "sub17",
|
||||
openKeys2: "sub17-3",
|
||||
selectedKeys: "sub17-3-3",
|
||||
pagename: "组织机构学习数据报表",
|
||||
},
|
||||
{
|
||||
href: "/trainingnewmanager",
|
||||
openKeys: "sub17",
|
||||
|
||||
2201
src/views/report/Overvoewnew.vue
Normal file
2201
src/views/report/Overvoewnew.vue
Normal file
File diff suppressed because it is too large
Load Diff
51158
src/views/report/org.json
Normal file
51158
src/views/report/org.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -46,6 +46,23 @@ module.exports = defineConfig({
|
||||
target: 'https:' + process.env.VUE_APP_BOE_API_URL,
|
||||
changeOrigin: true, //表示是否改变原域名
|
||||
},
|
||||
// "/reportsnake": {
|
||||
// target:'https:' + process.env.VUE_APP_BOE_API_URL,
|
||||
// changeOrigin: true, //表示是否改变原域名
|
||||
// pathRewrite: {
|
||||
// // "^/reportsnake": "",
|
||||
// },
|
||||
// },
|
||||
"/reportsnake": {
|
||||
target: 'http://127.0.0.1:32004',
|
||||
changeOrigin: true, //表示是否改变原域名
|
||||
pathRewrite: {
|
||||
"^/reportsnake": "",
|
||||
},
|
||||
onProxyReq(proxyReq, req) {
|
||||
console.log('Proxying request to:', req.url); // 调试日志
|
||||
}
|
||||
},
|
||||
"/report": {
|
||||
target: 'https:' + process.env.VUE_APP_BOE_API_URL,
|
||||
changeOrigin: true, //表示是否改变原域名
|
||||
@@ -53,6 +70,8 @@ module.exports = defineConfig({
|
||||
// "^/manageApi": "",
|
||||
},
|
||||
},
|
||||
|
||||
|
||||
// "/report": {
|
||||
// target: 'http://192.168.31.211:18878',
|
||||
// changeOrigin: true, //表示是否改变原域名
|
||||
|
||||
Reference in New Issue
Block a user