liang.cheng
/
org-chart-frant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/orgChart'

This commit is contained in:
fanjie 2022-11-02 15:03:31 +08:00
parent 5c413e2d21 c788c34064
commit dbb4761bd1
3 changed files with 69 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/topBar/index.jsx
View File

@ -29,7 +29,6 @@ export class TopBar extends React.Component {
level: '3',
fisvitual: '0',
},
colSpan: props.type == 'user' ? 5 : 4,
};
}
@ -82,7 +81,7 @@ export class TopBar extends React.Component {
return (
<div className={style.topbarWrapper}>
<Row>
<Col span={this.state.colSpan}>
<Col span={4}>
数据日期：
<DatePicker
placeholder="请选择日期"
@ -104,7 +103,7 @@ export class TopBar extends React.Component {
/>
</Col>
<Col span={this.state.colSpan}>
<Col span={4}>
维度：
<Select
defaultValue="0"
@ -118,7 +117,7 @@ export class TopBar extends React.Component {
</Select>
</Col>
<Col span={this.state.colSpan}>
<Col span={4}>
根节点：
<Select
showSearch
@ -136,7 +135,7 @@ export class TopBar extends React.Component {
</Select>
</Col>
<Col span={this.state.colSpan}>
<Col span={4}>
显示层级：
<Select
defaultValue="3"
@ -150,8 +149,7 @@ export class TopBar extends React.Component {
</Select>
</Col>
{this.props.type == 'company' && (
<Col span={this.state.colSpan}>
<Col span={4}>
<Checkbox
style={{ marginTop: '5px' }}
onChange={(e) =>
@ -163,8 +161,6 @@ export class TopBar extends React.Component {
显示虚拟组织
</Checkbox>
</Col>
)}
<Col span={4}>
<Button
type="primary"

10
src/pages/company.jsx
View File

@ -136,7 +136,7 @@ export default function companyPage() {
let departmentUrl = `/spa/organization/static/index.html#/main/organization/departmentExtend/${d.data.fobjid}`;
if (d.data.ftype == 0) {
return `<div onclick="window.open('${companyUrl}', '_blank')" style="text-align:center">
return `<div onclick="if(${d.data.fisvitual}==1) return;window.open('${companyUrl}', '_blank')" style="text-align:center">
<div style="display: inline-block; vertical-align: top;">
<img src="./img/company.png" />
</div>
@ -153,7 +153,9 @@ export default function companyPage() {
</div>
</div>`;
} else if (d.data.ftype == 1) {
return `<div onclick="window.open('${subcompanyUrl}', '_blank')">
return `<div onclick="if(${
d.data.fisvitual
}==1) return;window.open('${subcompanyUrl}', '_blank')">
<div style="width: 85px; height: 85px; border: 1px solid #66BAF5; border-radius: 50%;text-align: center; line-height: 85px; margin: 0 auto;display:flex;justify-content:center;align-items:center">
<img src="${getSubcompanyImage()}" />
</div>
@ -170,7 +172,9 @@ export default function companyPage() {
</div>`;
} else if (d.data.ftype == 2) {
return `
<div style="width: 100%; height: 100%; background-size: 100% 100%;" onclick="window.open('${departmentUrl}')">
<div style="width: 100%; height: 100%; background-size: 100% 100%;" onclick="if(${
d.data.fisvitual
}==1) return;window.open('${departmentUrl}')">
<div style='position:absolute'>
<img src='./img/company_job_label.png'/></div>
<div style="padding-left: 8px; padding-top: 23px;display:flex;align-items:center">

37
src/pages/user.jsx
View File

@ -268,7 +268,7 @@ export default function userPage() {
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #000000;
" onclick="window.open('${
" onclick="if(${d.data.fisvitual}==1) return;window.open('${
d.data.ftype == 0
? companyUrl
: d.data.ftype == 1
@ -295,7 +295,7 @@ export default function userPage() {
}" style="width: 58px; height: 58px;position:absolute;left:29px; border-radius: 50%; margin-top: 16px;position:absolute;left:29px;z-index:999"/>
</div>
<div style="display: inline-block; margin-left: 6px;width: 55%" >
<div onclick="${
<div onclick="if(${d.data.fisvitual}==1) return;${
d.data.fleadername ? `window.open('${userUrl}', '_blank')` : ''
}">
<div style="
@ -320,11 +320,15 @@ export default function userPage() {
d.data.fleaderjob ? `/${d.data.fleaderjob}` : ''
}</div>
</div>
<div style="display: flex;" >
<div style="display: ${
d.data.fisvitual == 0 ? 'flex' : 'none'
};" >
<div style="height: 28px;border: 1px solid #00C2FF; border-radius: 10px; line-height: 24px; padding: 0px 5px; min-width: 60px;">编制: ${
d.data.fplan
}</div>
<div style="height: 28px;border: 1px solid #00C2FF; border-radius: 10px; line-height: 24px; padding: 0px 5px; min-width: 60px; margin-left: 10px;" onclick="event.stopPropagation();window.open('${
<div style="height: 28px;border: 1px solid #00C2FF; border-radius: 10px; line-height: 24px; padding: 0px 5px; min-width: 60px; margin-left: 10px;" onclick="if(${
d.data.fisvitual
}==1) return;event.stopPropagation();window.open('${
d.data.ftype == 0
? addressBookGroupUrl
: d.data.ftype == 1
@ -353,7 +357,11 @@ export default function userPage() {
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #000000;
" onclick="window.open('${jobtitleUrl}', '_blank')">${d.data.fname}</span>
" onclick="if(${
d.data.fisvitual
}==1) return;window.open('${jobtitleUrl}', '_blank')">${
d.data.fname
}</span>
<span style="margin-left: 70px;">
<img src="./img/user-card/line1.png" />
<img src="./img/user-card/line2.png" />
@ -370,15 +378,24 @@ export default function userPage() {
font-weight: bold;
color: #333333;
margin-bottom: 23px;
" onclick="window.open('${jobtitleUrl}', '_blank')">${d.data.fname}</div>
" onclick="if(${
d.data.fisvitual
}==1) return;window.open('${jobtitleUrl}', '_blank')">${
d.data.fname
}</div>
<div style="
font-size: 13px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #333333;
" >
display: ${d.data.fisvitual == 0 ? 'flex' : 'none'};
">
<span>编制：${d.data.fplan}</span>
<span style="margin-left: 10px;" onclick="window.open('${addressBookPostUrl}', '_blank')">在岗：${d.data.fonjob}</span>
<span style="margin-left: 10px;" onclick="if(${
d.data.fisvitual
}==1) return;window.open('${addressBookPostUrl}', '_blank')">在岗：${
d.data.fonjob
}</span>
</div>
</div>
</div>
@ -405,7 +422,9 @@ export default function userPage() {
}" style="width: 58px; height: 58px; border-radius: 50%; margin-top: 16px;z-index:999"/>
</div>
<div style="display: inline-block; margin-left: 6px;width: 55%;height:100%" onclick="window.open('${postUserUrl}', '_blank')">
<div style="display: inline-block; margin-left: 6px;width: 55%;height:100%" onclick="if(${
d.data.fisvitual
}==1) return;window.open('${postUserUrl}', '_blank')">
<div style='display:flex;align-items:center;margin-bottom:19px;margin-top:15px'>
<div style="
font-size: 13px;