fix

src/pages/gameDataStatistics/gameServer/serverData/tableConfig.tsx

@@ -67,11 +67,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                                 if (b?.[field]) {
                                     data = b?.[field]
                                     return <div className={style.dbox}>
-                                        {keyS?.includes('regNum') && <span style={{ color: '#2f54eb', fontWeight: 600 }}>新用户人：<span>{data?.regNum}</span></span>}
-                                        {keyS?.includes('roleNum') && <span style={{ color: '#722ed1', fontWeight: 600 }}>传角人：<span>{data?.roleNum}</span></span>}
-                                        {keyS?.includes('activeNum') && <span style={{ color: '#eb2f96', fontWeight: 600 }}>活跃人：<span>{data?.activeNum}</span></span>}
-                                        {keyS?.includes('amountNum') && <span style={{ color: '#d81b60', fontWeight: 600 }}>付费人：<span>{data?.amountNum}</span></span>}
-                                        {keyS?.includes('amount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>付金金：<span><Statistic value={data?.amount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                        {keyS?.includes('regNum') && <span style={{ color: '#2f54eb', fontWeight: 600 }}>新用户人数：<span>{data?.regNum}</span></span>}
+                                        {keyS?.includes('roleNum') && <span style={{ color: '#722ed1', fontWeight: 600 }}>创角人数：<span>{data?.roleNum}</span></span>}
+                                        {keyS?.includes('activeNum') && <span style={{ color: '#eb2f96', fontWeight: 600 }}>活跃人数：<span>{data?.activeNum}</span></span>}
+                                        {keyS?.includes('amountNum') && <span style={{ color: '#d81b60', fontWeight: 600 }}>付费人数：<span>{data?.amountNum}</span></span>}
+                                        {keyS?.includes('amount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>付费金额：<span><Statistic value={data?.amount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
                                     </div>
                                 }
                                 return '--'
@@ -84,7 +84,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 dataIndex: field,
                 key: 'gf',
                 align: "center",
-                width: 120,
+                width: 140,
                 render: (a: any, b: any) => {
                     let date1 = moment()
                     if (b?.gameName === '总计') {
@@ -107,10 +107,10 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                                 if (b?.[field]) {
                                     data = b?.[field]
                                     return <div className={style.dbox}>
-                                        {keyS?.includes('rollServerNum') && <span style={{ color: '#13c2c2', fontWeight: 600 }}>滚人数：<span>{data?.rollServerNum}</span></span>}
-                                        {keyS?.includes('rollServerAmountNum') && <span style={{ color: '#faad14', fontWeight: 600 }}>滚付费人：<span>{data?.rollServerAmountNum}</span></span>}
-                                        {keyS?.includes('rollServerAmount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>滚付金金：<span><Statistic value={data?.rollServerAmount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
-                                        {keyS?.includes('rollServerAmountRate') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>滚占比：<span>{(data?.rollServerAmountRate * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('rollServerNum') && <span style={{ color: '#13c2c2', fontWeight: 600 }}>滚服人数：<span>{data?.rollServerNum}</span></span>}
+                                        {keyS?.includes('rollServerAmountNum') && <span style={{ color: '#faad14', fontWeight: 600 }}>滚服付费人数：<span>{data?.rollServerAmountNum}</span></span>}
+                                        {keyS?.includes('rollServerAmount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>滚服付费金额：<span><Statistic value={data?.rollServerAmount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                        {keyS?.includes('rollServerAmountRate') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>滚服占比：<span>{(data?.rollServerAmountRate * 100)?.toFixed(2)}%</span></span>}
                                     </div>
                                 }
                                 return '--'
@@ -159,11 +159,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                                 if (b?.[field]) {
                                     data = b?.[field]
                                     return <div className={style.dbox}>
-                                        {keyS?.includes('regNum') && <span style={{ color: '#2f54eb', fontWeight: 600 }}>新用户人：<span>{data?.regNum}</span></span>}
-                                        {keyS?.includes('roleNum') && <span style={{ color: '#722ed1', fontWeight: 600 }}>传角人：<span>{data?.roleNum}</span></span>}
-                                        {keyS?.includes('activeNum') && <span style={{ color: '#eb2f96', fontWeight: 600 }}>活跃人：<span>{data?.activeNum}</span></span>}
-                                        {keyS?.includes('amountNum') && <span style={{ color: '#d81b60', fontWeight: 600 }}>付费人：<span>{data?.amountNum}</span></span>}
-                                        {keyS?.includes('amount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>付金金：<span><Statistic value={data?.amount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                        {keyS?.includes('regNum') && <span style={{ color: '#2f54eb', fontWeight: 600 }}>新用户人数：<span>{data?.regNum}</span></span>}
+                                        {keyS?.includes('roleNum') && <span style={{ color: '#722ed1', fontWeight: 600 }}>创角人数：<span>{data?.roleNum}</span></span>}
+                                        {keyS?.includes('activeNum') && <span style={{ color: '#eb2f96', fontWeight: 600 }}>活跃人数：<span>{data?.activeNum}</span></span>}
+                                        {keyS?.includes('amountNum') && <span style={{ color: '#d81b60', fontWeight: 600 }}>付费人数：<span>{data?.amountNum}</span></span>}
+                                        {keyS?.includes('amount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>付费金额：<span><Statistic value={data?.amount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
                                     </div>
                                 }
                                 return '--'
@@ -176,7 +176,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 dataIndex: field,
                 key: 'gf',
                 align: "center",
-                width: 110,
+                width: 140,
                 render: (a: any, b: any) => {
                     let date1 = moment()
                     if (b?.gameName === '总计') {
@@ -199,10 +199,10 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                                 if (b?.[field]) {
                                     data = b?.[field]
                                     return <div className={style.dbox}>
-                                        {keyS?.includes('rollServerNum') && <span style={{ color: '#13c2c2', fontWeight: 600 }}>滚人数：<span>{data?.rollServerNum}</span></span>}
-                                        {keyS?.includes('rollServerAmountNum') && <span style={{ color: '#faad14', fontWeight: 600 }}>滚付费人：<span>{data?.rollServerAmountNum}</span></span>}
-                                        {keyS?.includes('rollServerAmount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>滚付金金：<span><Statistic value={data?.rollServerAmount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
-                                        {keyS?.includes('rollServerAmountRate') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>滚占比：<span>{(data?.rollServerAmountRate * 100)?.toFixed(2)}%</span></span>}
+                                        {keyS?.includes('rollServerNum') && <span style={{ color: '#13c2c2', fontWeight: 600 }}>滚服人数：<span>{data?.rollServerNum}</span></span>}
+                                        {keyS?.includes('rollServerAmountNum') && <span style={{ color: '#faad14', fontWeight: 600 }}>滚服付费人数：<span>{data?.rollServerAmountNum}</span></span>}
+                                        {keyS?.includes('rollServerAmount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>滚服付费金额：<span><Statistic value={data?.rollServerAmount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                        {keyS?.includes('rollServerAmountRate') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>滚服占比：<span>{(data?.rollServerAmountRate * 100)?.toFixed(2)}%</span></span>}
                                     </div>
                                 }
                                 return '--'
@@ -225,7 +225,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
             title: `新创角`,
             dataIndex: 'y1Trend',
             align: "center",
-            width: 110,
+            width: 130,
             key: 'newCreate',
             render: (a: any, b: any) => {
                 let date1 = moment()
@@ -249,11 +249,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                             if (b?.['y1Trend']) {
                                 data = b?.['y1Trend']
                                 return <div className={style.dbox}>
-                                    {keyS?.includes('regNum') && <span style={{ color: '#2f54eb', fontWeight: 600 }}>新用户人：<span>{data?.regNum}</span></span>}
-                                    {keyS?.includes('roleNum') && <span style={{ color: '#722ed1', fontWeight: 600 }}>传角人：<span>{data?.roleNum}</span></span>}
-                                    {keyS?.includes('activeNum') && <span style={{ color: '#eb2f96', fontWeight: 600 }}>活跃人：<span>{data?.activeNum}</span></span>}
-                                    {keyS?.includes('amountNum') && <span style={{ color: '#d81b60', fontWeight: 600 }}>付费人：<span>{data?.amountNum}</span></span>}
-                                    {keyS?.includes('amount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>付金金：<span><Statistic value={data?.amount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                    {keyS?.includes('regNum') && <span style={{ color: '#2f54eb', fontWeight: 600 }}>新用户人数：<span>{data?.regNum}</span></span>}
+                                    {keyS?.includes('roleNum') && <span style={{ color: '#722ed1', fontWeight: 600 }}>创角人数：<span>{data?.roleNum}</span></span>}
+                                    {keyS?.includes('activeNum') && <span style={{ color: '#eb2f96', fontWeight: 600 }}>活跃人数：<span>{data?.activeNum}</span></span>}
+                                    {keyS?.includes('amountNum') && <span style={{ color: '#d81b60', fontWeight: 600 }}>付费人数：<span>{data?.amountNum}</span></span>}
+                                    {keyS?.includes('amount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>付费金额：<span><Statistic value={data?.amount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
                                 </div>
                             }
                             return '--'
@@ -265,7 +265,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
             title: `滚服`,
             dataIndex: 'y1Trend',
             align: "center",
-            width: 110,
+            width: 140,
             key: 'gf',
             render: (a: any, b: any) => {
                 let date1 = moment()
@@ -289,10 +289,10 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                             if (b?.['y1Trend']) {
                                 data = b?.['y1Trend']
                                 return <div className={style.dbox}>
-                                    {keyS?.includes('rollServerNum') && <span style={{ color: '#13c2c2', fontWeight: 600 }}>滚人数：<span>{data?.rollServerNum}</span></span>}
-                                    {keyS?.includes('rollServerAmountNum') && <span style={{ color: '#faad14', fontWeight: 600 }}>滚付费人：<span>{data?.rollServerAmountNum}</span></span>}
-                                    {keyS?.includes('rollServerAmount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>滚付金金：<span><Statistic value={data?.rollServerAmount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
-                                    {keyS?.includes('rollServerAmountRate') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>滚占比：<span>{(data?.rollServerAmountRate * 100)?.toFixed(2)}%</span></span>}
+                                    {keyS?.includes('rollServerNum') && <span style={{ color: '#13c2c2', fontWeight: 600 }}>滚服人数：<span>{data?.rollServerNum}</span></span>}
+                                    {keyS?.includes('rollServerAmountNum') && <span style={{ color: '#faad14', fontWeight: 600 }}>滚服付费人数：<span>{data?.rollServerAmountNum}</span></span>}
+                                    {keyS?.includes('rollServerAmount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>滚服付费金额：<span><Statistic value={data?.rollServerAmount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                    {keyS?.includes('rollServerAmountRate') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>滚服占比：<span>{(data?.rollServerAmountRate * 100)?.toFixed(2)}%</span></span>}
                                 </div>
                             }
                             return '--'
@@ -314,7 +314,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
             dataIndex: 'totalTrend',
             key: 'newCreate',
             align: "center",
-            width: 110,
+            width: 130,
             render: (a: any, b: any) => {
                 let fieldData = getFieldDta()
                 if (fieldData?.length > 0) {
@@ -325,11 +325,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                             if (b?.['totalTrend']) {
                                 data = b?.['totalTrend']
                                 return <div className={style.dbox}>
-                                    {keyS?.includes('regNum') && <span style={{ color: '#2f54eb', fontWeight: 600 }}>新用户人：<span>{data?.regNum}</span></span>}
-                                    {keyS?.includes('roleNum') && <span style={{ color: '#722ed1', fontWeight: 600 }}>传角人：<span>{data?.roleNum}</span></span>}
-                                    {keyS?.includes('activeNum') && <span style={{ color: '#eb2f96', fontWeight: 600 }}>活跃人：<span>{data?.activeNum}</span></span>}
-                                    {keyS?.includes('amountNum') && <span style={{ color: '#d81b60', fontWeight: 600 }}>付费人：<span>{data?.amountNum}</span></span>}
-                                    {keyS?.includes('amount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>付金金：<span><Statistic value={data?.amount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                    {keyS?.includes('regNum') && <span style={{ color: '#2f54eb', fontWeight: 600 }}>新用户人数：<span>{data?.regNum}</span></span>}
+                                    {keyS?.includes('roleNum') && <span style={{ color: '#722ed1', fontWeight: 600 }}>创角人数：<span>{data?.roleNum}</span></span>}
+                                    {keyS?.includes('activeNum') && <span style={{ color: '#eb2f96', fontWeight: 600 }}>活跃人数：<span>{data?.activeNum}</span></span>}
+                                    {keyS?.includes('amountNum') && <span style={{ color: '#d81b60', fontWeight: 600 }}>付费人数：<span>{data?.amountNum}</span></span>}
+                                    {keyS?.includes('amount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>付费金额：<span><Statistic value={data?.amount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
                                 </div>
                             }
                             return '--'
@@ -342,7 +342,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
             dataIndex: 'totalTrend',
             key: 'gf',
             align: "center",
-            width: 110,
+            width: 140,
             render: (a: any, b: any) => {
                 let fieldData = getFieldDta()
                 if (fieldData?.length > 0) {
@@ -353,10 +353,10 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                             if (b?.['totalTrend']) {
                                 data = b?.['totalTrend']
                                 return <div className={style.dbox}>
-                                    {keyS?.includes('rollServerNum') && <span style={{ color: '#13c2c2', fontWeight: 600 }}>滚人数：<span>{data?.rollServerNum}</span></span>}
-                                    {keyS?.includes('rollServerAmountNum') && <span style={{ color: '#faad14', fontWeight: 600 }}>滚付费人：<span>{data?.rollServerAmountNum}</span></span>}
-                                    {keyS?.includes('rollServerAmount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>滚付金金：<span><Statistic value={data?.rollServerAmount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
-                                    {keyS?.includes('rollServerAmountRate') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>滚占比：<span>{(data?.rollServerAmountRate * 100)?.toFixed(2)}%</span></span>}
+                                    {keyS?.includes('rollServerNum') && <span style={{ color: '#13c2c2', fontWeight: 600 }}>滚服人数：<span>{data?.rollServerNum}</span></span>}
+                                    {keyS?.includes('rollServerAmountNum') && <span style={{ color: '#faad14', fontWeight: 600 }}>滚服付费人数：<span>{data?.rollServerAmountNum}</span></span>}
+                                    {keyS?.includes('rollServerAmount') && <span style={{ color: '#0f538a', fontWeight: 600 }}>滚服付费金额：<span><Statistic value={data?.rollServerAmount || 0} valueStyle={{ color: '#0f538a', fontWeight: 600 }} /></span></span>}
+                                    {keyS?.includes('rollServerAmountRate') && <span style={{ color: 'rgb(12,130,16)', fontWeight: 600 }}>滚服占比：<span>{(data?.rollServerAmountRate * 100)?.toFixed(2)}%</span></span>}
                                 </div>
                             }
                             return '--'