From a99d911db12eaec906d818912a945d2137b5c515 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Mon, 17 Jun 2024 14:26:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawer/index.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/drawer/index.jsx b/src/components/drawer/index.jsx index 2ad6e07..d84c968 100644 --- a/src/components/drawer/index.jsx +++ b/src/components/drawer/index.jsx @@ -430,7 +430,6 @@ export default class DrawerComponents extends React.Component { Date: Wed, 19 Jun 2024 09:58:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawer/index.jsx | 2 +- src/pages/company.jsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/drawer/index.jsx b/src/components/drawer/index.jsx index d84c968..0c29197 100644 --- a/src/components/drawer/index.jsx +++ b/src/components/drawer/index.jsx @@ -257,7 +257,7 @@ export default class DrawerComponents extends React.Component {
${d.data.fname}
-
+
${getLabel(547190, labelData)}:${d.data.fleader}
diff --git a/src/pages/company.jsx b/src/pages/company.jsx index 6b0703c..caa8dc2 100644 --- a/src/pages/company.jsx +++ b/src/pages/company.jsx @@ -164,8 +164,8 @@ export default function companyPage() { let fclass = topbar.state.requestData.fclass; let statisticsStyle = fclass == 0 ? 'block' : 'none'; if (d.data.ftype == 0) { - return `
-
+ return `
+
-
+
-
${ - d.data.fname - }
+
+ ${d.data.fname} + (${d.data.accountType}) +
-
+
${getLabel(547324, labelData)}: ${ d.data.companyWorkYear } ${getLabel(547526, labelData)}
+
`; @@ -322,22 +329,76 @@ export default class DrawerComponents extends React.Component { }; showDrawer = (params) => { + const { defaultStatusValue, defaultTypeValue } = this.state; + params = { + ...params, + typeValue: defaultTypeValue.join(','), + statusValue: defaultStatusValue.join(','), + }; this.getDeatilDatas(params, 'chart', '0'); this.setState({ open: true, params: params }); }; onClose = () => { - this.setState({ open: false, detailType: 'chart', showJob: false }); + this.setState({ + open: false, + detailType: 'chart', + showJob: false, + defaultStatusValue: [0, 1, 2, 3], + defaultTypeValue: ['isBelongTo'], + disabled: false, + }); }; changeDetail = () => { - const { detailType, params } = this.state; + const { detailType, params, defaultTypeValue, defaultStatusValue } = + this.state; + const newParam = { + ...params, + typeValue: defaultTypeValue.join(','), + statusValue: defaultStatusValue.join(','), + }; let type = detailType == 'chart' ? 'table' : 'chart'; const showJob = this.state.showJob ? '1' : '0'; this.setState({ detailType: type, }); - this.getDeatilDatas(params, type, showJob); + this.getDeatilDatas(newParam, type, showJob); + }; + + onStatusChange = (checkedValues) => { + if (checkedValues.length === 0) { + return message.error('至少选择一种人员性质', 2); + } + this.setState({ + defaultStatusValue: checkedValues, + }); + const { defaultTypeValue, params, detailType } = this.state; + const showJob = this.state.showJob ? '1' : '0'; + const nParam = { + ...params, + statusValue: checkedValues.join(','), + typeValue: defaultTypeValue.join(','), + }; + this.getDeatilDatas(nParam, detailType, showJob); + }; + + onTypeChange = (checkedValues) => { + if (this.state.showJob) { + return message.error('已勾选岗位模式显示', 2); + } + this.setState({ + defaultTypeValue: checkedValues, + disabled: checkedValues.includes('isManager') ? true : false, + }); + const { defaultStatusValue, params, detailType } = this.state; + const showJob = this.state.showJob ? '1' : '0'; + const nParam = { + ...params, + statusValue: defaultStatusValue.join(','), + typeValue: checkedValues.join(','), + }; + this.getDeatilDatas(nParam, detailType, showJob); }; render() { @@ -350,11 +411,30 @@ export default class DrawerComponents extends React.Component { columns, spinning, showJob, + defaultStatusValue, + defaultTypeValue, + disabled, } = this.state; let arr = []; const { labelData } = this.props; + const optionsType = [ + { label: '显示人员上下级', value: 'isManager' }, + { label: '显示次账号', value: 'isBelongTo' }, + ]; + + const optionsStatus = [ + { label: '试用', value: 0 }, + { label: '正式', value: 1 }, + { label: '临时', value: 2 }, + { label: '试用延期', value: 3 }, + { label: '解聘', value: 4 }, + { label: '离职', value: 5 }, + { label: '退休', value: 6 }, + { label: '无效', value: 7 }, + ]; + if (detailType == 'chart') { arr.push({ label: `${getLabel(547315, labelData)}`, key: '1' }); //arr.push({ label: '导出PDF', key: '2' }); @@ -367,7 +447,7 @@ export default class DrawerComponents extends React.Component { return ( { this.setState({ showJob: e.target.checked, }); - + const newParam = { + ...params, + statusValue: defaultStatusValue.join(','), + typeValue: defaultTypeValue.join(','), + }; this.getDeatilDatas( - params, + newParam, detailType, e.target.checked ? '1' : '0', ); @@ -403,44 +488,68 @@ export default class DrawerComponents extends React.Component { } > - {detailType == 'chart' ? ( -
- - {data.length > 0 && ( - (orgChart = chart)} - setClick={(click) => (addNodeChildFunc = click)} - onNodeClick={this.onNodeClick} - onButtonClick={this.onButtonClick} - data={data} - buttonContent={this.buttonContentRender} - nodeWidth={this.nodeWidthRender} - nodeHeight={this.nodeHeightRender} - nodeContent={this.nodeContentRender} + <> + {detailType == 'chart' && ( + +
显示模式： + + + + + )} + + 人员性质： + + - )} - - ) : ( -
-
- `${getLabel(547523, labelData)} ${ - dataSource.length - } ${getLabel(547524, labelData)}`, - }} - /> - - )} + + + {detailType == 'chart' ? ( +
+ + {data.length > 0 && ( + (orgChart = chart)} + setClick={(click) => (addNodeChildFunc = click)} + onNodeClick={this.onNodeClick} + onButtonClick={this.onButtonClick} + data={data} + buttonContent={this.buttonContentRender} + nodeWidth={this.nodeWidthRender} + nodeHeight={this.nodeHeightRender} + nodeContent={this.nodeContentRender} + /> + )} +
+ ) : ( +
+
+ `${getLabel(547523, labelData)} ${ + dataSource.length + } ${getLabel(547524, labelData)}`, + }} + /> + + )} + ); } diff --git a/src/pages/company.jsx b/src/pages/company.jsx index caa8dc2..100a459 100644 --- a/src/pages/company.jsx +++ b/src/pages/company.jsx @@ -185,10 +185,11 @@ export default function companyPage() {
-
${d.data.fname}
+
+
${d.data.fname}
+
${d.data.fname}
+
+
${d.data.staffNum} / ${d.data.onJobNum} @@ -206,8 +207,11 @@ export default function companyPage() {
-
${d.data.fname}
+
+
${d.data.fname}
+
${d.data.fname}
+
+
${d.data.staffNum} / ${d.data.onJobNum} diff --git a/src/pages/index.less b/src/pages/index.less index bd93022..618795f 100644 --- a/src/pages/index.less +++ b/src/pages/index.less @@ -114,6 +114,44 @@ } .ant-drawer-body { - padding: 0px; + padding: 0; overflow: hidden; } + +.tooltip { + position: relative; + display: inline-block; + cursor: pointer; + width: 110px; + margin: 0 auto; + line-height: 18px; + word-break: break-all; +} + +.tooltip .tooltitle { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.tooltip .tooltiptext { + visibility: hidden; + width: 144px; + background-color: #555; + color: #fff; + text-align: center; + border-radius: 6px; + padding: 5px 0; + position: absolute; + z-index: 1; + bottom: 125%; + left: 39%; + margin-left: -60px; + opacity: 0; + transition: opacity 0.3s; +} + +.tooltip:hover .tooltiptext { + visibility: visible; + opacity: 1; +} -- 2.40.0.windows.1 From 483c34fc05cec7cc9e90d84c4938e4c3061f7eb1 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Fri, 21 Jun 2024 14:27:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawer/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawer/index.jsx b/src/components/drawer/index.jsx index da2b727..1ba0031 100644 --- a/src/components/drawer/index.jsx +++ b/src/components/drawer/index.jsx @@ -439,7 +439,7 @@ export default class DrawerComponents extends React.Component { arr.push({ label: `${getLabel(547315, labelData)}`, key: '1' }); //arr.push({ label: '导出PDF', key: '2' }); } else { - arr.push({ label: '导出表格', key: '3' }); + arr.push({ label: `${getLabel(547448, labelData)}`, key: '3' }); } const menu = ; -- 2.40.0.windows.1 From d2e0da72978af139ae7c65c1e81e404ba4683f2b Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Fri, 21 Jun 2024 17:02:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=96=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawer/index.jsx | 30 +++++++++++++++--------------- src/pages/user.jsx | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/components/drawer/index.jsx b/src/components/drawer/index.jsx index 1ba0031..fe287ce 100644 --- a/src/components/drawer/index.jsx +++ b/src/components/drawer/index.jsx @@ -311,7 +311,7 @@ export default class DrawerComponents extends React.Component {
-
+
${d.data.fname} (${d.data.accountType})
@@ -368,7 +368,7 @@ export default class DrawerComponents extends React.Component { onStatusChange = (checkedValues) => { if (checkedValues.length === 0) { - return message.error('至少选择一种人员性质', 2); + return message.error(`${getLabel(547728, labelData)}`, 2); } this.setState({ defaultStatusValue: checkedValues, @@ -385,7 +385,7 @@ export default class DrawerComponents extends React.Component { onTypeChange = (checkedValues) => { if (this.state.showJob) { - return message.error('已勾选岗位模式显示', 2); + return message.error(`${getLabel(547729, labelData)}`, 2); } this.setState({ defaultTypeValue: checkedValues, @@ -420,19 +420,19 @@ export default class DrawerComponents extends React.Component { const { labelData } = this.props; const optionsType = [ - { label: '显示人员上下级', value: 'isManager' }, - { label: '显示次账号', value: 'isBelongTo' }, + { label: `${getLabel(547715, labelData)}`, value: 'isManager' }, + { label: `${getLabel(547716, labelData)}`, value: 'isBelongTo' }, ]; const optionsStatus = [ - { label: '试用', value: 0 }, - { label: '正式', value: 1 }, - { label: '临时', value: 2 }, - { label: '试用延期', value: 3 }, - { label: '解聘', value: 4 }, - { label: '离职', value: 5 }, - { label: '退休', value: 6 }, - { label: '无效', value: 7 }, + { label: `${getLabel(547718, labelData)}`, value: 0 }, + { label: `${getLabel(547719, labelData)}`, value: 1 }, + { label: `${getLabel(547720, labelData)}`, value: 2 }, + { label: `${getLabel(547721, labelData)}`, value: 3 }, + { label: `${getLabel(547722, labelData)}`, value: 4 }, + { label: `${getLabel(547723, labelData)}`, value: 5 }, + { label: `${getLabel(547724, labelData)}`, value: 6 }, + { label: `${getLabel(547725, labelData)}`, value: 7 }, ]; if (detailType == 'chart') { @@ -491,7 +491,7 @@ export default class DrawerComponents extends React.Component { <> {detailType == 'chart' && ( -
显示模式： + {getLabel(547714, labelData)}： )} - 人员性质： + {getLabel(547717, labelData)}： { document.cookie = - 'ecology_JSessionid=aaaZqe3BtezwSd-qOVlaz; JSESSIONID=aaaZqe3BtezwSd-qOVlaz; Systemlanguid=8; languageidweaver=8; loginidweaver=sysadmin; loginuuids=1; __randcode__=b79816fa-7088-4433-a17f-162b62453f2f'; + 'ecology_JSessionid=aaaIt6Y2NuzAQ98Ci0Jaz; Systemlanguid=7; JSESSIONID=aaaIt6Y2NuzAQ98Ci0Jaz; loginidweaver=sysadmin; loginuuids=1; languageidweaver=8; __randcode__=486bc6ba-9c04-47fc-a977-f7c55bab42e9'; d3.json( '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0', ).then((data) => { -- 2.40.0.windows.1