fix

src/pages/gameDataStatistics/allSurvey/index.tsx

@@ -36,14 +36,18 @@ const AllSurvey: React.FC = () => {
 
     useEffect(() => {
         if (size?.width) {
-            let width = 2000
+            let buguWidth = 0
+            if (queryForm?.sourceSystem && (queryForm?.sourceSystem === 'BG_OLD' || queryForm?.sourceSystem === 'BG_NEW')) {
+                buguWidth = 200
+            }
+            let width = 2042
             let b = 6
             if (queryForm?.gameId) {
                 b = 5
-                width = 1672
+                width = 1712
             } else {
                 b = 6
-                width = 2000
+                width = 2042
             }
             let w = size?.width || 0
             if (w > width) {
@@ -51,9 +55,9 @@ const AllSurvey: React.FC = () => {
                 width = w
                 setBadWidth(badW / b)
             }
-            setScrollDivWidth(width)
+            setScrollDivWidth(width + buguWidth)
         }
-    }, [queryForm?.gameId, size])
+    }, [queryForm?.gameId, size, queryForm?.sourceSystem])
 
     // 处理左右按钮隐藏 显示
     useEffect(() => {
@@ -99,6 +103,9 @@ const AllSurvey: React.FC = () => {
         })
     }, [queryForm])
 
+    const isBg = () => {
+        return queryForm?.sourceSystem && (queryForm?.sourceSystem === 'BG_OLD' || queryForm?.sourceSystem === 'BG_NEW')
+    }
 
     return <div className={style.allSurver}>
         <Space direction="vertical" style={{ width: '100%' }}>
@@ -167,7 +174,7 @@ const AllSurvey: React.FC = () => {
                                     </div>
                                 </div>
                             </Card>
-                            <Card bordered={false} style={{ borderRadius: 8 }} bodyStyle={{ width: 320 + badWidth }}>
+                            <Card bordered={false} style={{ borderRadius: 8 }} bodyStyle={{ width: isBg() ? 320 + 200 + badWidth : 320 + badWidth }}>
                                 <div className={style.overview}>
                                     <div className={style.left} style={{ backgroundColor: '#f4516c' }}>
                                         <MoneyCollectOutlined style={{ fontSize: 24 }} />
@@ -179,13 +186,20 @@ const AllSurvey: React.FC = () => {
                                         </div>
                                         <div className={style.bottom}>
                                             <div style={{ justifyContent: 'space-between' }}>
-                                                <div>昨账：<Statistic value={totalData?.yesterdayAmount || 0} /></div>
-                                                <div>昨新：<Statistic value={totalData?.yesterdayNewPlayerAmount || 0} /></div>
+                                                <div style={{ width: isBg() ? '30%' : '50%' }}>昨账：<Statistic value={totalData?.yesterdayAmount || 0} /></div>
+                                                <div style={{ width: isBg() ? '27%' : '50%' }}>昨新：<Statistic value={totalData?.yesterdayNewPlayerAmount || 0} /></div>
+                                                {isBg() && <div style={{ width: '43%' }}>BG自累充：<Statistic value={totalData?.totalAmountForBG || 0} /></div>}
                                             </div>
                                             <div style={{ justifyContent: 'space-between', flex: 1 }}>
-                                                <div>今账：<Statistic value={totalData?.todayAmount || 0} /></div>
-                                                <div><span style={{ color: 'red' }}>今新：</span><Statistic value={totalData?.todayNewPlayerAmount || 0} /></div>
+                                                <div style={{ width: isBg() ? '30%' : '50%' }}>今账：<Statistic value={totalData?.todayAmount || 0} /></div>
+                                                <div style={{ width: isBg() ? '27%' : '50%' }}><span style={{ color: 'red' }}>今新：</span><Statistic value={totalData?.todayNewPlayerAmount || 0} /></div>
+                                                {isBg() && <div style={{ width: '43%' }}>BG自今账：<Statistic value={totalData?.todayAmountForBG || 0} /></div>}
                                             </div>
+                                            {isBg() && <div style={{ justifyContent: 'space-between' }}>
+                                                <div style={{ width: '30%' }}></div>
+                                                <div style={{ width: '27%' }}></div>
+                                                <div style={{ width: '43%' }}>BG自昨账：<Statistic value={totalData?.yesterdayAmountForBG || 0} /></div>
+                                            </div>}
                                         </div>
                                     </div>
                                 </div>
@@ -224,7 +238,7 @@ const AllSurvey: React.FC = () => {
                                     </div>
                                 </div>
                             </Card>}
-                            <Card bordered={false} style={{ borderRadius: 8 }} bodyStyle={{ width: 360 + badWidth }}>
+                            <Card bordered={false} style={{ borderRadius: 8 }} bodyStyle={{ width: 400 + badWidth }}>
                                 <div className={style.overview}>
                                     <div className={style.left} style={{ backgroundColor: '#9254de' }}>
                                         <AccountBookOutlined style={{ fontSize: 24 }} />

src/pages/gameDataStatistics/roleOperate/roleFightingRanking/tableConfig.tsx

@@ -211,6 +211,23 @@ function columns12() {
                                 </div>
                             }
                         },
+                        {
+                            title: '角色ID',
+                            dataIndex: 'role_id',
+                            key: 'role_id',
+                            width: 100,
+                            align: 'center',
+                            className: "h5BiomassClass green2ColorClass",
+                            render: (a: any, b: any) => {
+                                return <div className='h5BiomassTable'>
+                                    {b?.role_rank_date?.map((item: any, index: number) => {
+                                        return <div key={'cc' + index}>
+                                            <div><span><WidthEllipsis value={item.role_id} /></span></div>
+                                        </div>
+                                    })}
+                                </div>
+                            }
+                        },
                         {
                             title: '角色名称',
                             dataIndex: 'role_name',

src/pages/gameDataStatistics/roleOperate/roleRechargeRanking/tableConfig.tsx

@@ -225,14 +225,14 @@ function columns12(
                     title: '是否转端', dataIndex: 'is_change_game_type', label: '客户运营操作', align: 'center', width: 60,
                     render: (a: any, b: any) => {
                         // return <IsTrue value={a ? '1' : '0'} onChange={(value) => handleIsTrue(value, b, 'isChangeGameType')} />
-                        return a ? <Badge status="error" text="是" /> : <Badge status="processing" text="否"/>
+                        return a ? <Badge status="success" text="是" /> : a === 0 ? <Badge status="default" text="否"/> : '--'
                     },
                 },
                 {
                     title: '是否添加企微', dataIndex: 'is_add_corp_wechat', label: '客户运营操作', align: 'center', width: 60,
                     render: (a: any, b: any) => {
                         // return <IsTrue value={a ? '1' : '0'} onChange={(value) => handleIsTrue(value, b, 'isAddCorpWechat')} />
-                        return a ? <Badge status="error" text="是" /> : <Badge status="processing" text="否"/>
+                        return a ? <Badge status="success" text="是" /> : a === 0 ? <Badge status="default" text="否"/> : '--'
                     },
                 },
                 {
@@ -274,7 +274,7 @@ function columns12(
                     title: '是否唤醒', dataIndex: 'is_wake_up', label: '客户运营操作', align: 'center', width: 50,
                     render: (a: any, b: any) => {
                         // return <IsTrue value={a ? '1' : '0'} onChange={(value) => handleIsTrue(value, b, 'isWakeUp')} />
-                        return a ? <Badge status="error" text="是" /> : <Badge status="processing" text="否"/>
+                        return a ? <Badge status="success" text="是" /> : a === 0 ? <Badge status="default" text="否"/> : '--'
                     },
                 },
                 {