perf: log

src/pages/log/loginLog/index.js

@@ -14,6 +14,7 @@ import { Chart, Interval, Tooltip, Axis } from 'bizcharts';
 import { DataSet } from '@antv/data-set';
 import moment from 'moment';
 import { post, PUBLISH_SERVICE } from '@/services/index';
+import styles from './index.less';
 
 const ServiceLog = () => {
   const [loading, setLoading] = useState(false); // 源数据
@@ -138,72 +139,76 @@ const ServiceLog = () => {
 
   return (
     <>
-      <Row style={{ padding: '10px', background: 'white' }}>
-        <Col span={24}>
-          <span style={{ lineHeight: 2 }}>时间：</span>
-          <DatePicker
-            showTime
-            format="YYYY-MM-DD HH:mm:ss"
-            placeholder="起始时间"
-            value={startTime}
-            onChange={changeStartTime}
-            allowClear={false}
-          />
-          <SwapRightOutlined style={{ lineHeight: 2 }} />
-          <DatePicker
-            showTime
-            format="YYYY-MM-DD HH:mm:ss"
-            placeholder="结束时间"
-            value={endTime}
-            onChange={changeEndTime}
-            style={{ marginRight: '10px' }}
-            allowClear={false}
-          />
-          <Button onClick={() => setTime(1)}>近1小时</Button>
-          <Button onClick={() => setTime(6)}>近6小时</Button>
-          <Button onClick={() => setTime(12)}>近12小时</Button>
-          <Button onClick={() => setTime(24)}>近1天</Button>
-          <Button onClick={() => setTime(24 * 7)}>近1周</Button>
-        </Col>
-      </Row>
-      <Spin spinning={loading} tip="loading">
-        <Row style={{ padding: '10px', background: 'white' }}>
-          <Col span={12}>
-            <Chart
-              height={316}
-              width={400}
-              autoFit
-              data={IPCount}
-              interactions={['active-region']}
-              padding="auto"
-            >
-              <Axis
-                name="IP"
-                label="null"
-                title={{ offset: 20, position: 'end' }}
-              />
-              <Axis name="计数" title />
-              <Interval position="IP*计数" />
-              <Tooltip shared />
-            </Chart>
+      <div className={styles.serviceLog}>
+        <Row className={styles.head}>
+          <Col span={24}>
+            <span style={{ lineHeight: 2 }}>时间：</span>
+            <DatePicker
+              showTime
+              format="YYYY-MM-DD HH:mm:ss"
+              placeholder="起始时间"
+              value={startTime}
+              onChange={changeStartTime}
+              allowClear={false}
+            />
+            <SwapRightOutlined style={{ lineHeight: 2 }} />
+            <DatePicker
+              showTime
+              format="YYYY-MM-DD HH:mm:ss"
+              placeholder="结束时间"
+              value={endTime}
+              onChange={changeEndTime}
+              style={{ marginRight: '10px' }}
+              allowClear={false}
+            />
+            <Button onClick={() => setTime(1)}>近1小时</Button>
+            <Button onClick={() => setTime(6)}>近6小时</Button>
+            <Button onClick={() => setTime(12)}>近12小时</Button>
+            <Button onClick={() => setTime(24)}>近1天</Button>
+            <Button onClick={() => setTime(24 * 7)}>近1周</Button>
           </Col>
         </Row>
-        <Table
-          size="small"
-          bordered
-          columns={columns}
-          dataSource={data0}
-          scroll={{ x: 'max-content' }}
-          pagination={{
-            showTotal: (total, range) =>
-              `第${range[0]}-${range[1]} 条/共 ${total} 条`,
-            pageSizeOptions: [10, 20, 50, 100],
-            defaultPageSize: 10,
-            showQuickJumper: true,
-            showSizeChanger: true,
-          }}
-        />
-      </Spin>
+        <Spin spinning={loading} tip="loading">
+          <Row className={styles.chart}>
+            <Col span={12}>
+              <Chart
+                height={316}
+                width={400}
+                autoFit
+                data={IPCount}
+                interactions={['active-region']}
+                padding="auto"
+              >
+                <Axis
+                  name="IP"
+                  label="null"
+                  title={{ offset: 20, position: 'end' }}
+                />
+                <Axis name="计数" title />
+                <Interval position="IP*计数" />
+                <Tooltip shared />
+              </Chart>
+            </Col>
+          </Row>
+          <div className={styles.table}>
+            <Table
+              size="small"
+              bordered
+              columns={columns}
+              dataSource={data0}
+              scroll={{ x: 'max-content' }}
+              pagination={{
+                showTotal: (total, range) =>
+                  `第${range[0]}-${range[1]} 条/共 ${total} 条`,
+                pageSizeOptions: [10, 20, 50, 100],
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                showSizeChanger: true,
+              }}
+            />
+          </div>
+        </Spin>
+      </div>
     </>
   );
 };

src/pages/log/loginLog/index.less

+.serviceLog{
+    .head{
+        padding: 10px;
+        background: white;
+        margin-bottom: 2px;
+        min-width: 1030px;
+    }
+    .chart{
+        padding: 16px;
+        background: white;
+    }
+    .table{
+        border-top: 1px solid #f0eded;
+        // overflow: auto;//不要这个，pagination否则无法固定底部
+        .ant-table-thead tr th{
+            font-weight: 600;
+            color:rgba(0,0,0,0.85);
+        }
+        .ant-table-content{
+            height:calc(100vh - 518px);
+            border-right: white;
+            overflow: auto !important;
+        }
+        .ant-pagination{
+            z-index: 999;
+            border-top: 1px solid #f0eded;
+        }
+        .ant-table-pagination{
+            padding-right: 12px;
+            background: white;
+            margin: 1px 0;
+            padding:8px;
+            padding-right: 20px;
+        }
+    }     
+}
\ No newline at end of file

src/pages/log/omsLog/index.less

@@ -10,17 +10,27 @@
         background: white;
     }
     .table{
-        height:calc(100vh - 452px);
-        overflow: auto;
+        border-top: 1px solid #f0eded;
+        // overflow: auto;//不要这个，pagination否则无法固定底部
         .ant-table-thead tr th{
             font-weight: 600;
             color:rgba(0,0,0,0.85);
         }
+        .ant-table-content{
+            height:calc(100vh - 500px);
+            border-right: white;
+            overflow: auto !important;
+        }
         .ant-pagination{
             z-index: 999;
+            border-top: 1px solid #f0eded;
+        }
+        .ant-table-pagination{
+            padding-right: 12px;
             background: white;
-            margin: 2px 0px;
-            padding:6px 10px;
-        } 
-    }       
+            margin: 1px 0;
+            padding:8px;
+            padding-right: 20px;
+        }
+    }     
 }
