diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..dd4f3fc
Binary files /dev/null and b/dist.zip differ
diff --git a/src/components/topBar/index.jsx b/src/components/topBar/index.jsx
index 3343547..167e9c8 100644
--- a/src/components/topBar/index.jsx
+++ b/src/components/topBar/index.jsx
@@ -23,6 +23,7 @@ export class TopBar extends React.Component {
deptartmentTreeData: [], //部门异步树
treeExpandedKeys: [],
levelOptions: [], //层级数据,hrm中层级字段
+ butvisable: true,
requestData: {
date: moment(new Date()).format('YYYY-MM-DD'), //日期
department: undefined,
@@ -99,6 +100,7 @@ export class TopBar extends React.Component {
this.setState({
levelOptions: data.data.deptLevel,
deptartmentTreeData: data.data.deptTree,
+ butvisable: data.data.hasRight,
});
}
});
@@ -188,11 +190,13 @@ export class TopBar extends React.Component {
window.open('#/chart', '_blank');
}}
>
- 图谱
+ 任命架构图
-
-
-
+ {this.state.butvisable && (
+
+
+
+ )}
diff --git a/src/pages/company.jsx b/src/pages/company.jsx
index 59a24c6..c2fa5d1 100644
--- a/src/pages/company.jsx
+++ b/src/pages/company.jsx
@@ -155,7 +155,7 @@ export default function companyPage() {
} else if (d.data.ftype == 2) {
let one = d.data.leader == '' ? 'none' : 'inline-block';
let three = d.data.deputyLeader == '' ? 'none' : 'inline-block';
- let two = d.data.header == '' ? 'none' : 'block';
+ let two = d.data.header == '' ? 'none' : 'inline-block';
return `
@@ -173,13 +173,11 @@ export default function companyPage() {
分管领导:${
d.data.header
}
-
${
- d.data.leader
- } || ${
- d.data.deputyLeader
- }
-
+
+
${d.data.leader}
+
|| ${d.data.deputyLeader}
+
+
`;
}
diff --git a/src/pages/user.jsx b/src/pages/user.jsx
index a5575ce..075628c 100644
--- a/src/pages/user.jsx
+++ b/src/pages/user.jsx
@@ -87,7 +87,7 @@ export default function userPage() {
// 获取数据
useEffect(() => {
document.cookie =
- '33_ecology_JSessionid=aaa-86YwPw671co9NOKIy; ecology_JSessionid=aaa-86YwPw671co9NOKIy; Systemlanguid=7; languageidweaver=7; JSESSIONID=aaa-86YwPw671co9NOKIy; loginuuids=1; CASTGC=TGT-48-lHCAbEDfdJkcC7xyZ6S5BHpVJqKfYgMPoezM2bBBmyrCYyCLOc-c01; loginidweaver=1; __randcode__=5a256767-7b8d-46e3-98ca-bb4ac7a509eb';
+ '33_ecology_JSessionid=aaaB2ipClrImrf_cwBwJy; JSESSIONID=aaaB2ipClrImrf_cwBwJy; ecology_JSessionid=aaaB2ipClrImrf_cwBwJy; Systemlanguid=7; languageidweaver=7; loginuuids=2761; CASTGC=TGT-8-SejF5mLWvSQwjKm9DlNGjlcpdvfcbm4uevY6qWcYinoneozleM-c01; loginidweaver=2761; __randcode__=60a5a6ab-4d49-4e14-a360-3660fb0bde4d';
d3.json(
// "/user/data"
'/api/bs/hrmorganization/orgchart/userData?fclass=0&root=0&date=' +