diff --git a/dist.zip b/dist.zip index bec29ed..168c283 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/public/img/back/back.png b/public/img/back/back.png new file mode 100644 index 0000000..e731f3f Binary files /dev/null and b/public/img/back/back.png differ diff --git a/src/components/orgChart/index.jsx b/src/components/orgChart/index.jsx index 8211819..3eb5231 100644 --- a/src/components/orgChart/index.jsx +++ b/src/components/orgChart/index.jsx @@ -52,7 +52,7 @@ export const OrgChartComponent = memo((props, ref) => { .layout('top') .linkUpdate(function (d, i, arr) { d3.select(this) - .attr('stroke', '#66BAF5') + .attr('stroke', '#dcdddc') .attr('stroke-width', 1) .style('stroke-dasharray', '3, 3'); }) diff --git a/src/pages/company.jsx b/src/pages/company.jsx index 90d712e..c96c674 100644 --- a/src/pages/company.jsx +++ b/src/pages/company.jsx @@ -99,12 +99,14 @@ export default function companyPage() { // 获取部门图片 function getDepartmentImage(fisvitual) { - return fisvitual == '0' ? `./img/back/level4.png` : `./img/back/level8.png`; + return `./img/back/back.png`; + //return fisvitual == '0' ? `./img/back/level4.png` : `./img/back/level8.png`; } // 获取分部图片 function getSubcompanyImage(fisvitual) { - return fisvitual == '0' ? `./img/back/level1.png` : `./img/back/level5.png`; + //return fisvitual == '0' ? `./img/back/level1.png` : `./img/back/level5.png`; + return `./img/back/back.png`; } // 多语言获取 @@ -135,9 +137,9 @@ export default function companyPage() { // ButtonContent渲染 const buttonContentRender = ({ node, state }) => { if (node.children) { - return `
ˆ
`; + return `
ˆ
`; } else { - return `
ˆ
`; + return `
ˆ
`; } }; @@ -175,7 +177,7 @@ export default function companyPage() { font-size: 24px; font-family: Microsoft YaHei-Bold, Microsoft YaHei; font-weight: bold; - color: #000000; + color: #1f0ea3; line-height: 28px; letter-spacing: 1px; margin-top: 10px; diff --git a/src/pages/index.less b/src/pages/index.less index 618795f..731e8e8 100644 --- a/src/pages/index.less +++ b/src/pages/index.less @@ -137,7 +137,7 @@ .tooltip .tooltiptext { visibility: hidden; width: 144px; - background-color: #555; + background-color: #1f0ea3; color: #fff; text-align: center; border-radius: 6px; diff --git a/src/pages/user.jsx b/src/pages/user.jsx index 1a92709..60a9c47 100644 --- a/src/pages/user.jsx +++ b/src/pages/user.jsx @@ -99,7 +99,7 @@ export default function userPage() { // 获取数据 useEffect(() => { document.cookie = - 'ecology_JSessionid=aaaqP0tTaKbFM9rJ6fQjz; JSESSIONID=aaaqP0tTaKbFM9rJ6fQjz; Systemlanguid=7; languageidweaver=7; loginuuids=1; __randcode__=811e5b8d-968b-4847-99ed-e0aa22b0ad4e; loginidweaver=sysadmin'; + 'ecology_JSessionid=aaaqP0tTaKbFM9rJ6fQjz; JSESSIONID=aaaqP0tTaKbFM9rJ6fQjz; loginuuids=1; Systemlanguid=7; languageidweaver=7; loginidweaver=sysadmin;'; d3.json( '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0', ).then((data) => {