Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

13404089107

2 天以前 dd076cee45ea103a43d6726a21d900f5484b3729

 management/src/pages/logManagement/index.jsx

@@ -14,24 +14,24 @@
    const columns = [
        {
            title: '操作时间',
            dataIndex: 'name',
            dataIndex: 'createTime',
            hideInTable: true,
            valueType: 'dateRange',
            order: 1,
        },
        {
            title: '操作用户',
            dataIndex: 'reportUserName',
            dataIndex: 'operatorName',
            order: 5,
        },
        {
            title: '联系电话',
            dataIndex: 'reportUserName',
            dataIndex: 'operatorPhone',
            order: 4,
        },
        {
            title: '操作类型',
            dataIndex: 'reportUserPhone',
            dataIndex: 'operatorCategory',
            order: 3,
            valueEnum: {
                1: '登录',
@@ -48,17 +48,16 @@
        },
        {
            title: '对象名称',
            dataIndex: 'name',
            dataIndex: 'targetName',
            hideInSearch: true,
        },
        {
            title: '所在IP',
            dataIndex: 'name',
            dataIndex: 'ip',
            order: 2,
        },
    ];
    return (
        <div>
            <PageContainer header={{
                breadcrumb: {},
            }}
@@ -78,14 +77,11 @@
                            delete params.startTime
                            delete params.endTime
                        }


                        return buildProTableDataSource(getList, params);
                    }}
                    search={{ labelWidth: 'auto', defaultCollapsed: false }}
                />
            </PageContainer>
        </div>
    );
};