\ No newline at end of file

src/pages/log/serviceLog/index.less

@@ -10,17 +10,27 @@
         background: white;
     }
     .table{
-        height:calc(100vh - 452px);
-        overflow: auto;
+        border-top: 1px solid #f0eded;
+        // overflow: auto;//不要这个，pagination否则无法固定底部
         .ant-table-thead tr th{
             font-weight: 600;
             color:rgba(0,0,0,0.85);
         }
+        .ant-table-content{
+            height:calc(100vh - 500px);
+            border-right: white;
+            overflow: auto !important;
+        }
         .ant-pagination{
             z-index: 999;
+            border-top: 1px solid #f0eded;
+        }
+        .ant-table-pagination{
+            padding-right: 12px;
             background: white;
-            margin: 2px 0px;
-            padding:6px 10px;
-        } 
-    }       
+            margin: 1px 0;
+            padding:8px;
+            padding-right: 20px;
+        }
+    }     
 }
\ No newline at end of file

src/pages/platformCenter/dictionary/AppDic.less

+.AppDic{
+    overflow: auto;
+    .ant-table-thead tr th{
+        font-weight: 600;
+        color:rgba(0,0,0,0.85);
+    }
+    .ant-pagination{
+        z-index: 999;
+        background: white;
+        margin: 2px 0px;
+        padding:6px 10px;
+    }
+    .ant-table-tbody{
+        .clickRowStyle{
+            background: #cfe7fd;
+        }
+        .clickRowStyle:hover>td{
+            background: #aed8fa;
+        }
+    }
+    .ant-card-body{
+        padding: 10px !important;
+    }
+    .ant-table-thead tr th{
+        font-weight: 600;
+        color:rgba(0,0,0,0.85);
+    }
+    .ant-table-content{
+        height:calc(100vh - 258px);
+        border-right: white;
+        overflow: auto !important;
+    }
+    .ant-pagination{
+        z-index: 999;
+        border-top: 1px solid #f0eded;
+    }
+    .ant-table-pagination{
+        padding-right: 12px;
+        background: white;
+        margin: 1px 0;
+        padding:8px;
+        padding-right: 20px;
+    }
+}
\ No newline at end of file

src/pages/platformCenter/dictionary/WebDic.less

 .WebDic{
     overflow: auto;
-    height:calc(100vh-200px);
     .ant-table-thead tr th{
         font-weight: 600;
         color:rgba(0,0,0,0.85);
@@ -22,4 +21,24 @@
     .ant-card-body{
         padding: 10px !important;
     }
+    .ant-table-thead tr th{
+        font-weight: 600;
+        color:rgba(0,0,0,0.85);
+    }
+    .ant-table-content{
+        height:calc(100vh - 488px);
+        border-right: white;
+        overflow: auto !important;
+    }
+    .ant-pagination{
+        z-index: 999;
+        border-top: 1px solid #f0eded;
+    }
+    .ant-table-pagination{
+        padding-right: 12px;
+        background: white;
+        margin: 1px 0;
+        padding:8px;
+        padding-right: 20px;
+    }
 }
\ No newline at end of file