fix

src/pages/gameDataStatistics/gameData/everyday/tableConfig.tsx

@@ -35,7 +35,7 @@ function columnsNature12(rechargeTrendHandle: (data: any) => void): { label: str
             dataIndex: `D${index + 1}`,
             label: "付费趋势",
             align: "center",
-            width: 120,
+            width: 135,
             render: (a: any, b: any) => {
                 let date1 = moment()
                 if (b?.costDate === '总计') {
@@ -292,7 +292,60 @@ function columnsNature12(rechargeTrendHandle: (data: any) => void): { label: str
                 {
                     title: '账面ARPPU', dataIndex: 'amountArpu', label: '付费数据', align: 'center', width: 70, sorter: true,
                     render: (a: string) => <Statistic value={a || 0} />
-                }
+                },
+                { title: '首日有效创角人数', dataIndex: 'firstEffectiveRoleNum', label: '付费数据', align: 'center', width: 80, sorter: true, },
+                { title: '新用户累计有效创角人数', dataIndex: 'newUserTotalEffectiveRoleNum', label: '付费数据', align: 'center', width: 85, sorter: true, },
+                { title: '有效创角人数', dataIndex: 'effectiveRoleNum', label: '付费数据', align: 'center', width: 70, sorter: true, },
+                {
+                    title: '首日有效创角率', dataIndex: 'firstEffectiveRoleRate', label: '付费数据', align: 'center', width: 90, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} precision={2} valueStyle={!a ? {} : a >= 100 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                },
+                {
+                    title: '新用户累计有效创角率', dataIndex: 'newUserTotalEffectiveRoleNumRate', label: '付费数据', align: 'center', width: 100, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} precision={2} valueStyle={!a ? {} : a >= 100 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                },
+                {
+                    title: '有效创角率', dataIndex: 'effectiveRoleNumRate', label: '付费数据', align: 'center', width: 90, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} precision={2} valueStyle={!a ? {} : a >= 100 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                },
+                {
+                    title: '首日有效创角成本', dataIndex: 'firstEffectiveRoleNumCost', label: '付费数据', align: 'center', width: 80, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                },
+                {
+                    title: '新用户累计有效创角成本', dataIndex: 'newUserTotalEffectiveRoleNumCost', label: '付费数据', align: 'center', width: 85, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                },
+                {
+                    title: '有效创角成本', dataIndex: 'effectiveRoleNumCost', label: '付费数据', align: 'center', width: 75, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                },
+                { title: '首日有效创角付费人数', dataIndex: 'firstEffectiveRoleAmountNum', label: '付费数据', align: 'center', width: 80, sorter: true, },
+                { title: '新用户累计有效创角付费人数', dataIndex: 'newUserTotalEffectiveRoleAmountNum', label: '付费数据', align: 'center', width: 95, sorter: true, },
+                {
+                    title: '首日有效创角付费成本', dataIndex: 'firstEffectiveRoleAmountNumCost', label: '付费数据', align: 'center', width: 80, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                },
+                {
+                    title: '新用户累计有效创角付费成本', dataIndex: 'newUserTotalEffectiveRoleAmountNumCost', label: '付费数据', align: 'center', width: 95, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                },
+                {
+                    title: '首日有效创角付费比', dataIndex: 'firstEffectiveRoleAmountNumRate', label: '付费数据', align: 'center', width: 90, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} precision={2} valueStyle={!a ? {} : a >= 100 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                },
+                {
+                    title: '新用户累计有效创角付费比', dataIndex: 'newUserTotalEffectiveRoleAmountNumRate', label: '付费数据', align: 'center', width: 90, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} precision={2} valueStyle={!a ? {} : a >= 100 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                },
+                {
+                    title: '首日有效创角ARPU', dataIndex: 'firstEffectiveRoleArpu', label: '付费数据', align: 'center', width: 70, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '新用户累计有效创角ARPU', dataIndex: 'newUserTotalEffectiveRoleArpu', label: '付费数据', align: 'center', width: 80, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} />
+                },
             ]
         },
         {

src/pages/gameDataStatistics/gameData/total/tableConfig.tsx

@@ -59,7 +59,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '新用户充值成本', dataIndex: 'newUserRechargeCost', label: '付费数据', align: 'center', width: 70, default: 14,
+                    title: '新用户充值成本', dataIndex: 'newUserRechargeCost', label: '付费数据', align: 'center', width: 80, default: 14,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
@@ -240,7 +240,60 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 {
                     title: '账面ARPPU', dataIndex: 'amountArpu', label: '付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
-                }
+                },
+                { title: '首日有效创角人数', dataIndex: 'firstEffectiveRoleNum', label: '付费数据', align: 'center', width: 80, sorter: true, },
+                { title: '新用户累计有效创角人数', dataIndex: 'newUserTotalEffectiveRoleNum', label: '付费数据', align: 'center', width: 85, sorter: true, },
+                { title: '有效创角人数', dataIndex: 'effectiveRoleNum', label: '付费数据', align: 'center', width: 70, sorter: true, },
+                {
+                    title: '首日有效创角率', dataIndex: 'firstEffectiveRoleRate', label: '付费数据', align: 'center', width: 90, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} precision={2} valueStyle={!a ? {} : a >= 100 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                },
+                {
+                    title: '新用户累计有效创角率', dataIndex: 'newUserTotalEffectiveRoleNumRate', label: '付费数据', align: 'center', width: 100, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} precision={2} valueStyle={!a ? {} : a >= 100 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                },
+                {
+                    title: '有效创角率', dataIndex: 'effectiveRoleNumRate', label: '付费数据', align: 'center', width: 90, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} precision={2} valueStyle={!a ? {} : a >= 100 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                },
+                {
+                    title: '首日有效创角成本', dataIndex: 'firstEffectiveRoleNumCost', label: '付费数据', align: 'center', width: 80, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                },
+                {
+                    title: '新用户累计有效创角成本', dataIndex: 'newUserTotalEffectiveRoleNumCost', label: '付费数据', align: 'center', width: 85, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                },
+                {
+                    title: '有效创角成本', dataIndex: 'effectiveRoleNumCost', label: '付费数据', align: 'center', width: 75, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                },
+                { title: '首日有效创角付费人数', dataIndex: 'firstEffectiveRoleAmountNum', label: '付费数据', align: 'center', width: 80, sorter: true, },
+                { title: '新用户累计有效创角付费人数', dataIndex: 'newUserTotalEffectiveRoleAmountNum', label: '付费数据', align: 'center', width: 95, sorter: true, },
+                {
+                    title: '首日有效创角付费成本', dataIndex: 'firstEffectiveRoleAmountNumCost', label: '付费数据', align: 'center', width: 80, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                },
+                {
+                    title: '新用户累计有效创角付费成本', dataIndex: 'newUserTotalEffectiveRoleAmountNumCost', label: '付费数据', align: 'center', width: 95, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                },
+                {
+                    title: '首日有效创角付费比', dataIndex: 'firstEffectiveRoleAmountNumRate', label: '付费数据', align: 'center', width: 90, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} precision={2} valueStyle={!a ? {} : a >= 100 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                },
+                {
+                    title: '新用户累计有效创角付费比', dataIndex: 'newUserTotalEffectiveRoleAmountNumRate', label: '付费数据', align: 'center', width: 90, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} precision={2} valueStyle={!a ? {} : a >= 100 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                },
+                {
+                    title: '首日有效创角ARPU', dataIndex: 'firstEffectiveRoleArpu', label: '付费数据', align: 'center', width: 70, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '新用户累计有效创角ARPU', dataIndex: 'newUserTotalEffectiveRoleArpu', label: '付费数据', align: 'center', width: 80, sorter: true,
+                    render: (a: string) => <Statistic value={a || 0} />
+                },
             ]
         }
     ]

