diff --git a/.umirc.ts b/.umirc.ts index 652763e..7481793 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -18,7 +18,7 @@ export default defineConfig({ type: 'none', }, routes: [ - { path: '/user', component: '@/pages/user' }, + { path: '/jcuser', component: '@/pages/user' }, { path: '/company', component: '@/pages/company' }, ], fastRefresh: {}, @@ -26,7 +26,7 @@ export default defineConfig({ proxy: { '/api': { // 标识需要进行转换的请求的url - target: 'http://localhost:9005/api', // 服务端域名 / http://localhost:8686 + target: 'http://localhost:9006/api', // 服务端域名 / http://localhost:8686 changeOrigin: true, // 允许域名进行转换 pathRewrite: { '^/api': '' }, // 将请求url里的ci去掉 }, diff --git a/src/components/topBar/index.jsx b/src/components/topBar/index.jsx index 2bb1fe2..f56a247 100644 --- a/src/components/topBar/index.jsx +++ b/src/components/topBar/index.jsx @@ -69,10 +69,10 @@ export class TopBar extends React.Component { label: '导出图片', key: '1', }, - { - label: '导出PDF', - key: '2', - }, + // { + // label: '导出PDF', + // key: '2', + // }, ]} /> ); diff --git a/src/pages/user.jsx b/src/pages/user.jsx index a415ba7..1fe271b 100644 --- a/src/pages/user.jsx +++ b/src/pages/user.jsx @@ -50,11 +50,11 @@ export default function userPage() { if (topBarSearchRequest) { let request = { ...topBarSearchRequest, ids: idsStr }; api = - '/api/bs/hrmorganization/orgchart/asyncUserData' + + '/api/bs/junchuangorgchart/asyncUserData' + qs.stringify(request, { addQueryPrefix: true }); } else { api = - '/api/bs/hrmorganization/orgchart/asyncUserData?fclass=0&root=0&date=' + + '/api/bs/junchuangorgchart/asyncUserData?fclass=0&root=0&date=' + moment(new Date()).format('YYYY-MM-DD') + '&ids=' + idsStr; @@ -90,7 +90,7 @@ export default function userPage() { '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'; d3.json( // "/user/data" - '/api/bs/hrmorganization/orgchart/userData?fclass=0&root=0&date=' + + '/api/bs/junchuangorgchart/userData?fclass=0&root=0&date=' + moment(new Date()).format('YYYY-MM-DD'), ).then((data) => { setData(data.data); @@ -199,7 +199,7 @@ export default function userPage() { const handleSearch = (requestData) => { setTpBarSearchRequest(requestData); let api = - '/api/bs/hrmorganization/orgchart/userData' + + '/api/bs/junchuangorgchart/userData' + qs.stringify(requestData, { addQueryPrefix: true }); fetch(api) .then((res) => res.json()) @@ -217,7 +217,7 @@ export default function userPage() { const handleSynchronous = (requestData) => { setDisabled(true); - let api = '/api/bs/hrmorganization/orgchart/synchronousData'; + let api = '/api/bs/junchuangorgchart/syncOrgMapData'; fetch(api) .then((res) => res.json()) .then((data) => { @@ -259,9 +259,9 @@ export default function userPage() { // 岗位地址 let jobtitleUrl = `/spa/organization/static/index.html#/main/organization/jobExtend/${d.data.fobjid}`; // 人员地址 - let userUrl = `/spa/organization/static/index.html#/main/organization/resourceCard/${d.data.fleader}`; + let userUrl = `/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/${d.data.fleader}`; // 岗位人员地址 - let postUserUrl = `/spa/organization/static/index.html#/main/organization/resourceCard/${d.data.fobjid}`; + let postUserUrl = `/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/${d.data.fobjid}`; //集团通讯录 let addressBookGroupUrl = `/spa/organization/static/index.html#/main/organization/resource/?virtualtype=0`; // 分部通讯录 @@ -286,15 +286,9 @@ export default function userPage() { font-family: Microsoft YaHei-Bold, Microsoft YaHei; font-weight: bold; color: #000000; - " onclick="if(${d.data.fisvitual}==1) return;window.open('${ - d.data.ftype == 0 - ? companyUrl - : d.data.ftype == 1 - ? subcompanyUrl - : d.data.ftype == 2 - ? departmentUrl - : '' - }', '_blank')">${d.data.fname} + " onclick="if(${d.data.fisvitual}==1) return;">${ + d.data.fname + } @@ -341,89 +335,15 @@ export default function userPage() {
-
编制: ${ - d.data.fplan +
在岗: ${ + d.data.fonjob }
-
在岗: ${d.data.fonjob}
`; } else if (d.data.ftype == 3) { - return `
-
- - ${ - d.data.fname - } - - - - -
-
- -
- -
-
${ - d.data.fname - }
-
- 编制:${d.data.fplan} - 在岗:${ - d.data.fonjob - } -
-
-
-
-
`; - } else if (d.data.ftype == 4) { return `
@@ -522,7 +442,7 @@ export default function userPage() { }} disabled={disabled} type="user" - url="/api/bs/hrmorganization/orgchart/getCondition?type=user" + url="/api/bs/junchuangorgchart/getCondition?type=user" />