From e06728670b2ab4963c7e22060ec41e2708fd2cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 20 Jun 2023 14:25:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E6=95=B0=E6=8D=AE=E9=87=87?= =?UTF-8?q?=E9=9B=86=E9=A1=B5=E9=9D=A2=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attendance/components/attendanceDataViewSlide.js | 6 +++--- .../pages/dataAcquisition/components/tableRecord.js | 3 ++- pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js | 2 +- pc4mobx/hrmSalary/pages/dataAcquisition/layout.js | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js index b692e31e..45fa6bfe 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js @@ -102,8 +102,8 @@ class AttendanceDataViewSlide extends Component { className="attendanceSlideWrapper" top={0} measureT="%" - width={800} - measureX="px" + width={80} + measureX="%" height={100} measureY="%" direction="right" @@ -131,7 +131,7 @@ class AttendanceDataViewSlide extends Component { dataSource={dataSource} pagination={pagination} loading={loading.query} - xWidth={columns.length * 120} + xWidth={columns.length * 180} /> } diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js index 00fedce7..f3c9e716 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js @@ -58,7 +58,7 @@ class TableRecord extends Component { }, pageInfo: { current: 1, pageSize: 10, total: 0 - }, + } }, () => this.getTableRecordData()); }; @@ -186,6 +186,7 @@ class TableRecord extends Component { dataSource={dataSource} pagination={pagination} loading={loading.query} + xWidth={columns.length * 180} /> ); diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js index 579cb872..7f41b9de 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js @@ -154,7 +154,7 @@ class DataTables extends Component { dataSource={dataSource} pagination={pagination} loading={loading.query} - xWidth={getColumns.length * 150} + xWidth={getColumns.length * 160} />; } } diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js index 631d0586..4c421d60 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js @@ -106,8 +106,8 @@ class Layout extends Component { visible={visible} top={0} measureT="%" - width={1000} - measureX="px" + width={80} + measureX="%" height={100} measureY="%" direction="right"