wjx 1 yıl önce
ebeveyn
işleme
9757ee614b

+ 0 - 1
src/pages/gameDataStatistics/adlist/monitor/index.tsx

@@ -89,7 +89,6 @@ const Monitor = () => {
             }}
             title='广告监控'
             onChange={(props: any) => {
-                console.log('---->', props)
                 let { pagination, sortData } = props
                 let { current, pageSize } = pagination
                 let newQueryForm = JSON.parse(JSON.stringify(queryForm))

+ 2 - 2
src/pages/gameDataStatistics/components/TableData/index.tsx

@@ -67,7 +67,7 @@ function TableData(props: Prosp) {
     /*************************/
 
     useEffect(() => {
-        if (originalColumns.length > 0) {
+        if (isZj && originalColumns.length > 0) {
             if (sortData?.field && sortData.order) {
                 setNewColumns(originalColumns.map((item: any) => {
                     if (item.dataIndex === sortData?.field) {
@@ -82,7 +82,7 @@ function TableData(props: Prosp) {
                 }))
             }
         }
-    }, [originalColumns, sortData])
+    }, [originalColumns, sortData, isZj])
 
     const { run: runSet } = useThrottleFn((newArr, newConfig, fixedData) => {
         console.log('设置配置改变重新赋值')

+ 4 - 0
src/pages/gameDataStatistics/extensionData/everyday/index.tsx

@@ -68,6 +68,10 @@ const Everyday: React.FC = () => {
             total={getPromoteDayList?.data?.total}
             page={queryForm.pageNum}
             pageSize={queryForm.pageSize}
+            sortData={{
+                field: queryForm?.sortFiled,
+                order: queryForm?.sortType === 'asc' ? 'ascend' : 'descend'
+            }}
             title='推广每日数据'
             onChange={(props: any) => {
                 let { pagination, sortData } = props

+ 4 - 0
src/pages/gameDataStatistics/extensionData/total/index.tsx

@@ -89,6 +89,10 @@ const Total: React.FC = () => {
             total={getPromoteTotalList?.data?.total}
             page={queryForm.pageNum}
             pageSize={queryForm.pageSize}
+            sortData={{
+                field: queryForm?.sortFiled,
+                order: queryForm?.sortType === 'asc' ? 'ascend' : 'descend'
+            }}
             fixed={{ left: 5, right: 0 }}
             title='推广总数据'
             onChange={(props: any) => {

+ 4 - 0
src/pages/gameDataStatistics/gameData/everyday/index.tsx

@@ -92,6 +92,10 @@ const Everyday: React.FC = () => {
             total={getGameDayList?.data?.total}
             page={queryForm.pageNum}
             pageSize={queryForm.pageSize}
+            sortData={{
+                field: queryForm?.sortFiled,
+                order: queryForm?.sortType === 'asc' ? 'ascend' : 'descend'
+            }}
             title={`游戏每日付费趋势`}
             onChange={(props: any) => {
                 let { pagination, sortData } = props

+ 4 - 0
src/pages/gameDataStatistics/gameData/total/index.tsx

@@ -87,6 +87,10 @@ const Total: React.FC = () => {
             total={getGameTotalList?.data?.total}
             page={queryForm.pageNum}
             pageSize={queryForm.pageSize}
+            sortData={{
+                field: queryForm?.sortFiled,
+                order: queryForm?.sortType === 'asc' ? 'ascend' : 'descend'
+            }}
             title='游戏总数据'
             onChange={(props: any) => {
                 let { pagination, sortData } = props

+ 3 - 3
src/services/gameData/extensionData.ts

@@ -1,6 +1,6 @@
 import { request } from 'umi';
 import { api } from '../api';
-import { Paging } from './rankingList';
+import { Paging, SortProps } from './rankingList';
 let wapi = api + '/gameData'
 
 /**
@@ -8,7 +8,7 @@ let wapi = api + '/gameData'
  * @param data 
  * @returns 
  */
-export interface EverydayListType extends Paging {
+export interface EverydayListType extends Paging, SortProps {
     // 推广账号ID
     accountId?: number,
     // 投放渠道Id
@@ -47,7 +47,7 @@ export async function getPromoteDayTotalApi(data: EverydayListType) {
 }
 
 
-export interface PromoteTotalProps extends Paging {
+export interface PromoteTotalProps extends Paging, SortProps {
     // 推广账号ID
     accountId?: number,
     // 投放渠道Id