src/pages/gameDataStatistics/gameServer/serverGsData/tableConfig.tsx

@@ -66,12 +66,16 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                                         <span>超大R：</span>
                                         <span>{data?.superR}%</span>
                                     </span>
+                                    <span style={{ color: '#0f538a', fontWeight: 600 }}>
+                                        <span>R总：</span>
+                                        <span>{data?.rtotalRetention}%</span>
+                                    </span>
                                 </div>
                             </div>
                         }
-                        return <div style={{ height: 126, lineHeight: '126px' }}>--</div>
+                        return <div style={{ height: 147.5, lineHeight: '126px' }}>--</div>
                     }
-                    return <div style={{ height: 126, lineHeight: '126px' }}>--</div>
+                    return <div style={{ height: 147.5, lineHeight: '126px' }}>--</div>
                 }
             },{
                 title: `总人数`,
@@ -122,12 +126,16 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                                         <span>超大R：</span>
                                         <span>{data?.superRNum}</span>
                                     </span>
+                                    <span style={{ color: '#2f54eb', fontWeight: 600 }}>
+                                        <span>R总：</span>
+                                        <span>{data?.rtotal}</span>
+                                    </span>
                                 </div>
                             </div>
                         }
-                        return <div style={{ height: 126, lineHeight: '126px' }}>--</div>
+                        return <div style={{ height: 147.5, lineHeight: '126px' }}>--</div>
                     }
-                    return <div style={{ height: 126, lineHeight: '126px' }}>--</div>
+                    return <div style={{ height: 147.5, lineHeight: '126px' }}>--</div>
                 }
             }]
         }