fix

src/pages/gameDataStatistics/allSurvey/index.less

@@ -40,6 +40,7 @@
     >div {
         display: flex;
         justify-content: space-between;
+        gap: 8px;
     }
 }
 
@@ -47,6 +48,7 @@
 
     display: flex;
     justify-content: space-between;
+    gap: 10px;
 
     >.left {
         width: 80px;
@@ -65,7 +67,7 @@
     }
 
     >.right {
-        width: 190px;
+        width: calc(100% - 80px);
         padding-left: 10px;
         box-sizing: border-box;
 

src/pages/gameDataStatistics/allSurvey/index.tsx

@@ -102,7 +102,7 @@ const AllSurvey: React.FC = () => {
                         isGameId
                         isSysUserId
                         isAgentId
-                        // isBeginDay
+                    // isBeginDay
                     />
                 </Card>
             </div>
@@ -111,10 +111,8 @@ const AllSurvey: React.FC = () => {
                     <div className={style.left}><Button type="primary" ref={ref1} style={{ opacity: leftShow ? 1 : 0 }} onClick={() => aboutHandle('left')} shape="circle" icon={<LeftOutlined />} /></div>
                     <div className={style.right}><Button type="primary" ref={ref2} style={{ opacity: rightShow ? 1 : 0 }} onClick={() => aboutHandle('right')} shape="circle" icon={<RightOutlined />} /></div>
                     <div className={style.overviews} ref={ref}>
-
-                        <div style={{ width: isPass ? '100%' : 1960 }}>
-
-                            <Card bordered={false} style={{ width: 320, borderRadius: 8 }}>
+                        <div>
+                            <Card bordered={false} style={{ width: 320, borderRadius: 8 }} bodyStyle={{ width: 320 }}>
                                 <div className={style.overview}>
                                     <div className={style.left}>
                                         <UsergroupAddOutlined style={{ fontSize: 24 }} />
@@ -131,7 +129,7 @@ const AllSurvey: React.FC = () => {
                                     </div>
                                 </div>
                             </Card>
-                            <Card bordered={false} style={{ width: 320, borderRadius: 8 }}>
+                            <Card bordered={false} style={{ width: 320, borderRadius: 8 }} bodyStyle={{ width: 320 }}>
                                 <div className={style.overview}>
                                     <div className={style.left} style={{ backgroundColor: '#36a3f7' }}>
                                         <TransactionOutlined style={{ fontSize: 24 }} />
@@ -148,7 +146,7 @@ const AllSurvey: React.FC = () => {
                                     </div>
                                 </div>
                             </Card>
-                            <Card bordered={false} style={{ width: 320, borderRadius: 8 }}>
+                            <Card bordered={false} style={{ width: 320, borderRadius: 8 }} bodyStyle={{ width: 320 }}>
                                 <div className={style.overview}>
                                     <div className={style.left} style={{ backgroundColor: '#f4516c' }}>
                                         <MoneyCollectOutlined style={{ fontSize: 24 }} />
@@ -171,7 +169,7 @@ const AllSurvey: React.FC = () => {
                                     </div>
                                 </div>
                             </Card>
-                            <Card bordered={false} style={{ width: 320, borderRadius: 8 }}>
+                            <Card bordered={false} style={{ width: 320, borderRadius: 8 }} bodyStyle={{ width: 320 }}>
                                 <div className={style.overview}>
                                     <div className={style.left} style={{ backgroundColor: '#52c41a' }}>
                                         <AppstoreOutlined style={{ fontSize: 24 }} />
@@ -188,7 +186,7 @@ const AllSurvey: React.FC = () => {
                                     </div>
                                 </div>
                             </Card>
-                            <Card bordered={false} style={{ width: 320, borderRadius: 8 }}>
+                            <Card bordered={false} style={{ width: 320, borderRadius: 8 }} bodyStyle={{ width: 320 }}>
                                 <div className={style.overview}>
                                     <div className={style.left} style={{ backgroundColor: '#597ef7' }}>
                                         <BuildOutlined style={{ fontSize: 24 }} />
@@ -196,16 +194,16 @@ const AllSurvey: React.FC = () => {
                                     </div>
                                     <div className={style.right}>
                                         <div className={style.top} style={{ borderColor: '#597ef7' }}>
-                                            总计：<Statistic value={totalData?.totalGameCount || 0} valueStyle={{ fontSize: 20, fontWeight: 600 }} />
+                                            总投游戏数：<Statistic value={totalData?.totalGameCount || 0} valueStyle={{ fontSize: 20, fontWeight: 600 }} />
                                         </div>
                                         <div className={style.bottom}>
-                                            <div>昨日：<Statistic value={totalData?.yesterdayGameCount || 0} /></div>
-                                            <div>今日：<Statistic value={totalData?.todayGameCount || 0} /></div>
+                                            <div>昨日在投：<Statistic value={totalData?.yesterdayGameCount || 0} /></div>
+                                            <div>今日在投：<Statistic value={totalData?.todayGameCount || 0} /></div>
                                         </div>
                                     </div>
                                 </div>
                             </Card>
-                            <Card bordered={false} style={{ width: 320, borderRadius: 8 }}>
+                            <Card bordered={false} style={{ width: 360, borderRadius: 8 }} bodyStyle={{ width: 360 }}>
                                 <div className={style.overview}>
                                     <div className={style.left} style={{ backgroundColor: '#9254de' }}>
                                         <AccountBookOutlined style={{ fontSize: 24 }} />

src/pages/gameDataStatistics/extensionData/total/index.tsx

@@ -46,12 +46,11 @@ const Total: React.FC = () => {
                 initialValues={{ consumeDay: [moment().subtract(30, 'd'), moment()], rechargeDay: [moment().subtract(30, 'd'), moment()] }}
                 onChange={(data: any) => {
                     const { pitcherId, rechargeDay, ...params } = data
-                    console.log(params, pitcherId)
                     let newQueryForm = JSON.parse(JSON.stringify(queryForm))
                     newQueryForm.pageNum = 1
                     if (rechargeDay && rechargeDay?.length === 2) {
                         newQueryForm['rechargeBeginDay'] = moment(rechargeDay[0]).format('YYYY-MM-DD')
-                        newQueryForm['rechargeEndDay'] = moment(rechargeDay[0]).format('YYYY-MM-DD')
+                        newQueryForm['rechargeEndDay'] = moment(rechargeDay[1]).format('YYYY-MM-DD')
                     } else {
                         delete newQueryForm['rechargeBeginDay']
                         delete newQueryForm['rechargeEndDay']

src/pages/gameDataStatistics/gameData/total/index.tsx

@@ -41,7 +41,7 @@ const Total: React.FC = () => {
                     newQueryForm.pageNum = 1
                     if (rechargeDay && rechargeDay?.length === 2) {
                         newQueryForm['rechargeBeginDate'] = moment(rechargeDay[0]).format('YYYY-MM-DD')
-                        newQueryForm['rechargeEndDate'] = moment(rechargeDay[0]).format('YYYY-MM-DD')
+                        newQueryForm['rechargeEndDate'] = moment(rechargeDay[1]).format('YYYY-MM-DD')
                     } else {
                         delete newQueryForm['rechargeBeginDate']
                         delete newQueryForm['rechargeEndDate']

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

@@ -72,10 +72,10 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     title: '买量老用户充值金额', dataIndex: 'buyOldUserAmount', label: '买量付费数据', align: 'center', width: 80, default: 14,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
-                { title: '买量账面充值次数', dataIndex: 'buyAmountCount', label: '买量付费数据', align: 'center', width: 70, sorter: true },
-                { title: '买量账面充值人数', dataIndex: 'buyAmountNum', label: '买量付费数据', align: 'center', width: 70, sorter: true },
+                { title: '买量账面充值次数', dataIndex: 'buyAmountCount', label: '买量付费数据', align: 'center', width: 70 },
+                { title: '买量账面充值人数', dataIndex: 'buyAmountNum', label: '买量付费数据', align: 'center', width: 70 },
                 {
-                    title: '买量账面充值金额', dataIndex: 'buyAmount', label: '买量付费数据', align: 'center', width: 80, sorter: true,
+                    title: '买量账面充值金额', dataIndex: 'buyAmount', label: '买量付费数据', align: 'center', width: 80,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 { title: '买量新用户累计充值次数', dataIndex: 'buyNewUserTotalAmountCount', label: '买量付费数据', align: 'center', width: 70, sorter: true },
@@ -113,7 +113,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '买量账面客单价', dataIndex: 'buyAvgAmount', label: '买量付费数据', align: 'center', width: 70, sorter: true,
+                    title: '买量账面客单价', dataIndex: 'buyAvgAmount', label: '买量付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
@@ -145,7 +145,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '买量账面ARPU', dataIndex: 'buyAmountArpu', label: '买量付费数据', align: 'center', width: 70, sorter: true,
+                    title: '买量账面ARPU', dataIndex: 'buyAmountArpu', label: '买量付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 }
             ]
@@ -171,10 +171,10 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     title: '自然量老用户充值金额', dataIndex: 'natureOldUserAmount', label: '自然量付费数据', align: 'center', width: 70, default: 24,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
-                { title: '自然量账面充值次数', dataIndex: 'natureAmountCount', label: '自然量付费数据', align: 'center', width: 70, sorter: true },
-                { title: '自然量账面充值人数', dataIndex: 'natureAmountNum', label: '自然量付费数据', align: 'center', width: 70, sorter: true },
+                { title: '自然量账面充值次数', dataIndex: 'natureAmountCount', label: '自然量付费数据', align: 'center', width: 70 },
+                { title: '自然量账面充值人数', dataIndex: 'natureAmountNum', label: '自然量付费数据', align: 'center', width: 70 },
                 {
-                    title: '自然量账面充值金额', dataIndex: 'natureAmount', label: '自然量付费数据', align: 'center', width: 70, sorter: true,
+                    title: '自然量账面充值金额', dataIndex: 'natureAmount', label: '自然量付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 { title: '自然量新用户累计充值次数', dataIndex: 'natureNewUserTotalAmountCount', label: '自然量付费数据', align: 'center', width: 70, sorter: true },
@@ -212,7 +212,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '自然量账面客单价', dataIndex: 'natureAvgAmount', label: '自然量付费数据', align: 'center', width: 70, sorter: true,
+                    title: '自然量账面客单价', dataIndex: 'natureAvgAmount', label: '自然量付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
@@ -244,7 +244,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '自然量账面ARPU', dataIndex: 'natureAmountArpu', label: '自然量付费数据', align: 'center', width: 70, sorter: true,
+                    title: '自然量账面ARPU', dataIndex: 'natureAmountArpu', label: '自然量付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 }
             ]
@@ -270,10 +270,10 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     title: '总老用户充值金额', dataIndex: 'oldUserAmount', label: '总付费数据', align: 'center', width: 80, default: 33,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
-                { title: '总账面充值次数', dataIndex: 'amountCount', label: '总付费数据', align: 'center', width: 70, sorter: true },
-                { title: '总账面充值人数', dataIndex: 'amountNum', label: '总付费数据', align: 'center', width: 70, sorter: true },
+                { title: '总账面充值次数', dataIndex: 'amountCount', label: '总付费数据', align: 'center', width: 70 },
+                { title: '总账面充值人数', dataIndex: 'amountNum', label: '总付费数据', align: 'center', width: 70 },
                 {
-                    title: '总账面充值金额', dataIndex: 'amount', label: '总付费数据', align: 'center', width: 85, sorter: true,
+                    title: '总账面充值金额', dataIndex: 'amount', label: '总付费数据', align: 'center', width: 85,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 { title: '总新用户累计充值次数', dataIndex: 'newUserTotalAmountCount', label: '总付费数据', align: 'center', width: 70, sorter: true },
@@ -311,7 +311,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '总账面客单价', dataIndex: 'avgAmount', label: '总付费数据', align: 'center', width: 70, sorter: true,
+                    title: '总账面客单价', dataIndex: 'avgAmount', label: '总付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
@@ -343,7 +343,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '总账面ARPU', dataIndex: 'amountArpu', label: '总付费数据', align: 'center', width: 70, sorter: true,
+                    title: '总账面ARPU', dataIndex: 'amountArpu', label: '总付费数据', align: 'center', width: 70,
                     render: (a: string) => <Statistic value={a || 0} />
                 }
             ]