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

摩根需求开发

Browse Source
feature/mogen
Chengliang 2 years ago
parent 8afd0357ce
commit 83cee06fd8
3 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File

30
src/components/topBar/index.jsx
Unescape Escape View File

@ -142,10 +142,10 @@ export class TopBar extends React.Component {
<Select <Select
defaultValue="3" defaultValue="3"
style={{ width: 120 }} style={{ width: 120 }}
value={this.state.requestData.level} value={type == 'company' ? '0' : this.state.requestData.level}
onChange={(value) => this.handleFormChange({ level: value })} onChange={(value) => this.handleFormChange({ level: value })}
> >
{type == 'company' && <Option value="0">查询全部</Option>} {type == 'company' && <Option value="0">全部</Option>}
<Option value="1">一级</Option> <Option value="1">一级</Option>
<Option value="2">二级</Option> <Option value="2">二级</Option>
<Option value="3">三级</Option> <Option value="3">三级</Option>
@ -165,20 +165,18 @@ export class TopBar extends React.Component {
显示虚拟组织 显示虚拟组织
</Checkbox> </Checkbox>
</Col> </Col>
{type == 'company' && ( <Col span={6}>
<Col span={6}> <Checkbox
<Checkbox style={{ marginTop: '5px' }}
style={{ marginTop: '5px' }} onChange={(e) =>
onChange={(e) => this.handleFormChange({
this.handleFormChange({ outkey: e.target.checked ? '1' : '0',
outkey: e.target.checked ? '1' : '0', })
}) }
} >
> 显示外部用户组织
显示外部组织 </Checkbox>
</Checkbox> </Col>
</Col>
)}
<Col span={6}> <Col span={6}>
<Button <Button
type="primary" type="primary"

65
src/pages/company.jsx
Unescape Escape View File

@ -72,7 +72,7 @@ export default function companyPage() {
function getDepartmentImage() { function getDepartmentImage() {
let index = Math.floor(Math.random() * 8) + 1; let index = Math.floor(Math.random() * 8) + 1;
// return `./img/department/${index}.png`; // return `./img/department/${index}.png`;
return `./img/department/1.png`; return `./img/department/2.png`;
} }
// 获取部门图片 // 获取部门图片
@ -110,7 +110,7 @@ export default function companyPage() {
} else if (d.data.ftype == 1) { } else if (d.data.ftype == 1) {
return 160; return 160;
} else if (d.data.ftype == 2) { } else if (d.data.ftype == 2) {
return 144; return 164;
} }
return 200; return 200;
}; };
@ -121,7 +121,7 @@ export default function companyPage() {
} else if (d.data.ftype == 1) { } else if (d.data.ftype == 1) {
return 160; return 160;
} else if (d.data.ftype == 2) { } else if (d.data.ftype == 2) {
return 56; return 106;
} }
return 120; return 120;
}; };
@ -153,41 +153,44 @@ export default function companyPage() {
</div> </div>
</div>`; </div>`;
} else if (d.data.ftype == 1) { } else if (d.data.ftype == 1) {
return `<div onclick="if(${ return `<div>
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"> <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()}" /> <img src="./img/company.png" />
</div> </div>
<div style="width: 136px; border: 1px solid #66BAF5; margin: 10px auto 0px; border-radius: 23px; text-align: center; <div style="text-align: center;width: 180px; border: 1px solid #66BAF5; margin: 10px auto 0px; border-radius: 23px; padding: 15px 10px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;">
font-size: 14px; <span onclick="if(${d.data.fisvitual}==1) return;window.open('${subcompanyUrl}', '_blank')" style="font-size: 14px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei; font-weight: 400;
font-weight: 400; color: blue;;
color: #333333; line-height: 18px;">${d.data.fname}</span>
line-height: 18px; <div style="font-weight: 400;margin-top: 3px;">
padding: 15px 10px; <span>负责人: ${d.data.fleadername}</span>
"> <span>在岗: ${d.data.empNum}</span>
${d.data.fname} </div>
</div> </div>
</div>`; </div>`;
} else if (d.data.ftype == 2) { } else if (d.data.ftype == 2) {
return ` return `
<div style="width: 100%; height: 100%; background-size: 100% 100%;" onclick="if(${ <div style="width: 100%; height: 100%; background-size: 100% 100%;" onclick="if(${
d.data.fisvitual d.data.fisvitual
}==1) return;window.open('${departmentUrl}')"> }==1) return;window.open('${departmentUrl}')">
<div style='position:absolute'> <div style='position:absolute;height: 106px;'>
<img src='./img/company_job_label.png'/></div> <img style='height: 106px;width: 164px;' src='./img/company_job_label.png'/></div>
<div style="padding-left: 8px; padding-top: 23px;display:flex;align-items:center"> <div style="padding-left: 8px; padding-top: 43px;display:flex;align-items:center">
<img src="${getDepartmentImage()}"/> <img src="${getDepartmentImage()}"/>
<span style=" <div style="
margin-left: 3px; margin-left: 3px;
font-size: 12px; font-size: 12px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei; font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
">${d.data.fname}</span> ">${d.data.fname}</div>
</div> </div>
<div style="font-weight: 400;margin-top: 3px;padding-left: 8px;">
<span>负责人: ${d.data.fleadername}</span>
<span>在岗: ${d.data.empNum}</span>
</div> </div>
</div>
`; `;
} }
return `<div>${d.data.fname}</div>`; return `<div>${d.data.fname}</div>`;

2
src/pages/user.jsx
Unescape Escape View File

@ -87,7 +87,7 @@ export default function userPage() {
// 获取数据 // 获取数据
useEffect(() => { useEffect(() => {
document.cookie = document.cookie =
'Webstorm-3d4d3ad4=b8ca5bef-a131-4c2b-81da-6f8595481dc2; ecology_JSessionid=aaa8JETFTQnfXbKbpx9wy; JSESSIONID=aaa8JETFTQnfXbKbpx9wy; loginidweaver=1; languageidweaver=7; loginuuids=1; __randcode__=03d5b412-dc79-4318-ba3c-6d848fcec227'; 'Webstorm-3d4d3ad4=b8ca5bef-a131-4c2b-81da-6f8595481dc2; ecology_JSessionid=aaa8t8NhMwvKIfAj0k2xy; JSESSIONID=aaa8t8NhMwvKIfAj0k2xy; __randcode__=286e436a-9a0f-436f-90f9-21937689103a; loginidweaver=1; languageidweaver=7; loginuuids=1';
d3.json( d3.json(
// "/user/data" // "/user/data"
'/api/bs/hrmorganization/orgchart/userData?fclass=0&root=0&date=' + '/api/bs/hrmorganization/orgchart/userData?fclass=0&root=0&date=' +

Write Preview
Loading…
Cancel
Save