wjx hace 1 mes
padre
commit
262381babe

+ 2 - 2
src/pages/gsData/gandRole/countryList.tsx

@@ -102,10 +102,10 @@ const CountryList: React.FC<Props> = ({ country, serverId, countryLevel }) => {
                         sorter: true
                     },
                     {
-                        title: '24小时内角色累计充值',
+                        title: '角色累计充值',
                         dataIndex: 'roleTotalAmount',
                         key: 'roleTotalAmount',
-                        width: 90,
+                        width: 80,
                         align: 'center',
                         sorter: true
                     },

+ 1 - 4
src/pages/gsData/roleIpMonitor/index.tsx

@@ -16,9 +16,7 @@ const RoleIpMonitor: React.FC = () => {
     /****************************************/
     const [queryForm, setQueryForm] = useState<GetRoleIpInfoListProps>({
         pageNum: 1,
-        pageSize: 30,
-        roleLevelMin: 16,
-        roleLevelMax: 16
+        pageSize: 30
     })
     const getRoleIpInfoList = useAjax((params) => getRoleIpInfoListApi(params))
     /****************************************/
@@ -30,7 +28,6 @@ const RoleIpMonitor: React.FC = () => {
     return <div>
         <TablePro
             leftChild={<QueryForm
-                initialValues={{ regPayIntervalTime: [16, 16] }}
                 isUserId
                 isNickname
                 isGameRoleName

+ 3 - 3
src/pages/gsData/roleIpMonitor/loginIpDetails.tsx

@@ -3,7 +3,7 @@ import { getRoleIpDetail1ListApi } from '@/services/gsData';
 import { Modal, Table } from 'antd';
 import React, { useEffect, useState } from 'react';
 
-const LoginIpDetails: React.FC<{ roleId: any, icon?: React.ReactNode }> = ({ roleId, icon }) => {
+const LoginIpDetails: React.FC<{ roleId: any, gameId: number, icon?: React.ReactNode }> = ({ roleId, gameId, icon }) => {
 
     /*********************************/
     const [visible, setVisible] = useState<boolean>(false)
@@ -12,9 +12,9 @@ const LoginIpDetails: React.FC<{ roleId: any, icon?: React.ReactNode }> = ({ rol
 
     useEffect(() => {
         if (visible) {
-            getRoleIpDetail1List.run({ roleId })
+            getRoleIpDetail1List.run({ roleId, gameId: [gameId] })
         }
-    }, [roleId, visible])
+    }, [roleId, visible, gameId])
 
     return <>
         <a onClick={() => setVisible(true)}>{icon}</a>

+ 7 - 7
src/pages/gsData/roleIpMonitor/tableConfig.tsx

@@ -59,31 +59,31 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 },
                 {
                     title: '角色登录IP数量', dataIndex: 'ip_count', label: '基本信息', align: 'center', width: 65, sorter: true, default: 8,
-                    render: (a: number, b: any) => <Statistic value={a || 0} suffix={<LoginIpDetails roleId={b.role_id} icon={<EyeOutlined />} />} />
+                    render: (a: number, b: any) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: 'red' } : {}} suffix={<LoginIpDetails gameId={b.game_id} roleId={b.role_id} icon={<EyeOutlined />} />} />
                 },
                 {
                     title: '同玩家角色数量', dataIndex: 'user_role_count', label: '基本信息', align: 'center', width: 65, sorter: true, default: 9,
-                    render: (a: number, b: any) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: '#52C41A' } : {}} suffix={<LookRoleDetails userId={b.association_user_id} icon={<EyeOutlined />} />} />
+                    render: (a: number, b: any) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: 'red' } : {}} suffix={<LookRoleDetails userId={b.association_user_id} icon={<EyeOutlined />} />} />
                 },
                 {
                     title: '角色同IP的玩家数量', dataIndex: 'user_count', label: '基本信息', align: 'center', width: 70, sorter: true, default: 10,
-                    render: (a: number, b: any) => <Statistic value={a || 0} suffix={<TongIpUser roleId={b.role_id} icon={<EyeOutlined />} />} />
+                    render: (a: number, b: any) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: 'red' } : {}} suffix={<TongIpUser roleId={b.role_id} icon={<EyeOutlined />} />} />
                 },
                 {
                     title: '同IP的角色数量', dataIndex: 'role_count', label: '基本信息', align: 'center', width: 70, sorter: true, default: 11,
-                    render: (a: number, b: any) => <Statistic value={a || 0} suffix={<RegIpRoleDetails roleId={b.role_id} excludeUserType={0} icon={<EyeOutlined />} />} />
+                    render: (a: number, b: any) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: 'red' } : {}} suffix={<RegIpRoleDetails roleId={b.role_id} excludeUserType={0} icon={<EyeOutlined />} />} />
                 },
                 {
                     title: '同IP的角色数量(排除同玩家)', dataIndex: 'ip_role_count_filter', label: '基本信息', align: 'center', width: 90, sorter: true, default: 12,
-                    render: (a: number, b: any) => <Statistic value={a || 0} suffix={<RegIpRoleDetails roleId={b.role_id} excludeUserType={1} icon={<EyeOutlined />} />} />
+                    render: (a: number, b: any) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: 'red' } : {}} suffix={<RegIpRoleDetails roleId={b.role_id} excludeUserType={1} icon={<EyeOutlined />} />} />
                 },
                 {
                     title: '同玩家IP的角色数量(排除同玩家)', dataIndex: 'role_user_ip_count_filter', label: '基本信息', align: 'center', width: 100, sorter: true, default: 13,
-                    render: (a: string) => <Statistic value={a || 0} />
+                    render: (a: number) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: 'red' } : {}} />
                 },
                 {
                     title: '角色所在玩家登录过的所有IP的统计数量', dataIndex: 'role_user_ip_count', label: '基本信息', align: 'center', width: 100, sorter: true, default: 14,
-                    render: (a: string) => <Statistic value={a || 0} />
+                    render: (a: number) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: 'red' } : {}} />
                 },
                 {
                     title: '创角时间至今', dataIndex: 'createTimeDiff', label: '角色游戏数据', align: 'center', width: 130, default: 15,

+ 15 - 11
src/pages/gsData/xjRoleGrade/tableConfig.tsx

@@ -37,24 +37,28 @@ function columns12(assignHandle: (data: any) => void): { label: string, fieldSHo
                     title: '区服名称', dataIndex: 'serverName', label: '基本信息', align: 'center', width: 80, default: 4,
                     render: (a: string) => (<WidthEllipsis value={a} />)
                 },
+                {
+                    title: '帮派', dataIndex: 'country', label: '基本信息', align: 'center', width: 80, default: 5,
+                    render: (a: string) => (<WidthEllipsis value={a} />)
+                },
                 {
                     title: '区服ID', dataIndex: 'serverId', label: '基本信息', align: 'center', width: 80,
                     render: (a: string) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '角色创建时间', dataIndex: 'createTime', label: '基本信息', align: 'center', width: 125, default: 5, sorter: true,
+                    title: '角色创建时间', dataIndex: 'createTime', label: '基本信息', align: 'center', width: 125, default: 6, sorter: true,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '角色等级', dataIndex: 'roleLevel', label: '基本信息', align: 'center', width: 60, sorter: true, default: 6,
+                    title: '角色等级', dataIndex: 'roleLevel', label: '基本信息', align: 'center', width: 60, sorter: true, default: 7,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '等级上报时间', dataIndex: 'levelTime', label: '基本信息', align: 'center', width: 120, default: 7, sorter: true,
+                    title: '等级上报时间', dataIndex: 'levelTime', label: '基本信息', align: 'center', width: 120, default: 8, sorter: true,
                     render: (a: string) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '等级上报时间距今', dataIndex: 'levelTimeDiff', label: '角色游戏数据', align: 'center', width: 100, default: 8,
+                    title: '等级上报时间距今', dataIndex: 'levelTimeDiff', label: '角色游戏数据', align: 'center', width: 120, default: 9,
                     render: (_: any, b: any) => {
                         if (b?.createTime) {
                             let a = (new Date().getTime() / 1000) - (new Date(b?.levelTime).getTime() / 1000)
@@ -72,7 +76,7 @@ function columns12(assignHandle: (data: any) => void): { label: string, fieldSHo
                     }
                 },
                 {
-                    title: '创角时间至今', dataIndex: 'createTimeDiff', label: '角色游戏数据', align: 'center', width: 100, default: 9,
+                    title: '创角时间至今', dataIndex: 'createTimeDiff', label: '角色游戏数据', align: 'center', width: 120, default: 10,
                     render: (_: any, b: any) => {
                         if (b?.createTime) {
                             let a = (new Date().getTime() / 1000) - (new Date(b?.createTime).getTime() / 1000)
@@ -95,10 +99,10 @@ function columns12(assignHandle: (data: any) => void): { label: string, fieldSHo
         {
             label: '客户管理操作',
             data: [
-                { title: 'GS', dataIndex: 'gsName', label: '客户管理操作', align: 'center', width: 80, default: 10, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
-                { title: '客服', dataIndex: 'customerServiceName', label: '客户管理操作', align: 'center', width: 80, default: 11, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
-                { title: '运营', dataIndex: 'operUserName', label: '客户管理操作', align: 'center', width: 80, default: 12, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
-                { title: '投手', dataIndex: 'putUserName', label: '客户管理操作', align: 'center', width: 80, default: 13, render: (a: string, b: any) => (<WidthEllipsis value={a} />) }
+                { title: 'GS', dataIndex: 'gsName', label: '客户管理操作', align: 'center', width: 80, default: 11, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
+                { title: '客服', dataIndex: 'customerServiceName', label: '客户管理操作', align: 'center', width: 80, default: 12, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
+                { title: '运营', dataIndex: 'operUserName', label: '客户管理操作', align: 'center', width: 80, default: 13, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
+                { title: '投手', dataIndex: 'putUserName', label: '客户管理操作', align: 'center', width: 80, default: 14, render: (a: string, b: any) => (<WidthEllipsis value={a} />) }
             ]
         },
         {
@@ -108,9 +112,9 @@ function columns12(assignHandle: (data: any) => void): { label: string, fieldSHo
                     title: '操作',
                     dataIndex: 'cz',
                     align: 'center',
-                    width: 60,
+                    width: 70,
                     label: '操作',
-                    default: 14,
+                    default: 15,
                     render: (_: any, b: any) => {
                         return <Space>
                             <LookRoleDetails userId={b.userId} />