wJianX 1 年間 前
コミット
9485f3ba64

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

@@ -10,6 +10,8 @@ interface Props {
     onChange?: (data: any) => void
     /** 默认值 */
     initialValues?: any
+    /** 开启数据源搜索 */
+    isSource?: boolean,
     /** 是否开启 广告账号 搜索 */
     isAccount?: boolean
     /** 是否开启 广告账户ID 搜索 */
@@ -105,7 +107,7 @@ const QueryForm: React.FC<Props> = (props) => {
 
     /**************************/
     const {
-        onChange, initialValues, isAccount, isAccountId, isCompanyId, isCpId, isCpName, isCpOrderId, isCpStatus, isCreateDay, isDevice, isGameName, isRechargeGameName, isGameId, isOrderGameId, isGameRoleId,
+        onChange, initialValues, isSource, isAccount, isAccountId, isCompanyId, isCpId, isCpName, isCpOrderId, isCpStatus, isCreateDay, isDevice, isGameName, isRechargeGameName, isGameId, isOrderGameId, isGameRoleId,
         isGameRoleName, isFirstRecharge, isSwitch, isMerchantNo, isOrderId, isMerchantOrderNo, isPayStatus, isPayWay, isProductName, isRegAgent, isAgentId, isPutAgent, isRegDay, isOs, isParentId,
         isSysUserName, isRechargeDate, isBGGameClassify, isGameUserId, isSysUserId, isUserName, isUserId, isSelectRanking, isGameType, isConsumeDay, rechargeDay, isBeginDay, isType
     } = props
@@ -248,6 +250,15 @@ const QueryForm: React.FC<Props> = (props) => {
 
     return <Form layout="inline" className='queryForm' initialValues={initialValues} name="basic" form={form} onFinish={onFinish}>
         <Row gutter={[0, 6]}>
+            {/* 数据源搜索 */}
+            {isSource && <Col><Form.Item name='sourceSystem'>
+                <Radio.Group>
+                    <Radio.Button value="BG_OLD">布谷-old</Radio.Button>
+                    <Radio.Button value="BG_NEW">布谷-new</Radio.Button>
+                    <Radio.Button value="ZX_SDK">布谷-zx</Radio.Button>
+                    <Radio.Button value="ZX_ONE">赞象</Radio.Button>
+                </Radio.Group>
+            </Form.Item></Col>}
             {/* 不同排行榜选择 */}
             {isSelectRanking && <Col><Form.Item name='dateType'>
                 <Radio.Group>

+ 1 - 0
src/pages/gameDataStatistics/allSurvey/index.tsx

@@ -98,6 +98,7 @@ const AllSurvey: React.FC = () => {
                             }
                             setQueryForm({ ...newQueryForm, ...par })
                         }}
+                        isSource
                         isAccountId
                         isGameId
                         isSysUserId

+ 1 - 0
src/pages/gameDataStatistics/extensionData/everyday/index.tsx

@@ -52,6 +52,7 @@ const Everyday: React.FC = () => {
                     newQueryForm.endDay = costEndDay
                     setQueryForm({ ...newQueryForm, ...params })
                 }}
+                isSource
                 isAccountId
                 isAgentId
                 isConsumeDay

+ 1 - 0
src/pages/gameDataStatistics/extensionData/total/index.tsx

@@ -58,6 +58,7 @@ const Total: React.FC = () => {
                     newQueryForm.sysUserId = pitcherId
                     setQueryForm({ ...newQueryForm, ...params })
                 }}
+                isSource
                 isAccountId
                 isAgentId
                 isConsumeDay

+ 1 - 0
src/pages/gameDataStatistics/gameData/everyday/index.tsx

@@ -51,6 +51,7 @@ const Everyday: React.FC = () => {
                     }
                     setQueryForm({ ...newQueryForm, ...params })
                 }}
+                isSource
                 isRegDay
                 isGameName
                 isBGGameClassify

+ 1 - 0
src/pages/gameDataStatistics/gameData/flowingWater/index.tsx

@@ -25,6 +25,7 @@ const FlowingWater: React.FC = () => {
                 isGameName
                 isRechargeDate
                 isBGGameClassify
+                isSource
                 onChange={(data: any) => {
                     // console.log(data)
                     const { rechargeDate, ...params } = data

+ 1 - 0
src/pages/gameDataStatistics/gameData/total/index.tsx

@@ -55,6 +55,7 @@ const Total: React.FC = () => {
                     }
                     setQueryForm({ ...newQueryForm, ...params })
                 }}
+                isSource
                 isRegDay
                 isGameName
                 isBGGameClassify

+ 1 - 0
src/pages/gameDataStatistics/order/index.tsx

@@ -46,6 +46,7 @@ const Order: React.FC = () => {
 
                     setQueryForm({ ...newQueryForm, ...params })
                 }}
+                isSource
                 isAccountId
                 isAgentId
                 isGameId

+ 1 - 0
src/pages/gameDataStatistics/rankingList/account/index.tsx

@@ -38,6 +38,7 @@ const Account: React.FC = () => {
                     }
                     setQueryForm({ ...newQueryForm, ...params })
                 }}
+                isSource
                 rechargeDay={{ ranges: rangePresets }}
                 isSysUserId
                 isType

+ 1 - 0
src/pages/gameDataStatistics/rankingList/channel/index.tsx

@@ -39,6 +39,7 @@ const Channel: React.FC = () => {
                     }
                     setQueryForm({ ...newQueryForm, ...params })
                 }}
+                isSource
                 rechargeDay={{ ranges: rangePresets }}
                 isSysUserId
                 isAgentId

+ 3 - 3
src/pages/gameDataStatistics/rankingList/channel/tableConfig.tsx

@@ -30,15 +30,15 @@ function columns12() {
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '新用户累计充值金额', dataIndex: 'newUserTotalRechargeAmount', label: '推广渠道充值排行榜', align: 'center', width: 100, default: 7, sorter: true,
+                    title: '累计充值金额', dataIndex: 'totalRechargeAmount', label: '推广渠道充值排行榜', align: 'center', width: 100, default: 7, sorter: true,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '新用户累计充值人数', dataIndex: 'newUserTotalRechargeNum', label: '推广渠道充值排行榜', align: 'center', width: 80, default: 8, sorter: true,
+                    title: '新用户累计充值人数', dataIndex: 'totalRechargeNum', label: '推广渠道充值排行榜', align: 'center', width: 80, default: 8, sorter: true,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '新用户累计充值次数', dataIndex: 'newUserTotalRechargeCount', label: '推广渠道充值排行榜', align: 'center', width: 80, default: 9, sorter: true,
+                    title: '新用户累计充值次数', dataIndex: 'totalRechargeCount', label: '推广渠道充值排行榜', align: 'center', width: 80, default: 9, sorter: true,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {

+ 1 - 0
src/pages/gameDataStatistics/rankingList/game/index.tsx

@@ -54,6 +54,7 @@ const Game: React.FC = () => {
                     }
                     setQueryForm(newQueryForm)
                 }}
+                isSource
                 rechargeDay={{ ranges: rangePresets }}
             />}
             scroll={{ x: 1200, y: 600 }}

+ 1 - 0
src/pages/gameDataStatistics/rankingList/gamer/index.tsx

@@ -41,6 +41,7 @@ const Gamer: React.FC = () => {
                     }
                     setQueryForm(newQueryForm)
                 }}
+                isSource
                 rechargeDay={{ ranges: rangePresets }}
             />}
             scroll={{ x: 1000, y: 600 }}