Startseite Erkunden Hilfe
Registrieren Anmelden
wjx
/
qc-gameDataStatistics
1
0
Fork 0
Dateien Issues 0 Pull-Requests 0 Wiki
Quellcode durchsuchen

fix

wjx vor 1 Jahr
Ursprung
eb12e52f52
Commit
40f4cf8dc7
5 geänderte Dateien mit 50 neuen und 23 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 3 3
      src/components/Tables/index.tsx
  2. 0 1
      src/pages/document.ejs
  3. 31 3
      src/pages/gameDataStatistics/components/TableData/index.tsx
  4. 1 1
      src/pages/gameDataStatistics/extensionData/everyday/index.tsx
  5. 15 15
      src/pages/gameDataStatistics/extensionData/everyday/tableConfig.tsx

+ 3 - 3
src/components/Tables/index.tsx
Datei anzeigen 

@@ -49,7 +49,7 @@ interface Props {
 
     bordered?: boolean,
 
     onChange?: (pagination: any, filters: any, sorter: any) => void//服务端排序回调
 
     pagination?: boolean,
 
-    showHeader?: 1,
 
+    showHeader?: boolean,
 
     hideOnSinglePage?: boolean,
 
     className?: string,
 
     handelResize?:(columns:any)=>void//当表头被拖动改变宽度时回调设置对应的本地保存
 
@@ -59,7 +59,7 @@ interface Props {
 
 
 function Tables(props: Props) {
 
     // //导出数据
 
-    let { columns, dataSource, excle, total,handelResize, rowSelection, onRow, isShowTotal = true, hideOnSinglePage, rowClassName, className, expandedRowRender, scroll, summary, showHeader, bordered, size = 'small', onChange, sortDirections, pagination, ...prop } = props
 
+    let { columns, dataSource, excle, total,handelResize, rowSelection, onRow, isShowTotal = true, hideOnSinglePage, rowClassName, className, expandedRowRender, scroll, summary, showHeader = true, bordered, size = 'small', onChange, sortDirections, pagination, ...prop } = props
 
     let handleExcle = () => {
 
         if (dataSource.length < 1) {
 
             message.error('请先搜索再导出');
 
@@ -115,7 +115,7 @@ function Tables(props: Props) {
 
             }}
 
             bordered={bordered ? bordered : false}
 
             dataSource={dataSource}
 
-            showHeader={showHeader === 1 ? false : true}
 
+            showHeader={showHeader}
 
             scroll={scroll ? { ...scroll, scrollToFirstRowOnChange: true } : undefined}
 
             size={size}
 
             rowKey={(a: any) => {

+ 0 - 1
src/pages/document.ejs
Datei anzeigen 

@@ -10,7 +10,6 @@
 
     <title></title>
 
     <link rel="icon" href="<%= context.config.publicPath +'qclogo.png'%>" type="image/x-icon" />
 
     <script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script>
 
-    <script src="<%= context.config.publicPath %>./tinymce/tinymce.min.js" ></script>
 
     <!-- <meta name="referrer" content="never"> -->
 
   </head>
 
   <body>

+ 31 - 3
src/pages/gameDataStatistics/components/TableData/index.tsx
Datei anzeigen 

@@ -211,22 +211,50 @@ function TableData(props: Prosp) {
 
 const Tab = React.memo((props: any) => {
 
     const { size, newColumns, className, handelResize, scroll, isFull, page, isZj, rowClassName, pageSize, totalData, dataSource, onChange, expandedRowRender, total, ajax, summary } = props
 
 
+    useEffect(() => {
 
+        const contentBodyScroll = (e: any) => {
 
+            let el = document.querySelector('.header_table_body .ant-table-body');
 
+            if (el) {
 
+                el.scrollLeft = e.target.scrollLeft
 
+            }
 
+        }
 
+        const headerBodyScroll = (e: any) => {
 
+            let el = document.querySelector('.content_table_body .ant-table-body');
 
+            if (el) {
 
+                el.scrollLeft = e.target.scrollLeft
 
+            }
 
+        }
 
+        if (isZj) {
 
+            document.querySelector('.content_table_body .ant-table-body')?.addEventListener('scroll', contentBodyScroll);
 
+            document.querySelector('.header_table_body .ant-table-body')?.addEventListener('scroll', headerBodyScroll);
 
+        }
 
+        () => {
 
+            if (isZj) {
 
+                document.querySelector('.content_table_body .ant-table-body')?.removeEventListener('scroll', contentBodyScroll);
 
+                document.querySelector('.header_table_body .ant-table-body')?.removeEventListener('scroll', headerBodyScroll);
 
+            }
 
+        }
 
+    }, [isZj])
 
+
 
     return < Col span={24} >
 
         <div className={`${style[size]} ${className ? style[className] : ''} `}>
 
             {
 
                 isZj && <Tables
 
                     bordered
 
                     columns={newColumns}
 
-                    dataSource={[{ ...totalData, id: 1 }]}
 
+                    dataSource={totalData?.length > 0 ? [...totalData] : [{ id: 1 }]}
 
                     scroll={scroll ? isFull ? { ...scroll, y: document.body.clientHeight - 300 } : scroll : {}}
 
                     size={size}
 
                     pagination={false}
 
                     hideOnSinglePage
 
-                    className={`all_table ${className ? className : ''}`}
 
+                    className={`all_table header_table_body ${className ? className : ''}`}
 
+                    sortDirections={['ascend', 'descend', null]}
 
+                    onChange={(pagination: any, filters: any, sorter: any) => onChange && onChange({ pagination, filters, sortData: sorter })}
 
                 />
 
             }
 
             <Tables
 
-                className={`all_table ${className ? className : ''}`}
 
+                showHeader={!isZj}
 
+                className={`all_table content_table_body ${className ? className : ''}`}
 
                 bordered
 
                 sortDirections={['ascend', 'descend', null]}
 
                 current={page}

+ 1 - 1
src/pages/gameDataStatistics/extensionData/everyday/index.tsx
Datei anzeigen 

@@ -21,13 +21,13 @@ const Everyday: React.FC = () => {
 
 
     useEffect(() => {
 
         getPromoteDayTotal.run(queryForm).then(res => {
 
+            res.id = 1
 
             res.accountId = '总计'
 
             setTotalData([res])
 
         })
 
         getPromoteDayList.run(queryForm)
 
     }, [queryForm])
 
 
-
 
     useEffect(() => {
 
         getGameChoiceParentListType1.run().then(res => {
 
             let newType: any = {}

+ 15 - 15
src/pages/gameDataStatistics/extensionData/everyday/tableConfig.tsx
Datei anzeigen 

@@ -68,16 +68,16 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
 
         {
 
             label: '消耗',
 
             data: [
 
-                { title: '消耗', dataIndex: 'cost', key: 'cost', label: '消耗', align: 'center', width: 70, default: 7, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
-                { title: '推广计划数量', dataIndex: 'adPlanCount', key: 'adPlanCount', label: '消耗', align: 'center', width: 90, default: 8, sorter: true, render: (a: any) => (<span>{a || '--'}</span>) }
 
+                { title: '消耗', dataIndex: 'cost', key: 'cost', label: '消耗', align: 'center', width: 100, default: 7, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
+                { title: '推广计划数量', dataIndex: 'adPlanCount', key: 'adPlanCount', label: '消耗', align: 'center', width: 70, default: 8, sorter: true, render: (a: any) => (<span>{a || '--'}</span>) }
 
             ]
 
         },
 
         {
 
             label: '广告曝光数据',
 
             data: [
 
-                { title: '曝光量', dataIndex: 'viewCount', label: '广告曝光数据', align: 'center', width: 70, default: 9, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
-                { title: '点击量', dataIndex: 'clickCount', label: '广告曝光数据', align: 'center', width: 70, default: 10, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
-                { title: '转化量', dataIndex: 'convertCount', label: '广告曝光数据', align: 'center', width: 70, default: 11, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
+                { title: '曝光量', dataIndex: 'viewCount', label: '广告曝光数据', align: 'center', width: 90, default: 9, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
+                { title: '点击量', dataIndex: 'clickCount', label: '广告曝光数据', align: 'center', width: 80, default: 10, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
+                { title: '转化量', dataIndex: 'convertCount', label: '广告曝光数据', align: 'center', width: 80, default: 11, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
                 {
 
                     title: '转化率', dataIndex: 'convertRate', label: '广告曝光数据', align: 'center', width: 70, default: 12, sorter: true,
 
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
 
@@ -92,19 +92,19 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
 
                 { title: '千次曝光成本', dataIndex: 'thousandViewCost', label: '广告曝光数据', align: 'center', width: 70, default: 17, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
                 { title: '平均点击均价', dataIndex: 'avgClickCost', label: '广告曝光数据', align: 'center', width: 70, default: 18, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
                 { title: '应用下载开始量', dataIndex: 'appDownloadCount', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
-                { title: '应用下载开始成本', dataIndex: 'appDownloadCost', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
+                { title: '应用下载开始成本', dataIndex: 'appDownloadCost', label: '广告曝光数据', align: 'center', width: 90, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
                 {
 
                     title: '应用下载开始率', dataIndex: 'appDownloadRate', label: '广告曝光数据', align: 'center', width: 70, sorter: true,
 
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
 
                 },
 
                 { title: '应用下载完成量', dataIndex: 'downloadFinish', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
-                { title: '应用下载完成成本', dataIndex: 'downloadFinishCost', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
+                { title: '应用下载完成成本', dataIndex: 'downloadFinishCost', label: '广告曝光数据', align: 'center', width: 90, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
                 {
 
                     title: '应用下载完成率', dataIndex: 'downloadFinishRate', label: '广告曝光数据', align: 'center', width: 70, sorter: true,
 
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
 
                 },
 
                 { title: '应用安装量', dataIndex: 'appInstallCount', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
-                { title: '应用安装成本', dataIndex: 'appInstallCost', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
+                { title: '应用安装成本', dataIndex: 'appInstallCost', label: '广告曝光数据', align: 'center', width: 90, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
                 {
 
                     title: '应用安装完成率', dataIndex: 'appInstallRate', label: '广告曝光数据', align: 'center', width: 70, sorter: true,
 
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
 
@@ -131,13 +131,13 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
 
                 { title: '首日新用户充值金额', dataIndex: 'firstUserRechargeMoney', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
                 { title: '老用户充值次数', dataIndex: 'oldUserRechargeCount', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
                 { title: '老用户充值人数', dataIndex: 'oldUserRechargeUser', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
-                { title: '老用户充值金额', dataIndex: 'oldUserRechargeMoney', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
+                { title: '老用户充值金额', dataIndex: 'oldUserRechargeMoney', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
                 { title: '账面充值次数', dataIndex: 'showRechargeCount', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
                 { title: '账面充值人数', dataIndex: 'showRechargeUser', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
-                { title: '账面充值金额', dataIndex: 'showRechargeMoney', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
+                { title: '账面充值金额', dataIndex: 'showRechargeMoney', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
                 { title: '新用户累计充值次数', dataIndex: 'newUserRechargeCount', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
                 { title: '新用户累计充值人数', dataIndex: 'newUserRechargeUser', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
-                { title: '新用户累计充值金额', dataIndex: 'newUserRechargeMoney', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
+                { title: '新用户累计充值金额', dataIndex: 'newUserRechargeMoney', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
                 {
 
                     title: '首日回收率', dataIndex: 'todayRecoveryRate', label: '付费数据', align: 'center', width: 70, sorter: true,
 
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
 
@@ -146,7 +146,7 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
 
                     title: '买量回收率', dataIndex: 'buyRecoveryRate', label: '付费数据', align: 'center', width: 70, sorter: true,
 
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
 
                 },
 
-                { title: '毛利额', dataIndex: 'grossMargin', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
+                { title: '毛利额', dataIndex: 'grossMargin', label: '付费数据', align: 'center', width: 90, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
                 {
 
                     title: '3日ROI', dataIndex: 'roiDay3', label: '付费数据', align: 'center', width: 70, sorter: true,
 
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
 
@@ -187,15 +187,15 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
 
                 { title: '首日客单价', dataIndex: 'avgFirstUserRecharge', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
                 { title: '买量客单价', dataIndex: 'avgBuyUserRecharge', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
                 { title: '账面客单价', dataIndex: 'avgShowUserRecharge', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
-                { title: '首日充值成本', dataIndex: 'firstRechargeCost', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
-                { title: '买量充值成本', dataIndex: 'buyUserRechargeCost', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
+                { title: '首日充值成本', dataIndex: 'firstRechargeCost', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
+                { title: '买量充值成本', dataIndex: 'buyUserRechargeCost', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
 
                 {
 
                     title: '复充率', dataIndex: 'repeatRechargeRate', label: '付费数据', align: 'center', width: 70, sorter: true,
 
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
 
                 },
 
                 { title: '新增注册ARPU', dataIndex: 'newRegARPU', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
                 { title: '首日付费ARPU', dataIndex: 'firstRechargeARPU', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
-                { title: '当天付费ARPU', dataIndex: 'todayRechargeArpu', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
+                { title: '当天付费ARPU', dataIndex: 'todayRechargeArpu', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
 
                 { title: '账面ARPU', dataIndex: 'showRechargeARPU', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> }
 
             ]
 
         },