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"