fix

src/pages/iaaData/tencentIaa/appEveryDayData/tableConfig.tsx

@@ -105,11 +105,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 {
-                    title: '累计利润', tips: '广告变现累计收入-累计消耗', dataIndex: 'totalProfit', label: '应用端指标', align: 'center', width: 100, default: 15, sorter: true, className: 'green2ColorClass',
+                    title: '广告变现累计利润', tips: '广告变现累计收入-累计消耗', dataIndex: 'totalProfit', label: '应用端指标', align: 'center', width: 100, default: 15, sorter: true, className: 'green2ColorClass',
                     render: (a: number) => <Statistic value={a || 0} precision={2} />
                 },
                 {
-                    title: '利润率', tips: '（广告变现累计收入-累计消耗）/累计消耗*100%', dataIndex: 'profitRate', label: '应用端指标', align: 'center', width: 80, default: 16, sorter: true, className: 'green2ColorClass',
+                    title: '广告变现利润率', tips: '（广告变现累计收入-累计消耗）/累计消耗*100%', dataIndex: 'profitRate', label: '应用端指标', align: 'center', width: 100, default: 16, sorter: true, className: 'green2ColorClass',
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 {
@@ -450,6 +450,84 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 }
             ]
+        },
+        {
+            label: '应用广告金指标',
+            data: [
+                {
+                    title: '广告金账户余额', dataIndex: 'totalBalance', label: '应用广告金指标', align: 'center', width: 80, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '广告金账户即将过期金额', dataIndex: 'expireBalance', label: '应用广告金指标', align: 'center', width: 85, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '广告金账户余额过期时间', dataIndex: 'expireTime', label: '应用广告金指标', align: 'center', width: 85,
+                    render: (a: string) => (<WidthEllipsis value={a} />)
+                },
+                {
+                    title: '广告金结算金额', dataIndex: 'amt', label: '应用广告金指标', align: 'center', width: 80, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '广告金结算金额有效期', dataIndex: 'amtExpireTime', label: '应用广告金指标', align: 'center', width: 85,
+                    render: (a: string) => (<WidthEllipsis value={a} />)
+                },
+                {
+                    title: '广告金金额', dataIndex: 'adFund', label: '应用广告金指标', align: 'center', width: 80, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '累计广告金金额', dataIndex: 'adFundTotal', label: '应用广告金指标', align: 'center', width: 80, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '30天内激励用户人数', dataIndex: 'usersWithinThirtyDays', label: '应用广告金指标', align: 'center', width: 85, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '30天以上的激励用户人数', dataIndex: 'usersBeyondThirtyDays', label: '应用广告金指标', align: 'center', width: 85, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '30天内激励用户广告流水', dataIndex: 'amtWithinThirtyDays', label: '应用广告金指标', align: 'center', width: 85, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '30天以上的激励用户广告流水', dataIndex: 'amtBeyondThirtyDays', label: '应用广告金指标', align: 'center', width: 85, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '外部应用激励用户广告流水', dataIndex: 'outerAdFund', label: '应用广告金指标', align: 'center', width: 85, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '30天内激励用户占比', dataIndex: 'usersWithinThirtyPro', label: '应用广告金指标', align: 'center', width: 85, sorter: true,
+                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                }
+            ]
+        },
+        {
+            label: '应用回收数据指标',
+            data: [
+                {
+                    title: '应用总收入', dataIndex: 'appTotalAmount', label: '应用回收数据指标', align: 'center', width: 70, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '应用累计收入', dataIndex: 'appAddAmount', label: '应用回收数据指标', align: 'center', width: 70, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '应用累计利润', dataIndex: 'appTotalProfit', label: '应用回收数据指标', align: 'center', width: 70, sorter: true,
+                    render: (a: number) => <Statistic value={a || 0} />
+                },
+                {
+                    title: '应用累计利润率', dataIndex: 'appTotalProfitRate', label: '应用回收数据指标', align: 'center', width: 85, sorter: true,
+                    render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
+                }
+            ]
         }
     ]
 }