Merge remote-tracking branch 'yx/250429-report-wjh' into test20250220

This commit is contained in:
joshen
2025-05-09 16:55:51 +08:00
6 changed files with 54431 additions and 3146 deletions

View File

@@ -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="/overvoew">组织机构学习数据报表</router-link>
</a-menu-item>
</a-sub-menu>
<a-menu-item
key="sub17-4"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

51158
src/views/report/org.json Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -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, //表示是否改变原域名