Browse Source

横向滚动条显示、高度调整

zhouna 3 years ago
parent
commit
c52be0e7da

+ 3 - 0
src/common/common.less

@@ -80,6 +80,9 @@ body{
 .ant-steps-item-icon, .ant-steps-item-content{
   vertical-align: unset;
 }
+.ant-tabs-tabpane{
+  overflow-x:auto;
+}
 //启用
 .Enable::before{
   content: "";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+ 6 - 5
src/components/OrgManager/index.js

@@ -87,7 +87,7 @@ function OrgManager() {
                 setVisible(false);
                 message.success((flag ? '启用' : '禁用') + "成功");
             } else {
-                message.warning(res.data.msg || '操作失败');
+                message.warning(res.data.message || '操作失败');
             }
         }).catch(() => {
             message.error("接口出错");
@@ -102,7 +102,7 @@ function OrgManager() {
                 setVisible(false)
                 message.success("重置成功");
             } else {
-                message.warning(res.data.msg || '操作失败');
+                message.warning(res.data.message || '操作失败');
             }
         }).catch(() => {
             message.error("接口出错");
@@ -117,7 +117,7 @@ function OrgManager() {
                 setVisible(false);
                 message.success("删除成功");
             } else {
-                message.warning(res.data.msg || '操作失败');
+                message.warning(res.data.message || '操作失败');
             }
         }).catch(() => {
             message.error("接口出错");
@@ -164,7 +164,7 @@ function OrgManager() {
                 structDetail(data);
                 //setOrgDetail(res.data.data);
             } else {
-                message.warning(res.data.msg || '获取详情失败')
+                message.warning(res.data.message || '获取详情失败')
             }
         });
     }
@@ -228,7 +228,7 @@ function OrgManager() {
                 message.success("添加成功");
 
             } else {
-                message.warning(res.data.msg || '操作失败');
+                message.warning(res.data.message || '操作失败');
             }
         }).catch(() => {
             message.error("接口出错");
@@ -355,6 +355,7 @@ function OrgManager() {
             return (
                 <Table
                     pagination={false}
+                    scroll={{ y: 'calc(100vh - 320px)' }}
                     className="components-table-demo-nested"
                     rowKey={record => record.hospitalId}
                     columns={columns}

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

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

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

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