fix

src/pages/gameDataStatistics/order/index.tsx

@@ -32,12 +32,13 @@ const Order: React.FC = () => {
             leftChild={<QueryForm
                 initialValues={{ sourceSystem: 'ZX_ONE' }}
                 onChange={(data: any) => {
-                    const { os, regStartDay, orderStatus, gameUserId, regEndDay, payTime, placeAnOrderTime, ...params } = data
+                    const { os, regStartDay, orderStatus, gameUserId, regEndDay, payTime, placeAnOrderTime, agentId, ...params } = data
                     let newQueryForm = JSON.parse(JSON.stringify(queryForm))
                     newQueryForm.pageNum = 1
                     newQueryForm.deviceSystem = os
                     newQueryForm.status = orderStatus
                     newQueryForm.userId = gameUserId
+                    newQueryForm.channelId = agentId
                     if (regStartDay && regEndDay) {
                         newQueryForm.regTimeStart = regStartDay
                         newQueryForm.regTimeEnd = regEndDay
@@ -83,6 +84,7 @@ const Order: React.FC = () => {
                 isGameUserId
                 isUserName
                 isPayIntervalTime
+                isAgentId
                 payTimeDay={{ ranges: getPresets() }}
                 isRegDay={{ ranges: getPresets() }}
                 placeAnOrderDay={{ ranges: getPresets() }}

src/pages/gameDataStatistics/order/tableConfig.tsx

@@ -81,7 +81,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 },
                 {
                     title: '订单金额', dataIndex: 'amount', label: '订单明细', align: 'center', width: 90, default: 16, sorter: true,
-                    render: (a: any) => <Statistic value={a || 0} precision={2} />
+                    render: (a: any, b: any) => <Statistic value={a || 0} valueStyle={b?.day === '总计' ? { color: 'red' } : {}} precision={2} />
                 },
                 {
                     title: '订单实付金额', dataIndex: 'realAmount', label: '订单明细', align: 'center', width: 80, default: 17, sorter: true,
@@ -178,14 +178,15 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 },
                 {
                     title: '支付状态', dataIndex: 'orderStatus', label: '订单明细', align: 'center', width: 85, default: 32,
-                    render: (a: string, b: any) => {
-                        return PayStatus[a]
-                    }
+                    render: (a: string, b: any) => (<WidthEllipsis value={PayStatus[a]} />)
                 },
                 {
                     title: '是否首充', dataIndex: 'isFirstRecharge', label: '订单明细', align: 'center', width: 45, default: 33,
-                    render: (a: any) => {
-                        return a == 1 ? '是' : '否'
+                    render: (a: any, b: any) => {
+                        if (b?.day !== '总计') {
+                            return a == 1 ? '是' : '否'
+                        }
+                        return '--'
                     }
                 },
             ]

src/pages/gameDataStatistics/pitcher/everyDay/tableConfig.tsx

@@ -7,10 +7,10 @@ import style from '../../extensionData/everyday/index.less'
 
 function columns12(): { label: string, fieldSHow?: { label: string, saveField: string, defaultValue: any[], data: any[] }, data: any[] }[] {
 
-    const roiC = Array(30).fill('').map((_item: string, index: number) => {
+    const roiC = Array(29).fill('').map((_item: string, index: number) => {
         let data = {
-            title: `${index + 1}日ROI`,
-            dataIndex: `roi${index + 1}`,
+            title: `${index + 2}日ROI`,
+            dataIndex: `roi${index + 2}`,
             label: '付费数据',
             align: 'center',
             width: 80,
@@ -219,7 +219,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '充值时间', dataIndex: 'dt', label: '基本信息', align: 'center', width: 110, default: 2, sorter: true,
+                    title: '时间', dataIndex: 'dt', label: '基本信息', align: 'center', width: 110, default: 2, sorter: true,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
@@ -253,7 +253,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 },
                 {
                     title: '创角人数', dataIndex: 'roleNum', label: '用户数据', align: 'center', width: 70, sorter: true,
-                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                    render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
                     title: '首日创角人数', dataIndex: 'firstRoleNum', label: '用户数据', align: 'center', width: 70, sorter: true,
@@ -261,7 +261,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 },
                 {
                     title: '新用户累计创角人数', dataIndex: 'newUserTotalRoleNum', label: '用户数据', align: 'center', width: 100, sorter: true,
-                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                    render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
                     title: '首日创角成本', dataIndex: 'firstRoleCost', label: '用户数据', align: 'center', width: 70, sorter: true,
@@ -285,11 +285,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 // },
                 {
                     title: '首日创角率', dataIndex: 'firstRoleRate', label: '用户数据', align: 'center', width: 70, sorter: true,
-                    render: (a: number) => <Statistic value={a} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 {
                     title: '新用户创角率', dataIndex: 'roleNumRate', label: '用户数据', align: 'center', width: 70, sorter: true,
-                    render: (a: number) => <Statistic value={a} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 }
             ]
         },
@@ -394,7 +394,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '买量客单价', dataIndex: 'buyAvg', label: '付费数据', align: 'center', width: 70, sorter: true,
+                    title: '至今客单价', dataIndex: 'buyAvg', label: '付费数据', align: 'center', width: 70, sorter: true,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {

src/pages/gameDataStatistics/pitcher/everyDayGame/tableConfig.tsx

@@ -8,10 +8,10 @@ import { gameClassifyEnum } from "@/components/QueryForm/const"
 
 function columns12(): { label: string, fieldSHow?: { label: string, saveField: string, defaultValue: any[], data: any[] }, data: any[] }[] {
 
-    const roiC = Array(30).fill('').map((_item: string, index: number) => {
+    const roiC = Array(29).fill('').map((_item: string, index: number) => {
         let data = {
-            title: `${index + 1}日ROI`,
-            dataIndex: `roi${index + 1}`,
+            title: `${index + 2}日ROI`,
+            dataIndex: `roi${index + 2}`,
             label: '付费数据',
             align: 'center',
             width: 80,
@@ -232,7 +232,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (a: string, b: any) => (<WidthEllipsis value={gameClassifyEnum[a]} />)
                 },
                 {
-                    title: '充值时间', dataIndex: 'dt', label: '基本信息', align: 'center', width: 110, default: 5, sorter: true,
+                    title: '时间', dataIndex: 'dt', label: '基本信息', align: 'center', width: 110, default: 5, sorter: true,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
@@ -266,7 +266,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 },
                 {
                     title: '创角人数', dataIndex: 'roleNum', label: '用户数据', align: 'center', width: 70, sorter: true,
-                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                    render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
                     title: '首日创角人数', dataIndex: 'firstRoleNum', label: '用户数据', align: 'center', width: 70, sorter: true,
@@ -274,7 +274,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 },
                 {
                     title: '新用户累计创角人数', dataIndex: 'newUserTotalRoleNum', label: '用户数据', align: 'center', width: 100, sorter: true,
-                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                    render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
                     title: '首日创角成本', dataIndex: 'firstRoleCost', label: '用户数据', align: 'center', width: 70, sorter: true,
@@ -298,11 +298,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 // },
                 {
                     title: '首日创角率', dataIndex: 'firstRoleRate', label: '用户数据', align: 'center', width: 70, sorter: true,
-                    render: (a: number) => <Statistic value={a} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 {
                     title: '新用户创角率', dataIndex: 'roleNumRate', label: '用户数据', align: 'center', width: 70, sorter: true,
-                    render: (a: number) => <Statistic value={a} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 }
             ]
         },
@@ -407,7 +407,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '买量客单价', dataIndex: 'buyAvg', label: '付费数据', align: 'center', width: 70, sorter: true,
+                    title: '至今客单价', dataIndex: 'buyAvg', label: '付费数据', align: 'center', width: 70, sorter: true,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {

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

@@ -4,10 +4,10 @@ import React from "react"
 
 function columns12() {
 
-    const roiC = Array(30).fill('').map((_item: string, index: number) => {
+    const roiC = Array(29).fill('').map((_item: string, index: number) => {
         let data = {
-            title: `${index + 1}日ROI`,
-            dataIndex: `roi${index + 1}`,
+            title: `${index + 2}日ROI`,
+            dataIndex: `roi${index + 2}`,
             label: '付费数据',
             align: 'center',
             width: 80,
@@ -64,7 +64,7 @@ function columns12() {
                 // },
                 {
                     title: '创角人数', dataIndex: 'roleNum', label: '用户数据', align: 'center', width: 70, sorter: true,
-                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                    render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
                     title: '首日创角人数', dataIndex: 'firstRoleNum', label: '用户数据', align: 'center', width: 70, sorter: true,
@@ -72,7 +72,7 @@ function columns12() {
                 },
                 {
                     title: '新用户累计创角人数', dataIndex: 'newUserTotalRoleNum', label: '用户数据', align: 'center', width: 100, sorter: true,
-                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                    render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
                     title: '首日创角成本', dataIndex: 'firstRoleCost', label: '用户数据', align: 'center', width: 70, sorter: true,
@@ -99,11 +99,11 @@ function columns12() {
                 // },
                 {
                     title: '首日创角率', dataIndex: 'firstRoleRate', label: '用户数据', align: 'center', width: 70, sorter: true,
-                    render: (a: number) => <Statistic value={a} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 {
                     title: '新用户创角率', dataIndex: 'roleNumRate', label: '用户数据', align: 'center', width: 70, sorter: true,
-                    render: (a: number) => <Statistic value={a} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 }
             ]
         },

src/pages/gameDataStatistics/pitcher/totalGame/tableConfig.tsx

@@ -5,10 +5,10 @@ import React from "react"
 
 function columns12() {
 
-    const roiC = Array(30).fill('').map((_item: string, index: number) => {
+    const roiC = Array(29).fill('').map((_item: string, index: number) => {
         let data = {
-            title: `${index + 1}日ROI`,
-            dataIndex: `roi${index + 1}`,
+            title: `${index + 2}日ROI`,
+            dataIndex: `roi${index + 2}`,
             label: '付费数据',
             align: 'center',
             width: 80,
@@ -77,7 +77,7 @@ function columns12() {
                 // },
                 {
                     title: '创角人数', dataIndex: 'roleNum', label: '用户数据', align: 'center', width: 70, sorter: true,
-                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                    render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
                     title: '首日创角人数', dataIndex: 'firstRoleNum', label: '用户数据', align: 'center', width: 70, sorter: true,
@@ -85,7 +85,7 @@ function columns12() {
                 },
                 {
                     title: '新用户累计创角人数', dataIndex: 'newUserTotalRoleNum', label: '用户数据', align: 'center', width: 100, sorter: true,
-                    render: (a: string) => <Statistic value={a || 0} precision={2} />
+                    render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
                     title: '首日创角成本', dataIndex: 'firstRoleCost', label: '用户数据', align: 'center', width: 70, sorter: true,
@@ -112,11 +112,11 @@ function columns12() {
                 // },
                 {
                     title: '首日创角率', dataIndex: 'firstRoleRate', label: '用户数据', align: 'center', width: 70, sorter: true,
-                    render: (a: number) => <Statistic value={a} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 {
                     title: '新用户创角率', dataIndex: 'roleNumRate', label: '用户数据', align: 'center', width: 70, sorter: true,
-                    render: (a: number) => <Statistic value={a} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 50 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 }
             ]
         },