fix

config/routerConfig.ts

@@ -388,6 +388,12 @@ const gameDataStatistics = {
                     access: 'serverEveryData',
                     component: './gameDataStatistics/gameServer/serverEveryData',
                 },
+                {
+                    path: '/gameDataStatistics/gameServer/serverGsData',
+                    name: 'GS区服',
+                    access: 'serverGsData',
+                    component: './gameDataStatistics/gameServer/serverGsData',
+                }
             ]
         },
         {

src/components/QueryForm/index.tsx

@@ -165,7 +165,9 @@ interface Props {
     /** 是否开启 所在原始服务器名称 搜索 */
     isSourceServerName?: boolean
     /** 是否开启区服ID 搜索 */
-    isServerId?: boolean
+    isServerId?: boolean | {
+        placeholder?: string
+    }
     /** 是否开启 开服时间 搜索 */
     isServerDay?: {
         ranges?: any
@@ -590,7 +592,7 @@ const QueryForm: React.FC<Props> = (props) => {
             </Form.Item></Col>}
             {/* 广告区服ID */}
             {isServerId && <Col><Form.Item name='serverId'>
-                <Input placeholder="区服ID" allowClear style={{ width: 140 }} />
+                <Input placeholder="区服ID" allowClear style={{ width: 140 }} {...(isServerId && typeof isServerId === 'object') ? isServerId : {}} />
             </Form.Item></Col>}
             {/* 广告账户名称 */}
             {isAccount && <Col><Form.Item name='accountName'>

src/pages/gameDataStatistics/gameServer/serverGsData/index.less

@@ -0,0 +1,15 @@
+.dbox{
+    display: flex;
+    flex-flow: column;
+    align-items: center;
+    // padding: 10px;
+    >span{
+        display: flex;
+        justify-content: left;
+        width: 100%;
+    }
+}
+
+.tabsBottom0 .ant-tabs-nav {
+    margin-bottom: 0;
+}

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

@@ -0,0 +1,96 @@
+import { useAjax } from "@/Hook/useAjax"
+import { GameServerGsListProps, getGameServerGsListApi, getGameServerGsTotalApi } from "@/services/gameData/gameServer"
+import React, { useEffect, useState } from "react"
+import moment from "moment"
+import columns12 from "./tableConfig"
+import TableData from "../../components/TableData"
+import QueryForm from "@/components/QueryForm"
+import { getPresets } from "@/components/QueryForm/const"
+
+/**
+ * GS区服
+ * @returns 
+ */
+const ServerGsData: React.FC = () => {
+
+    /********************************/
+    const [queryForm, setQueryForm] = useState<GameServerGsListProps>({ pageNum: 1, pageSize: 50, beginDate: moment().format('YYYY-MM-DD'), endDate: moment().format('YYYY-MM-DD'), sourceSystem: 'ZX_ONE' })
+    const [totalData, setTotalData] = useState<any[]>([])
+
+    const getGameServerGsList = useAjax((params) => getGameServerGsListApi(params))
+    const getGameServerGsTotal = useAjax((params) => getGameServerGsTotalApi(params))
+    /********************************/
+
+    useEffect(() => {
+        getGameServerGsTotal.run(queryForm).then((res: { id: number; dt?: string; gameName: string; }) => {
+            res.id = 1
+            res.dt = queryForm.beginDate
+            res.gameName = '总计'
+            setTotalData([res])
+        })
+        getGameServerGsList.run(queryForm)
+    }, [queryForm])
+
+    return <div>
+        <TableData
+            leftChild={<QueryForm
+                initialValues={{ sourceSystem: 'ZX_ONE', serverDay: [moment(), moment()] }}
+                onChange={(data: any) => {
+                    const { serverDay, parentGameIds, serverId, ...params } = data
+                    let newQueryForm = JSON.parse(JSON.stringify(queryForm))
+                    if (serverDay && serverDay?.length === 2) {
+                        newQueryForm['beginDate'] = moment(serverDay[0]).format('YYYY-MM-DD')
+                        newQueryForm['endDate'] = moment(serverDay[1]).format('YYYY-MM-DD')
+                    } else {
+                        delete newQueryForm['beginDate']
+                        delete newQueryForm['endDate']
+                    }
+                    newQueryForm.pageNum = 1
+                    newQueryForm.gameId = parentGameIds
+                    newQueryForm.serverId = serverId ? serverId?.split(/[,，\s\n]+/) : []
+                    setQueryForm({ ...newQueryForm, ...params })
+                }}
+                isSource
+                isServerDay={{ ranges: getPresets() }}
+                isParentIds
+                isServerName
+                isServerId={{placeholder: '区服ID(多个逗号，空格，换行)'}}
+                isGsId
+            />}
+            isZj
+            isVirtually={false}
+            totalData={totalData}
+            scroll={{ x: 1000, y: 600 }}
+            ajax={getGameServerGsList}
+            fixed={{ left: 3, right: 0 }}
+            dataSource={getGameServerGsList?.data?.records?.map((item: any, index: number) => ({ ...item, id: Number(queryForm.pageNum.toString() + index.toString()) }))}
+            total={getGameServerGsList?.data?.total}
+            page={queryForm.pageNum}
+            pageSize={queryForm.pageSize}
+            sortData={{
+                field: queryForm?.sortFiled,
+                order: queryForm?.sortType === 'asc' ? 'ascend' : 'descend'
+            }}
+            title='GS区服数据'
+            onChange={(props: any) => {
+                let { pagination, sortData } = props
+                let { current, pageSize } = pagination
+                let newQueryForm = JSON.parse(JSON.stringify(queryForm))
+                if (sortData && sortData?.order) {
+                    newQueryForm['sortType'] = sortData?.order === 'ascend' ? 'asc' : 'desc'
+                    newQueryForm['sortFiled'] = sortData?.field
+                } else {
+                    delete newQueryForm['sortType']
+                    delete newQueryForm['sortFiled']
+                }
+                newQueryForm.pageNum = current
+                newQueryForm.pageSize = pageSize
+                setQueryForm({ ...newQueryForm })
+            }}
+            config={columns12()}
+            configName={'GS区服数据'}
+        />
+    </div>
+}
+
+export default ServerGsData

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

@@ -0,0 +1,137 @@
+import { gameClassifyEnum } from "@/components/QueryForm/const"
+import WidthEllipsis from "@/components/widthEllipsis"
+import { Statistic } from "antd"
+import React from "react"
+import moment from "moment"
+import style from './index.less'
+
+function columns12(): { label: string, fieldSHow?: { label: string, saveField: string, defaultValue: any[], data: any[] }, data: any[] }[] {
+
+    let defaultStart = 8
+    const day = Array(90).fill('').map((_item: string, index: number) => {
+        let field = `daRetention${index + 1}`
+        let data = {
+            title: `D${index + 1}`,
+            dataIndex: field,
+            label: "D1~Dn",
+            align: "center",
+            width: 150,
+            children: [{
+                title: `留存率`,
+                dataIndex: field,
+                key: 'retained',
+                align: "center",
+                width: 125,
+                render: (a: any, b: any) => {
+                    let date1 = moment()
+                    if (b?.gameName === '总计') {
+                        if (b?.dt) {
+                            date1 = moment(b?.dt)
+                        } else {
+                            date1 = moment()
+                        }
+                    } else {
+                        date1 = moment(b.dt)
+                    }
+                    let dt = moment()
+                    let day = dt.diff(date1, 'day');
+                    if (index <= day) {
+                        let data: any = {}
+                        if (b?.[field]) {
+                            data = b?.[field]
+                            return <div>
+                                <div className={style.dbox}>
+                                    <span style={{ color: '#d81b60', fontWeight: 600 }}>
+                                        <span>活跃：</span>
+                                        <span>{data?.activeRetention}%</span>
+                                    </span>
+                                    <span style={{ color: '#faad14', fontWeight: 600 }}>
+                                        <span>付费：</span>
+                                        <span>{data?.paidRetentionRate}%</span>
+                                    </span>
+                                    <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>
+                                        <span>小R：</span>
+                                        <span>{data?.smallR}%</span>
+                                    </span>
+                                    <span style={{ color: '#0f538a', fontWeight: 600 }}>
+                                        <span>中R：</span>
+                                        <span>{data?.mediumR}%</span>
+                                    </span>
+                                    <span style={{ color: '#eb2f96', fontWeight: 600 }}>
+                                        <span>大R：</span>
+                                        <span>{data?.largeR}%</span>
+                                    </span>
+                                    <span style={{ color: '#2f54eb', fontWeight: 600 }}>
+                                        <span>超大R：</span>
+                                        <span>{data?.superR}%</span>
+                                    </span>
+                                </div>
+                            </div>
+                        }
+                        return <div style={{ height: 126, lineHeight: '126px' }}>--</div>
+                    }
+                    return <div style={{ height: 126, lineHeight: '126px' }}>--</div>
+                }
+            }]
+        }
+        data['default'] = defaultStart + index
+        return data
+    })
+
+
+    return [
+        {
+            label: '游戏信息',
+            data: [
+                {
+                    title: '游戏名称', dataIndex: 'parentGameName', label: '游戏信息', align: 'center', width: 90, default: 1,
+                    render: (a: string) => (<WidthEllipsis value={a} />)
+                },
+                { title: '游戏ID', dataIndex: 'parentGameId', label: '游戏信息', align: 'center', width: 90 },
+                {
+                    title: '游戏应用类型', dataIndex: 'parentGameClassify', label: '游戏信息', align: 'center', width: 80, default: 2,
+                    render: (a: string) => (<WidthEllipsis value={gameClassifyEnum[a]} />)
+                },
+                {
+                    title: '区服名称', dataIndex: 'serverName', label: '游戏信息', align: 'center', width: 90, default: 3,
+                    render: (a: string) => (<WidthEllipsis value={a} />)
+                },
+                { title: '区服ID', dataIndex: 'serverId', label: '游戏信息', align: 'center', width: 90 },
+                {
+                    title: '开服时间', dataIndex: 'dt', label: '游戏信息', align: 'center', width: 90, default: 4, sorter: true,
+                    render: (a: any, b: any) => {
+                        if (b.gameName === '总计') {
+                            return '--'
+                        }
+                        return a
+                    }
+                },
+            ]
+        },
+        {
+            label: '数据',
+            data: [
+                {
+                    title: '新用户人数', dataIndex: 'totalRegNum', label: '数据', align: 'center', width: 70, sorter: true, default: 5,
+                    render: (a: number) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '创角人数', dataIndex: 'totalRoleNum', label: '数据', align: 'center', width: 70, sorter: true, default: 6,
+                    render: (a: number) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '付费人数', dataIndex: 'totalAmountNum', label: '数据', align: 'center', width: 70, sorter: true, default: 7,
+                    render: (a: number) => <Statistic value={a || 0} />
+                }
+            ]
+        },
+        {
+            label: 'D1~Dn',
+            data: [
+                ...day
+            ]
+        }
+    ]
+}
+
+export default columns12

src/services/gameData/gameServer.ts

@@ -65,4 +65,36 @@ export async function getGameServerEveryTotalApi(data: GameServerEveryListProps)
         method: 'POST',
         data
     });
+}
+
+export interface GameServerGsListProps extends Paging, SortProps {
+    gameId?: number,
+    gsId?: number,
+    serverName?: string,
+    serverId?: number,
+    beginDate?: string,
+    endDate?: string
+}
+/**
+ * GS区服
+ * @param data 
+ * @returns 
+ */
+export async function getGameServerGsListApi(data: GameServerGsListProps) {
+    return request(wapi + `/gameServer/gs/day`, {
+        method: 'POST',
+        data
+    });
+}
+
+/**
+ * GS区服总计
+ * @param data 
+ * @returns 
+ */
+export async function getGameServerGsTotalApi(data: GameServerGsListProps) {
+    return request(wapi + `/gameServer/gs/total`, {
+        method: 'POST',
+        data
+    });
 }