diff --git a/.umirc.ts b/.umirc.ts index 652763e..8e5751b 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -26,7 +26,7 @@ export default defineConfig({ proxy: { '/api': { // 标识需要进行转换的请求的url - target: 'http://localhost:9005/api', // 服务端域名 / http://localhost:8686 + target: 'http://localhost:9003/api', // 服务端域名 / http://localhost:8686 changeOrigin: true, // 允许域名进行转换 pathRewrite: { '^/api': '' }, // 将请求url里的ci去掉 }, diff --git a/src/pages/user.jsx b/src/pages/user.jsx index a415ba7..ead8a29 100644 --- a/src/pages/user.jsx +++ b/src/pages/user.jsx @@ -87,7 +87,7 @@ export default function userPage() { // 获取数据 useEffect(() => { document.cookie = - 'Webstorm-3d4d3ad4=b8ca5bef-a131-4c2b-81da-6f8595481dc2; ecology_JSessionid=aaap23kDZ0ldP8JGBGSzy; JSESSIONID=aaap23kDZ0ldP8JGBGSzy; Systemlanguid=7; loginidweaver=1; languageidweaver=7; loginuuids=1; langType=zh_CN; ecology_JSessionId=abc5qFfEfVOtpgAwYd3zy; __randcode__=c92e9ed1-3d66-4e6b-bdb6-c01df6c639a1'; + 'ecology_JSessionid=aaaQKkWJWQLM6eox6XOKy; JSESSIONID=aaaQKkWJWQLM6eox6XOKy; loginidweaver=1; languageidweaver=7; loginuuids=1; __randcode__=13e398ec-5b11-4307-ab75-4242e70a71b8'; d3.json( // "/user/data" '/api/bs/hrmorganization/orgchart/userData?fclass=0&root=0&date=' + @@ -360,7 +360,7 @@ export default function userPage() { `; - } else if (d.data.ftype == 3) { + } else if (d.data.ftype == 3 && d.data.this_dept != null) { return `
@@ -375,11 +375,7 @@ export default function userPage() { font-family: Microsoft YaHei-Bold, Microsoft YaHei; font-weight: bold; color: ${d.data.this_dept == '0' ? 'red' : '#000000'}; - " onclick="if(${ - d.data.fisvitual - }==1) return;window.open('${jobtitleUrl}', '_blank')">${ - d.data.fname - } + " onclick="if(${d.data.fisvitual}==1) return;">部门负责人 @@ -398,7 +394,7 @@ export default function userPage() { margin-bottom: 23px; " onclick="if(${ d.data.fisvitual - }==1) return;window.open('${jobtitleUrl}', '_blank')">${ + }==1) return;window.open('${postUserUrl}', '_blank')">${ d.data.fname }
- 编制:${d.data.fplan} 在岗:${ - d.data.fonjob + }==1) return;window.open('${addressBookPostUrl}', '_blank')">${ + d.data.fleaderjob }
`; - } else if (d.data.ftype == 4) { + } else if (d.data.ftype == 3) { return `