zhouna 3 роки тому
батько
коміт
f9287bcdbe

+ 2 - 2
src/common/common.less

@@ -23,10 +23,10 @@ body{
 .ant-form-item-label > label{
   color: #000;
 }
-.ant-table-wrapper{
+/*.ant-table-wrapper{
   height: calc(100vh - 240px);
   overflow-y: auto;
-}
+}*/
 .wrapper{
   min-width: 1214px;
   padding: 15px 30px;

+ 1 - 0
src/components/ATabs/index.less

@@ -5,6 +5,7 @@
   background: @bg-color;
   padding: 0 10px 10px;
   margin:0 10px;
+  height: calc(100vh - 60px);
   .ant-tabs-nav{
     height: 40px;
   }

+ 1 - 0
src/components/DataManager/index.js

@@ -334,6 +334,7 @@ function DataManager() {
         <Table
           columns={columns}
           dataSource={userList}
+          scroll={{ y: 'calc(100vh - 320px)' }}
           rowKey={record => record.id + record.roleName}
           pagination={{
             pageNo: 1,

+ 1 - 0
src/components/ExceptionLog/index.js

@@ -147,6 +147,7 @@ function ExceptionLog() {
 
         <Table
           columns={columns}
+          scroll={{ y: 'calc(100vh - 320px)' }}
           dataSource={logList}
           rowKey={record => record.operationId}
           pagination={{

+ 1 - 0
src/components/FuncManager/index.js

@@ -184,6 +184,7 @@ function OrgManager() {
     return (
       <Table
         pagination={false}
+        scroll={{ y: 'calc(100vh - 240px)' }}
         className="components-table-demo-nested"
         rowKey={record => record.id}
         columns={columns}

+ 1 - 0
src/components/InpaManager/index.js

@@ -292,6 +292,7 @@ function InpaManager() {
 
         <Table
           columns={columns}
+          scroll={{ y: 'calc(100vh - 320px)' }}
           dataSource={userList}
           rowKey={record => record.id}
           pagination={{

+ 1 - 0
src/components/LoginLog/index.js

@@ -104,6 +104,7 @@ function LoginLog() {
 
         <Table
           columns={columns}
+          scroll={{ y: 'calc(100vh - 320px)' }}
           dataSource={logList}
           rowKey={record => record.operationDate}
           pagination={{

+ 1 - 0
src/components/MsgManage/index.js

@@ -112,6 +112,7 @@ function MsgManage() {
         return (
             <Table
                 rowKey={record => record.id}
+                scroll={{ y: 'calc(100vh - 320px)' }}
                 columns={columns}
                 dataSource={dataSource}
                 pagination={{

+ 1 - 0
src/components/MyMessage/index.js

@@ -88,6 +88,7 @@ function MyMessage() {
             return (
                 <Table
                     rowKey={record => record.id}
+                    scroll={{ y: 'calc(100vh - 320px)' }}
                     columns={columns}
                     dataSource={dataSource}
                     pagination={{

+ 1 - 0
src/components/OperationLog/index.js

@@ -116,6 +116,7 @@ function OperationLog() {
 
         <Table
           columns={columns}
+          scroll={{ y: 'calc(100vh - 320px)' }}
           dataSource={logList}
           rowKey={record => record.operationDate}
           pagination={{

+ 1 - 0
src/components/OrgManager/index.js

@@ -299,6 +299,7 @@ function OrgManager() {
             return (
                 <Table
                     pagination={false}
+                    scroll={{ y: 'calc(100vh - 320px)' }}
                     className="components-table-demo-nested"
                     rowKey={record => record.deptId}
                     columns={columns}

+ 1 - 0
src/components/RoleManager/index.js

@@ -200,6 +200,7 @@ function RoleManager(){
             <Table
                 className="components-table-demo-nested"
                 rowKey={record => record.id}
+                scroll={{ y: 'calc(100vh - 320px)' }}
                 columns={columns}
                 dataSource={dataSource}
                 pagination={{

+ 1 - 0
src/components/UserManager/index.js

@@ -313,6 +313,7 @@ function UserManager() {
 
         <Table
           columns={columns}
+          scroll={{ y: 'calc(100vh - 320px)' }}
           dataSource={userList}
           rowKey={record => record.userId + record.hospitalName}
           pagination={{