fix

src/pages/gameDataStatistics/adlist/monitor/index.tsx

@@ -42,7 +42,7 @@ const Monitor = () => {
             leftChild={<QueryForm
                 initialValues={{ sourceSystem: 'ZX_ONE', consumeDay: [moment(), moment()] }}
                 onChange={(data: any) => {
-                    const { type, gameClassify, costBeginDay, costEndDay, sysUserName, ...params } = data
+                    const { type, gameClassify, costBeginDay, costEndDay, sysUserName, regPayIntervalTime, ...params } = data
                     let newQueryForm = JSON.parse(JSON.stringify(queryForm))
                     newQueryForm.pageNum = 1
                     newQueryForm.pitcherName = sysUserName
@@ -55,7 +55,10 @@ const Monitor = () => {
                         delete newQueryForm.costBeginDate
                         delete newQueryForm.costEndDate
                     }
-
+                    if (regPayIntervalTime?.length > 0 && (regPayIntervalTime[0] || regPayIntervalTime[1])) {
+                        newQueryForm.firstRechargeAmountMin = regPayIntervalTime[0]
+                        newQueryForm.firstRechargeAmountMax = regPayIntervalTime[1]
+                    }
                     setQueryForm({ ...newQueryForm, ...params })
                 }}
                 isSource
@@ -73,6 +76,7 @@ const Monitor = () => {
                 isPromotionId
                 isPromotionName
                 isAdTTStatus
+                isPayIntervalTime={{ tips: '首日充值金额区间（元）' }}
             />}
             isZj
             totalData={totalData}

src/pages/gameDataStatistics/player/list/index.tsx

@@ -143,6 +143,7 @@ const List: React.FC = () => {
                 isAccountId
                 isSysUserId
                 isCreateRole
+                isGameRoleName
                 isPayIntervalTime={{ tips: '充值距注册时间区间(分钟)' }}
                 isRoleCount={{ tips: '每个账号角色数量区间' }}
             />}

src/pages/gameDataStatistics/roleOperate/roleFightingRanking/tableConfig.tsx

@@ -51,7 +51,7 @@ function columns12() {
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '开服天数', dataIndex: 'start_day', label: '区服信息', align: 'center', width: 60,  default: 11,
+                    title: '开服天数', dataIndex: 'start_day', label: '区服信息', align: 'center', width: 60,  default: 11, sorter: true,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
@@ -78,6 +78,32 @@ function columns12() {
                     title: '合服次数', dataIndex: 'sum_server_count', label: '区服信息', align: 'center', width: 60, default: 12,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
+                {
+                    title: '最小原始子服开服时间', dataIndex: 'min_server_start_time', label: '区服信息', align: 'center', width: 140,
+                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+                },
+                {
+                    title: '最小原始子服开服距今天数',
+                    dataIndex: 'minServerStarttimeDiff',
+                    align: 'center',
+                    label: '区服信息',
+                    width: 130,
+                    sorter: true,
+                    render: (a: string, b: any) => {
+                        let diff = 0
+                        if (b.min_server_start_time) {
+                            diff = new Date().getTime() - new Date(b.min_server_start_time).getTime()
+                        }
+                        function secondsToDhms(seconds: any) {
+                            const days = Math.floor(seconds / (3600 * 24));
+                            const hours = Math.floor((seconds % (3600 * 24)) / 3600);
+                            const minutes = Math.floor((seconds % 3600) / 60);
+                            const remainingSeconds = seconds % 60;
+                            return `${days ? days + "天" : ''}${hours ? hours + "小时" : ''}${minutes ? minutes + "分" : ''}${remainingSeconds ? remainingSeconds.toFixed(0) + "秒" : ''}`
+                        }
+                        return diff ? <span><WidthEllipsis value={secondsToDhms(diff / 1000)} /></span> : '--'
+                    }
+                },
             ]
         },
         {
@@ -236,7 +262,7 @@ function columns12() {
                             title: '角色攻击力',
                             dataIndex: 'combat_num',
                             key: 'combat_num',
-                            width: 95,
+                            width: 90,
                             align: 'right',
                             className: "h5BiomassClass green2ColorClass",
                             render: (a: any, b: any) => {
@@ -249,6 +275,23 @@ function columns12() {
                                 </div>
                             }
                         },
+                        {
+                            title: '角色累计充值金额',
+                            dataIndex: 'total_amount',
+                            key: 'total_amount',
+                            width: 70,
+                            align: 'right',
+                            className: "h5BiomassClass green2ColorClass",
+                            render: (a: any, b: any) => {
+                                return <div className='h5BiomassTable'>
+                                    {b?.role_rank_date?.map((item: any, index: number) => {
+                                        return <div key={'cc' + index}>
+                                            <div><span><Statistic value={item.total_amount || 0} /></span></div>
+                                        </div>
+                                    })}
+                                </div>
+                            }
+                        },
                     ]
                 }
             ]

src/pages/gameDataStatistics/roleOperate/roleRechargeRanking/tableConfig.tsx

@@ -23,6 +23,7 @@ function columns12(
             label: '角色信息',
             data: [
                 { title: '游戏', dataIndex: 'role_reg_parent_game_name', label: '角色信息', align: 'center', width: 70, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
+                { title: '原始区服名', dataIndex: 'source_server_name', label: '玩家信息', align: 'center', width: 90, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
                 { title: '游戏区服', dataIndex: 'server_name', label: '玩家信息', align: 'center', width: 90, default: 4, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
                 { title: '区服ID', dataIndex: 'server_id', label: '角色信息', align: 'center', width: 70, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
                 { title: '角色名称', dataIndex: 'role_name', label: '角色信息', align: 'center', width: 90, default: 2, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
@@ -30,7 +31,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, align: 'right', render: (a: string, b: any) => (<Statistic value={a || 0} />) },
+                { title: '角色攻击力', dataIndex: 'combat_num', label: '角色信息', width: 95, align: 'right', sorter: true, render: (a: string, b: any) => (<Statistic value={a || 0} />) },
             ],
         },
         {
@@ -174,6 +175,27 @@ function columns12(
                         return diff ? <span style={Math.floor((diff / 1000) / (3600 * 24)) > 1 ? { color: 'red' } : {}}><WidthEllipsis value={secondsToDhms(diff / 1000)} /></span> : '--'
                     }
                 },
+                {
+                    title: '角色最近活跃距今',
+                    dataIndex: 'roleActiveTimeDiff',
+                    align: 'center',
+                    label: '角色充值信息',
+                    width: 130,
+                    render: (a: string, b: any) => {
+                        let diff = 0
+                        if (b.role_active_time) {
+                            diff = new Date().getTime() - new Date(b.role_active_time).getTime()
+                        }
+                        function secondsToDhms(seconds: any) {
+                            const days = Math.floor(seconds / (3600 * 24));
+                            const hours = Math.floor((seconds % (3600 * 24)) / 3600);
+                            const minutes = Math.floor((seconds % 3600) / 60);
+                            const remainingSeconds = seconds % 60;
+                            return `${days ? days + "天" : ''}${hours ? hours + "小时" : ''}${minutes ? minutes + "分" : ''}${remainingSeconds ? remainingSeconds.toFixed(0) + "秒" : ''}`
+                        }
+                        return diff ? <span style={Math.floor((diff / 1000) / (3600 * 24)) > 1 ? { color: 'red' } : {}}><WidthEllipsis value={secondsToDhms(diff / 1000)} /></span> : '--'
+                    }
+                },
             ],
         },
         {