fix

src/pages/iaaData/novel/tencent/appPayTrend/tableConfig.tsx

@@ -13,23 +13,23 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
 
         const dataIndex = `da${index}`
         return {
-            title: `D${index}`, dataIndex, label: '基本信息', default: defaultIndex + count, width:150,
+            title: `D${index}`, dataIndex, label: '基本信息', default: defaultIndex + count, width: 150,
             render: (_: any, b: any) => {
                 if (moment().subtract(1, 'days') >= moment(b.dt === '总计' ? b.costDayBegin : b.dt).add(index - 1, 'days')) {
                     const data = b?.[dataIndex]?.split('/')
                     console.log(data)
-                    return <div className={style.dbox} style={{ height: 184}}>
-                            <span style={{ color: '#F44336', fontWeight: 600, display: 'flex', alignItems: 'center' }}>变现人数：<span><Statistic value={data?.[0] || 0} /></span></span>
-                            <span style={{ color: '#FF9800', fontWeight: 600, display: 'flex', alignItems: 'center' }}>变现次数：<span><Statistic value={data?.[1] || 0}  /></span></span>
-                            <span style={{ color: '#d81b60', fontWeight: 600, display: 'flex', alignItems: 'center' }}>新增收入：<span><Statistic value={data?.[2] || 0} precision={2} /></span></span>
-                            <span style={{ color: '#0f538a', fontWeight: 600, display: 'flex', alignItems: 'center' }}>累计收入：<span><Statistic value={data?.[3] || 0} precision={2} /></span></span>
-                            <span style={{ color: '#9C27B0', fontWeight: 600, display: 'flex', alignItems: 'center' }}>arpu：<span><Statistic value={data?.[7] || 0} precision={2} /></span></span>
-                            <span style={{ color: '#2196F3', fontWeight: 600, display: 'flex', alignItems: 'center' }}>arppu：<span><Statistic value={data?.[8] || 0} precision={2} /></span></span>
-                             <span style={{ color: '#2196F3', fontWeight: 600, display: 'flex',alignItems:'center'  }}>价值：<span><Statistic value={data?.[9] || 0} precision={2} /></span></span>
-                            <span style={{ color: 'rgb(12,130,16)', fontWeight: 600, display: 'flex', alignItems: 'center' }}>增：<span><Statistic value={data?.[4] ? data?.[4] * 100 : 0} precision={2} valueStyle={!data?.[4] ? {} : data?.[4] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
-                            <span style={{ color: '#ff5722', fontWeight: 600, display: 'flex', alignItems: 'center' }}>回：<span><Statistic value={data?.[5] ? data?.[5] * 100 : 0} precision={2} valueStyle={!data?.[5] ? {} : data?.[5] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
-                            <span style={{ color: '#d81b60', fontWeight: 600, display: 'flex', alignItems: 'center' }}>倍：<span><Statistic value={data?.[6] || 0} precision={2} /></span></span>
-                        </div>
+                    return <div className={style.dbox} style={{ height: 184 }}>
+                        <span style={{ color: '#F44336', fontWeight: 600, display: 'flex', alignItems: 'center' }}>变现人数：<span><Statistic value={data?.[0] || 0} /></span></span>
+                        <span style={{ color: '#FF9800', fontWeight: 600, display: 'flex', alignItems: 'center' }}>变现次数：<span><Statistic value={data?.[1] || 0} /></span></span>
+                        <span style={{ color: '#d81b60', fontWeight: 600, display: 'flex', alignItems: 'center' }}>新增收入：<span><Statistic value={data?.[2] || 0} precision={2} /></span></span>
+                        <span style={{ color: '#0f538a', fontWeight: 600, display: 'flex', alignItems: 'center' }}>累计收入：<span><Statistic value={data?.[3] || 0} precision={2} /></span></span>
+                        <span style={{ color: '#9C27B0', fontWeight: 600, display: 'flex', alignItems: 'center' }}>arpu：<span><Statistic value={data?.[7] || 0} precision={2} /></span></span>
+                        <span style={{ color: '#2196F3', fontWeight: 600, display: 'flex', alignItems: 'center' }}>arppu：<span><Statistic value={data?.[8] || 0} precision={2} /></span></span>
+                        {index < 7 && <span style={{ color: '#ed2a78', fontWeight: 600, display: 'flex', alignItems: 'center' }}>价值：<span><Statistic value={data?.[9] || 0} precision={2} /></span></span>}
+                        <span style={{ color: 'rgb(12,130,16)', fontWeight: 600, display: 'flex', alignItems: 'center' }}>增：<span><Statistic value={data?.[4] ? data?.[4] * 100 : 0} precision={2} valueStyle={!data?.[4] ? {} : data?.[4] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
+                        <span style={{ color: '#ff5722', fontWeight: 600, display: 'flex', alignItems: 'center' }}>回：<span><Statistic value={data?.[5] ? data?.[5] * 100 : 0} precision={2} valueStyle={!data?.[5] ? {} : data?.[5] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
+                        <span style={{ color: '#d81b60', fontWeight: 600, display: 'flex', alignItems: 'center' }}>倍：<span><Statistic value={data?.[6] || 0} precision={2} /></span></span>
+                    </div>
                 }
                 return <div style={{ height: 102, width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>--</div>
             }
@@ -115,7 +115,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
 
                 {
                     title: '注册人数', dataIndex: 'regDedupPv', label: '基本信息', align: 'center', width: 80, default: 13, sorter: true,
-                    render: (a: number, b: any) => <Statistic value={a || 0}  />
+                    render: (a: number, b: any) => <Statistic value={a || 0} />
                 },
                 ...trend
             ]

src/pages/iaaData/novel/tencent/pitcherPayTrend/tableConfig.tsx

@@ -19,16 +19,16 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                     const data = b?.[dataIndex]?.split('/')
                     console.log(data)
                     return <div className={style.dbox} style={{ height: 184 }}>
-                        <span style={{ color: '#F44336', fontWeight: 600, display: 'flex' ,alignItems:'center' }}>变现人数：<span><Statistic value={data?.[0] || 0}/></span></span>
-                        <span style={{ color: '#FF9800', fontWeight: 600, display: 'flex' ,alignItems:'center' }}>变现次数：<span><Statistic value={data?.[1] || 0}/></span></span>
-                        <span style={{ color: '#d81b60', fontWeight: 600, display: 'flex' ,alignItems:'center' }}>新增收入：<span><Statistic value={data?.[2] || 0} precision={2} /></span></span>
-                        <span style={{ color: '#0f538a', fontWeight: 600, display: 'flex',alignItems:'center'  }}>累计收入：<span><Statistic value={data?.[3] || 0} precision={2} /></span></span>
-                        <span style={{ color: '#9C27B0', fontWeight: 600, display: 'flex',alignItems:'center'  }}>arpu：<span><Statistic value={data?.[7] || 0} precision={2} /></span></span>
-                        <span style={{ color: '#2196F3', fontWeight: 600, display: 'flex',alignItems:'center'  }}>arppu：<span><Statistic value={data?.[8] || 0} precision={2} /></span></span>
-                        <span style={{ color: '#2196F3', fontWeight: 600, display: 'flex',alignItems:'center'  }}>价值：<span><Statistic value={data?.[9] || 0} precision={2} /></span></span>
-                        <span style={{ color: 'rgb(12,130,16)', fontWeight: 600, display: 'flex' ,alignItems:'center' }}>增：<span><Statistic value={data?.[4] ? data?.[4] * 100 : 0} precision={2} valueStyle={!data?.[4] ? {} : data?.[4] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
-                        <span style={{ color: '#ff5722', fontWeight: 600, display: 'flex' ,alignItems:'center' }}>回：<span><Statistic value={data?.[5] ? data?.[5] * 100 : 0} precision={2} valueStyle={!data?.[5] ? {} : data?.[5] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
-                        <span style={{ color: '#d81b60', fontWeight: 600, display: 'flex' ,alignItems:'center' }}>倍：<span><Statistic value={data?.[6] || 0} precision={2} /></span></span>
+                        <span style={{ color: '#F44336', fontWeight: 600, display: 'flex', alignItems: 'center' }}>变现人数：<span><Statistic value={data?.[0] || 0} /></span></span>
+                        <span style={{ color: '#FF9800', fontWeight: 600, display: 'flex', alignItems: 'center' }}>变现次数：<span><Statistic value={data?.[1] || 0} /></span></span>
+                        <span style={{ color: '#d81b60', fontWeight: 600, display: 'flex', alignItems: 'center' }}>新增收入：<span><Statistic value={data?.[2] || 0} precision={2} /></span></span>
+                        <span style={{ color: '#0f538a', fontWeight: 600, display: 'flex', alignItems: 'center' }}>累计收入：<span><Statistic value={data?.[3] || 0} precision={2} /></span></span>
+                        <span style={{ color: '#9C27B0', fontWeight: 600, display: 'flex', alignItems: 'center' }}>arpu：<span><Statistic value={data?.[7] || 0} precision={2} /></span></span>
+                        <span style={{ color: '#2196F3', fontWeight: 600, display: 'flex', alignItems: 'center' }}>arppu：<span><Statistic value={data?.[8] || 0} precision={2} /></span></span>
+                        {index < 7 && <span style={{ color: '#ed2a78', fontWeight: 600, display: 'flex', alignItems: 'center' }}>价值：<span><Statistic value={data?.[9] || 0} precision={2} /></span></span>}
+                        <span style={{ color: 'rgb(12,130,16)', fontWeight: 600, display: 'flex', alignItems: 'center' }}>增：<span><Statistic value={data?.[4] ? data?.[4] * 100 : 0} precision={2} valueStyle={!data?.[4] ? {} : data?.[4] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
+                        <span style={{ color: '#ff5722', fontWeight: 600, display: 'flex', alignItems: 'center' }}>回：<span><Statistic value={data?.[5] ? data?.[5] * 100 : 0} precision={2} valueStyle={!data?.[5] ? {} : data?.[5] >= 0.5 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" /></span></span>
+                        <span style={{ color: '#d81b60', fontWeight: 600, display: 'flex', alignItems: 'center' }}>倍：<span><Statistic value={data?.[6] || 0} precision={2} /></span></span>
 
                     </div>
                 }
@@ -75,7 +75,7 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 },
                 {
                     title: '投手名称', dataIndex: 'pitcherName', label: '基本信息', align: 'center', width: 80, default: 6,
-                    render: (a: string) =>  (<WidthEllipsis value={a} />)
+                    render: (a: string) => (<WidthEllipsis value={a} />)
                 },
                 {
                     title: '消耗', dataIndex: 'cost', label: '基本信息', align: 'right', width: 125, default: 7, sorter: true,
@@ -107,11 +107,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 },
                 {
                     title: '广告变现arppu', dataIndex: 'arppu', label: '基本信息', align: 'center', width: 120, default: 11, sorter: true,
-                    render: (a: number) =><Statistic value={a || 0} precision={2} />
+                    render: (a: number) => <Statistic value={a || 0} precision={2} />
                 },
                 {
                     title: '广告变现金额', dataIndex: 'appAdPayingAmount', label: '基本信息', align: 'center', width: 110, default: 12, sorter: true,
-                    render: (a: number) =><Statistic value={a || 0} precision={2} />
+                    render: (a: number) => <Statistic value={a || 0} precision={2} />
                 },
                 {
                     title: '广告变现roi', dataIndex: 'appAdPayingRoi', label: '基本信息', align: 'center', width: 105, default: 13, sorter: true,