wjx 1 год назад
Родитель
Сommit
e1ea6b6257

+ 18 - 1
src/components/QueryForm/index.tsx

@@ -214,6 +214,8 @@ interface Props {
     isServerIdUn?: boolean
     isServerIdUn?: boolean
     /** 是否开启 是否退游 搜索 */
     /** 是否开启 是否退游 搜索 */
     isRemoveGame?: boolean
     isRemoveGame?: boolean
+    /** 是否开启 是否退游系统 搜索 */
+    isRemoveGameForSystem?: boolean
 }
 }
 /**
 /**
  * 游戏数据系统 请求参数
  * 游戏数据系统 请求参数
@@ -227,7 +229,7 @@ const QueryForm: React.FC<Props> = (props) => {
         isGameRoleName, isFirstRecharge, isSwitch, isMerchantNo, isOrderId, isMerchantOrderNo, isPayStatus, isPayWay, isProductName, isRegAgent, isAgentId, isPutAgent, isRegDay, isOs, isParentId, isProjectId, isProjectName, isPromotionId, isPromotionId1, isPromotionName,
         isGameRoleName, isFirstRecharge, isSwitch, isMerchantNo, isOrderId, isMerchantOrderNo, isPayStatus, isPayWay, isProductName, isRegAgent, isAgentId, isPutAgent, isRegDay, isOs, isParentId, isProjectId, isProjectName, isPromotionId, isPromotionId1, isPromotionName,
         isSysUserName, isRechargeDate, isBGGameClassify, isGameUserId, isSysUserId, isUserName, isUserId, isSelectRanking, isGameType, isConsumeDay, rechargeDay, isBeginDay, isType, isAdTTStatus, isUserEnterType, isServerName, isServerId, isServerDay, isAdTXStatus,
         isSysUserName, isRechargeDate, isBGGameClassify, isGameUserId, isSysUserId, isUserName, isUserId, isSelectRanking, isGameType, isConsumeDay, rechargeDay, isBeginDay, isType, isAdTTStatus, isUserEnterType, isServerName, isServerId, isServerDay, isAdTXStatus,
         payTimeDay, placeAnOrderDay, isPayIntervalTime, isActiveTypes, isNickname, isMobile, isRegIp, isIsAuth, isIsBindMobile, isIsRecharge, isUserStatus, isCreateRole, isRoleCount, isVipLevel, isCreateRoleDay, isIsChange, isIsSendMail, isWeChatCompany, isWeChat,
         payTimeDay, placeAnOrderDay, isPayIntervalTime, isActiveTypes, isNickname, isMobile, isRegIp, isIsAuth, isIsBindMobile, isIsRecharge, isUserStatus, isCreateRole, isRoleCount, isVipLevel, isCreateRoleDay, isIsChange, isIsSendMail, isWeChatCompany, isWeChat,
-        isCustomerServerId, isOperatorId, isGsId, isServerIds, isRankingNum, isIsMergeServer, isSuperParentGameId, isGameServerName, isIp, isDeviceType, isLoginType, isServerIdUn, isSourceServerName, isProjectId1, isRemoveGame
+        isCustomerServerId, isOperatorId, isGsId, isServerIds, isRankingNum, isIsMergeServer, isSuperParentGameId, isGameServerName, isIp, isDeviceType, isLoginType, isServerIdUn, isSourceServerName, isProjectId1, isRemoveGame, isRemoveGameForSystem
     } = props
     } = props
     const [form] = Form.useForm()
     const [form] = Form.useForm()
     const parentId = Form.useWatch('parentId', form)
     const parentId = Form.useWatch('parentId', form)
@@ -1231,6 +1233,21 @@ const QueryForm: React.FC<Props> = (props) => {
                 </Select>
                 </Select>
             </Form.Item></Col>}
             </Form.Item></Col>}
 
 
+            {/* 是否退游 */}
+            {isRemoveGameForSystem && <Col><Form.Item name='isRemoveGameForSystem'>
+                <Select
+                    showSearch
+                    allowClear
+                    placeholder={'系统判定是否退游'}
+                    filterOption={(input, option) =>
+                        (option?.children as any)?.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                    }
+                >
+                    <Select.Option value="1">退游</Select.Option>
+                    <Select.Option value="0">未退游</Select.Option>
+                </Select>
+            </Form.Item></Col>}
+
             {/* 是否退游 */}
             {/* 是否退游 */}
             {isRemoveGame && <Col><Form.Item name='isRemoveGame'>
             {isRemoveGame && <Col><Form.Item name='isRemoveGame'>
                 <Select
                 <Select

+ 1 - 0
src/pages/gameDataStatistics/roleOperate/roleRechargeRanking/index.tsx

@@ -143,6 +143,7 @@ const RoleRechargeRanking: React.FC = () => {
                 isServerIds
                 isServerIds
                 isIsMergeServer
                 isIsMergeServer
                 isRemoveGame
                 isRemoveGame
+                isRemoveGameForSystem
                 isPayIntervalTime={{ tips: '角色累计充值金额区间(单位:元)' }}
                 isPayIntervalTime={{ tips: '角色累计充值金额区间(单位:元)' }}
             />}
             />}
             scroll={{ x: 1000, y: 600 }}
             scroll={{ x: 1000, y: 600 }}

+ 16 - 9
src/pages/gameDataStatistics/roleOperate/roleRechargeRanking/tableConfig.tsx

@@ -1,6 +1,6 @@
 import ProgressTable from "@/components/ProgressTable"
 import ProgressTable from "@/components/ProgressTable"
 import WidthEllipsis from "@/components/widthEllipsis"
 import WidthEllipsis from "@/components/widthEllipsis"
-import { Badge, Popconfirm, Space, Statistic } from "antd"
+import { Badge, Popconfirm, Space, Statistic, Tag } from "antd"
 import React from "react"
 import React from "react"
 import SendEmailDetails from "./sendEmailDetails"
 import SendEmailDetails from "./sendEmailDetails"
 import './index.less'
 import './index.less'
@@ -225,14 +225,14 @@ function columns12(
                     title: '是否转端', dataIndex: 'is_change_game_type', label: '客户运营操作', align: 'center', width: 60,
                     title: '是否转端', dataIndex: 'is_change_game_type', label: '客户运营操作', align: 'center', width: 60,
                     render: (a: any, b: any) => {
                     render: (a: any, b: any) => {
                         // return <IsTrue value={a ? '1' : '0'} onChange={(value) => handleIsTrue(value, b, 'isChangeGameType')} />
                         // return <IsTrue value={a ? '1' : '0'} onChange={(value) => handleIsTrue(value, b, 'isChangeGameType')} />
-                        return a ? '是' : '否'
+                        return a ? <Badge status="error" text="是" /> : <Badge status="processing" text="否"/>
                     },
                     },
                 },
                 },
                 {
                 {
                     title: '是否添加企微', dataIndex: 'is_add_corp_wechat', label: '客户运营操作', align: 'center', width: 60,
                     title: '是否添加企微', dataIndex: 'is_add_corp_wechat', label: '客户运营操作', align: 'center', width: 60,
                     render: (a: any, b: any) => {
                     render: (a: any, b: any) => {
                         // return <IsTrue value={a ? '1' : '0'} onChange={(value) => handleIsTrue(value, b, 'isAddCorpWechat')} />
                         // return <IsTrue value={a ? '1' : '0'} onChange={(value) => handleIsTrue(value, b, 'isAddCorpWechat')} />
-                        return a ? '是' : '否'
+                        return a ? <Badge status="error" text="是" /> : <Badge status="processing" text="否"/>
                     },
                     },
                 },
                 },
                 {
                 {
@@ -256,18 +256,25 @@ function columns12(
                         return <WidthEllipsis value={a} />
                         return <WidthEllipsis value={a} />
                     },
                     },
                 },
                 },
