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

+ 1 - 1
src/pages/gameDataStatistics/pitcher/everyDay/index.tsx

@@ -62,7 +62,7 @@ const EvertDay: React.FC = () => {
             />}
             isZj
             totalData={totalData}
-            scroll={{ x: 1000, y: 600 }}
+            scroll={{ x: 1000, y: 800 }}
             ajax={getPitcherDayList}
             fixed={{ left: 2, right: 2 }}
             dataSource={getPitcherDayList?.data?.records?.map((item: any, index: number) => ({ ...item, id: Number(queryForm.pageNum.toString() + index.toString()) }))}

+ 4 - 4
src/pages/gameDataStatistics/stream/recharge/index.tsx

@@ -64,7 +64,7 @@ const Recharge: React.FC = () => {
                 isCreateDay={{}}
             />}
             isVirtually={false}
-            scroll={{ x: 1000, y: 600 }}
+            scroll={{ x: 1000, y: 700 }}
             ajax={getGameRechargeList}
             fixed={{ left: 0, right: 0 }}
             dataSource={getGameRechargeList?.data?.records?.map((item: any, index: number) => ({ ...item, id: Number(queryForm.pageNum.toString() + index.toString()) }))}
@@ -93,11 +93,11 @@ const Recharge: React.FC = () => {
                 return <Table.Summary fixed>
                     <Table.Summary.Row>
                         <Table.Summary.Cell index={0}><div style={{ fontSize: 18, fontWeight: 600, textAlign: 'center' }}>总计</div></Table.Summary.Cell>
-                        <Table.Summary.Cell index={1}><div style={{ fontWeight: 600, textAlign: 'center', color: '#000000d9' }}>消耗</div></Table.Summary.Cell>
+                        <Table.Summary.Cell index={1}><div style={{ fontWeight: 600, textAlign: 'center', color: '#000000d9' }}>消耗</div></Table.Summary.Cell>
                         <Table.Summary.Cell index={2}><div style={{ textAlign: 'center' }}><Statistic value={totalData?.costCount || 0} /></div> </Table.Summary.Cell>
-                        <Table.Summary.Cell index={3}><div style={{ fontWeight: 600, textAlign: 'center', color: '#000000d9' }}>充值</div></Table.Summary.Cell>
+                        <Table.Summary.Cell index={3}><div style={{ fontWeight: 600, textAlign: 'center', color: '#000000d9' }}>充值</div></Table.Summary.Cell>
                         <Table.Summary.Cell index={4}><div style={{ textAlign: 'center' }}><Statistic value={totalData?.amountCount || 0} /></div></Table.Summary.Cell>
-                        <Table.Summary.Cell index={5}><div style={{ fontWeight: 600, textAlign: 'center', color: '#000000d9' }}>回收率</div></Table.Summary.Cell>
+                        <Table.Summary.Cell index={5}><div style={{ fontWeight: 600, textAlign: 'center', color: '#000000d9' }}>回收率</div></Table.Summary.Cell>
                         <Table.Summary.Cell index={6}><div style={{ textAlign: 'center' }}><Statistic precision={2} suffix="%" value={totalData?.recoveryCount || 0} /></div></Table.Summary.Cell>
                     </Table.Summary.Row>
                 </Table.Summary>

+ 4 - 16
src/pages/gameDataStatistics/stream/recharge/tableConfig.tsx

@@ -24,19 +24,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (_: any, b: any) => (<WidthEllipsis value={week[moment(b?.orderDate).day()]} />)
                 },
                 {
-                    title: '游戏', dataIndex: 'gameName', label: '充值历史', align: 'center', width: 90, default: 4,
-                    render: (a: any) => (<WidthEllipsis value={a} />)
-                },
-                {
-                    title: '渠道名称', dataIndex: 'agentName', label: '充值历史', align: 'center', width: 90, default: 5,
-                    render: (a: any) => (<WidthEllipsis value={a} />)
-                },
-                {
-                    title: '投手', dataIndex: 'pitcherName', label: '充值历史', align: 'center', width: 90, default: 6,
-                    render: (a: any) => (<WidthEllipsis value={a} />)
-                },
-                {
-                    title: '10:00', dataIndex: 'tenAmount', label: '充值历史', align: 'center', width: 90, default: 7,
+                    title: '10:00', dataIndex: 'tenAmount', label: '充值历史', align: 'center', width: 90, default: 4,
                     children: [
                         {
                             title: '充值',
@@ -73,7 +61,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     ]
                 },
                 {
-                    title: '14:00', dataIndex: 'fourteenAmount', label: '充值历史', align: 'center', width: 90, default: 8,
+                    title: '14:00', dataIndex: 'fourteenAmount', label: '充值历史', align: 'center', width: 90, default: 5,
                     children: [
                         {
                             title: '充值',
@@ -110,7 +98,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     ]
                 },
                 {
-                    title: '17:00', dataIndex: 'seventeenAmount', label: '充值历史', align: 'center', width: 90, default: 9,
+                    title: '17:00', dataIndex: 'seventeenAmount', label: '充值历史', align: 'center', width: 90, default: 6,
                     children: [
                         {
                             title: '充值',
@@ -147,7 +135,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     ]
                 },
                 {
-                    title: '24:00', dataIndex: 'twentyfourAmount', label: '充值历史', align: 'center', width: 90, default: 10,
+                    title: '24:00', dataIndex: 'twentyfourAmount', label: '充值历史', align: 'center', width: 90, default: 7,
                     children: [
                         {
                             title: '充值',