wjx пре 1 година
родитељ
комит
b96ddb26d7

+ 3 - 5
src/pages/gameDataStatistics/adlist/tencentMonitor/index.tsx

@@ -74,11 +74,9 @@ const TencentMonitor: React.FC = () => {
     return <div>
         <TableData
             czChild={<Space>
-                <Switch checkedChildren="开启操作" unCheckedChildren="关闭操作" checked={!isZj} onChange={(e) => { setIsZj(!e); }} />
-                {!isZj && <>
-                    <Button type='primary' size="small" style={{ background: '#67c23a', borderColor: '#67c23a' }} loading={editAdqAdgroupsData.loading} icon={<PlayCircleOutlined />} disabled={selectedRows.length === 0} onClick={() => adStatus('play')}>启动</Button>
-                    <Button type='primary' size="small" style={{ background: '#e6a23c', borderColor: '#e6a23c' }} loading={editAdqAdgroupsData.loading} icon={<PauseCircleOutlined />} disabled={selectedRows.length === 0} onClick={() => adStatus('suspend')}>暂停</Button>
-                </>}
+                <Switch checkedChildren="开启全选" unCheckedChildren="关闭全选" checked={!isZj} onChange={(e) => { setIsZj(!e); }} />
+                <Button type='primary' size="small" style={{ background: '#67c23a', borderColor: '#67c23a' }} loading={editAdqAdgroupsData.loading} icon={<PlayCircleOutlined />} disabled={selectedRows.length === 0} onClick={() => adStatus('play')}>启动</Button>
+                <Button type='primary' size="small" style={{ background: '#e6a23c', borderColor: '#e6a23c' }} loading={editAdqAdgroupsData.loading} icon={<PauseCircleOutlined />} disabled={selectedRows.length === 0} onClick={() => adStatus('suspend')}>暂停</Button>
                 <span style={{ color: 'red' }}>操作完数据结果延时5分钟之内,及时结果去腾讯后台查看</span>
             </Space>}
             leftChild={<QueryForm

+ 15 - 10
src/pages/gameDataStatistics/roleOperate/roleFightingRanking/tableConfig.tsx

@@ -55,21 +55,25 @@ function columns12() {
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '区服战力', dataIndex: 'server_combat_num', label: '区服信息', align: 'center', width: 90, default: 7,
+                    title: '区服攻击力', dataIndex: 'server_combat_num', label: '区服信息', align: 'right', width: 90, default: 7,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '合服名称', dataIndex: 'boss_server_name', label: '区服信息', align: 'center', width: 70, default: 4,
-                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
-                },
-                {
-                    title: '合服ID', dataIndex: 'boss_server_id', label: '区服信息', align: 'center', width: 70,
-                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
-                },
-                {
-                    title: '合服时间', dataIndex: 'merge_time', label: '区服信息', align: 'center', width: 140,
+                    title: '合服列表名', dataIndex: 'son_server_ids_name', label: '区服信息', align: 'center', width: 90, default: 4,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
+                // {
+                //     title: '合服名称', dataIndex: 'boss_server_name', label: '区服信息', align: 'center', width: 70,
+                //     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+                // },
+                // {
+                //     title: '合服ID', dataIndex: 'boss_server_id', label: '区服信息', align: 'center', width: 70,
+                //     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+                // },
+                // {
+                //     title: '合服时间', dataIndex: 'merge_time', label: '区服信息', align: 'center', width: 140,
+                //     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+                // },
                 {
                     title: '合服次数', dataIndex: 'sum_server_count', label: '区服信息', align: 'center', width: 60, 
                     render: (a: string) => <Statistic value={a || 0} />
@@ -233,6 +237,7 @@ function columns12() {
                             dataIndex: 'combat_num',
                             key: 'combat_num',
                             width: 95,
+                            align: 'right',
                             className: "h5BiomassClass green2ColorClass",
                             render: (a: any, b: any) => {
                                 return <div className='h5BiomassTable'>

+ 1 - 1
src/pages/gameDataStatistics/roleOperate/roleRechargeRanking/tableConfig.tsx

@@ -30,7 +30,7 @@ function columns12(
                 { title: '角色创建时间', dataIndex: 'role_create_time', label: '角色信息', align: 'center', width: 140, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
                 { title: '角色VIP等级', dataIndex: 'vip_level', label: '角色信息', align: 'center', width: 60, default: 3, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
                 { title: '角色等级', dataIndex: 'role_level', label: '角色信息', align: 'center', width: 65, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
-                { title: '角色攻击力', dataIndex: 'combat_num', label: '角色信息', width: 95, render: (a: string, b: any) => (<Statistic value={a || 0} />) },
+                { title: '角色攻击力', dataIndex: 'combat_num', label: '角色信息', width: 95, align: 'right', render: (a: string, b: any) => (<Statistic value={a || 0} />) },
             ],
         },
         {