+                {
+                    title: '是否退游(系统判定)', tips: '角色最近活跃时间距今”大于72小时且“角色最近充值时间距今”大于72小时,判定为“退游”,否则“未退游”。', dataIndex: 'is_remove_game_for_system', label: '客户运营操作', align: 'center', width: 80,
+                    render: (a: any, b: any) => {
+                        // return <IsTrue value={a ? '1' : '0'} onChange={(value) => handleIsTrue(value, b, 'isRemoveGame')} />
+                        return a ? <Badge status="error" text="是" /> : <Badge status="processing" text="否" />
+                    },
+                },
                 {
                 {
                     title: '是否退游', dataIndex: 'is_remove_game', label: '客户运营操作', align: 'center', width: 50,
                     title: '是否退游', dataIndex: 'is_remove_game', label: '客户运营操作', align: 'center', width: 50,
                     render: (a: any, b: any) => {
                     render: (a: any, b: any) => {
                         // return <IsTrue value={a ? '1' : '0'} onChange={(value) => handleIsTrue(value, b, 'isRemoveGame')} />
                         // return <IsTrue value={a ? '1' : '0'} onChange={(value) => handleIsTrue(value, b, 'isRemoveGame')} />
-                        return a ? '是' : '否'
+                        return a ? <Badge status="error" text="是" /> : <Badge status="processing" text="否"/>
                     },
                     },
                 },
                 },
                 {
                 {
                     title: '是否唤醒', dataIndex: 'is_wake_up', label: '客户运营操作', align: 'center', width: 50,
                     title: '是否唤醒', dataIndex: 'is_wake_up', label: '客户运营操作', align: 'center', width: 50,
                     render: (a: any, b: any) => {
                     render: (a: any, b: any) => {
                         // return <IsTrue value={a ? '1' : '0'} onChange={(value) => handleIsTrue(value, b, 'isWakeUp')} />
                         // return <IsTrue value={a ? '1' : '0'} onChange={(value) => handleIsTrue(value, b, 'isWakeUp')} />
-                        return a ? '是' : '否'
+                        return a ? <Badge status="error" text="是" /> : <Badge status="processing" text="否"/>
                     },
                     },
                 },
                 },
                 {
                 {
@@ -323,9 +330,9 @@ function columns12(
                     default: 20,
                     default: 20,
                     render: (a: any, b: any) => {
                     render: (a: any, b: any) => {
                         return <Space>
                         return <Space>
-                            <a style={{fontSize: 12}} onClick={() => { roleHandle([b]) }}>角色操作</a>
-                            <a style={{fontSize: 12}} onClick={() => { assignHandle([b]) }}>指派</a>
-                            <a style={{fontSize: 12}} onClick={() => { changeLog([b]) }}>变更记录</a>
+                            <a style={{ fontSize: 12 }} onClick={() => { roleHandle([b]) }}>角色操作</a>
+                            <a style={{ fontSize: 12 }} onClick={() => { assignHandle([b]) }}>指派</a>
+                            <a style={{ fontSize: 12 }} onClick={() => { changeLog([b]) }}>变更记录</a>
                         </Space>
                         </Space>
                     }
                     }
                 }
                 }
@@ -533,7 +540,7 @@ export const columnsChangeLog = (update: (data: any) => void, del: (id: number[]
             width: 100,
             width: 100,
             ellipsis: true
             ellipsis: true
         },
         },
-        
+
         {
         {
             title: '创建人',
             title: '创建人',
             dataIndex: 'createName',
             dataIndex: 'createName',