From 3c3632469eb66179abd5e78fe65b898a3aaf6cbc Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Sun, 4 Jan 2026 09:28:51 +0800 Subject: [PATCH] update --- .../enterEachProvince/index.tsx | 2 +- .../newDataAnalysis/vehicleOwner/index.tsx | 2 + .../reports/Finance/MerchantWarning/index.tsx | 2 +- .../reports/Finance/SpringFestival/index.tsx | 2 + .../Finance/businessWarning/service.ts | 20 ---- .../Finance/revenueAnalysis/service.ts | 103 +++++++++++++++++- src/services/options/index.ts | 16 +++ src/utils/requestPythonTest.ts | 2 +- 8 files changed, 125 insertions(+), 24 deletions(-) diff --git a/src/pages/newDataAnalysis/enterEachProvince/index.tsx b/src/pages/newDataAnalysis/enterEachProvince/index.tsx index 29b9d98..3044396 100644 --- a/src/pages/newDataAnalysis/enterEachProvince/index.tsx +++ b/src/pages/newDataAnalysis/enterEachProvince/index.tsx @@ -508,7 +508,7 @@ const enterEachProvince: React.FC<{ currentUser: CurrentUser }> = (props) => { const data = await handleGetProvinceVehicleTreeList(req) // JSON数据 // const data = pageData - console.log('data', data); + console.log('数据', JSON.parse(JSON.stringify(data))); if (data && data.length > 0) { setLoadingText('生成表头中，请稍后...') // 拿到表头的数据 diff --git a/src/pages/newDataAnalysis/vehicleOwner/index.tsx b/src/pages/newDataAnalysis/vehicleOwner/index.tsx index 7579636..905885c 100644 --- a/src/pages/newDataAnalysis/vehicleOwner/index.tsx +++ b/src/pages/newDataAnalysis/vehicleOwner/index.tsx @@ -561,6 +561,8 @@ const vehicleOwner: React.FC<{ currentUser: CurrentUser }> = (props) => { setExpandedRowKeys(['null-null-undefined-undefined-undefined-undefined-null']) // 接口数据 const data = await handleGetBayonetOwnerAHTreeList(req) + console.log('接口数据', JSON.parse(JSON.stringify(data))); + let endTime1: number = new Date().getTime() // 准备导出excel数据 let startTime2: number = new Date().getTime() diff --git a/src/pages/reports/Finance/MerchantWarning/index.tsx b/src/pages/reports/Finance/MerchantWarning/index.tsx index 78f492b..1e09788 100644 --- a/src/pages/reports/Finance/MerchantWarning/index.tsx +++ b/src/pages/reports/Finance/MerchantWarning/index.tsx @@ -659,7 +659,7 @@ const PeriodWarning: React.FC<{ currentUser: CurrentUser }> = (props) => { DataType: 2 } let data = await handleGetPeriodWarningList(req) - console.log('table', data); + console.log('table', JSON.parse(JSON.stringify(data))); if (data && data.length > 0) { data.forEach((item: any) => { diff --git a/src/pages/reports/Finance/SpringFestival/index.tsx b/src/pages/reports/Finance/SpringFestival/index.tsx index bb8a6fd..616d433 100644 --- a/src/pages/reports/Finance/SpringFestival/index.tsx +++ b/src/pages/reports/Finance/SpringFestival/index.tsx @@ -140,6 +140,8 @@ const SpringFestival: React.FC<{ currentUser?: CurrentUser }> = (props) => { setDetailEndTime(params.StatisticsDate) setDetailStartTime(params.CurStartDate) const data = await handleGetSpringTableList(req) + console.log('结果', JSON.parse(JSON.stringify(data))); + setShowCurrentFestivalObj(currentFestivalObj) const list: any = [] if (data.data && data.data.length > 0) { diff --git a/src/pages/reports/Finance/businessWarning/service.ts b/src/pages/reports/Finance/businessWarning/service.ts index 6b09225..6df344e 100644 --- a/src/pages/reports/Finance/businessWarning/service.ts +++ b/src/pages/reports/Finance/businessWarning/service.ts @@ -1,27 +1,7 @@ import { tableList, wrapTreeNode } from '@/utils/format'; import request from '@/utils/requestCode'; import requestNormal from '@/utils/request'; -import requestPythonTest from '@/utils/requestPythonTest'; -// 在python测试项目中 获取 多维度经营数据对比 表格数据 -export async function handlePythonGetList(params?: any) { - const data = await requestPythonTest(`api/monthly-revenue/query/`, { - method: 'GET', - params: { ...params } - }); - - if (data.Result_Code !== 100) { - return { - data: [], - current: 1, - pageSize: 10, - total: 0, - success: false - } - } - - return data.Result_Data.List; -} // 获取月度车流分析数据 diff --git a/src/pages/reports/Finance/revenueAnalysis/service.ts b/src/pages/reports/Finance/revenueAnalysis/service.ts index 1b063d7..0c6da96 100644 --- a/src/pages/reports/Finance/revenueAnalysis/service.ts +++ b/src/pages/reports/Finance/revenueAnalysis/service.ts @@ -1,7 +1,108 @@ -import {tableList, wrapTreeNode} from '@/utils/format'; +import { tableList, wrapTreeNode } from '@/utils/format'; import request from '@/utils/requestCode'; import requestNormal from '@/utils/request'; +import requestPythonTest from '@/utils/requestPythonTest'; +// 在python测试项目中 入区车辆归属地分析 表格数据 +export async function handlePythonGetRevenueEstimateList(params?: any) { + const data = await requestPythonTest(`api/dynamic/GetRevenueEstimateList/`, { + method: 'GET', + params: { ...params } + }); + + if (data.Result_Code !== 100) { + return { + data: [], + current: 1, + pageSize: 10, + total: 0, + success: false + } + } + + return data.Result_Data.List; +} + +// 在python测试项目中 获取 车流销售异常预警 表格数据 +export async function handleNewPythonTrafficWarningList(params?: any) { + const data = await requestPythonTest(`api/dynamic/warningTypeMonthINCAnalysis/`, { + method: 'GET', + params: { ...params } + }); + + if (data.Result_Code !== 100) { + return { + data: [], + current: 1, + pageSize: 10, + total: 0, + success: false + } + } + + return data.Result_Data.List; +} + + +// 在python测试项目中 获取 车流销售异常预警 表格数据 +export async function handlePythonTrafficWarningList(params?: any) { + const data = await requestPythonTest(`api/traffic-warning/cache/query/`, { + method: 'GET', + params: { ...params } + }); + + if (data.Result_Code !== 100) { + return { + data: [], + current: 1, + pageSize: 10, + total: 0, + success: false + } + } + + return data.Result_Data.List; +} + +// 在python测试项目中 获取 多维度经营数据对比 表格数据 +export async function handlePythonGetList(params?: any) { + const data = await requestPythonTest(`api/monthly-revenue/query/`, { + method: 'GET', + params: { ...params } + }); + + if (data.Result_Code !== 100) { + return { + data: [], + current: 1, + pageSize: 10, + total: 0, + success: false + } + } + + return data.Result_Data.List; +} + +// 在python测试项目中 入区车辆归属地分析 表格数据 +export async function handleBayonetList(params?: any) { + const data = await requestPythonTest(`api/bayonet/statistics/query/`, { + method: 'GET', + params: { ...params } + }); + + if (data.Result_Code !== 100) { + return { + data: [], + current: 1, + pageSize: 10, + total: 0, + success: false + } + } + + return data.Result_Data.List; +} export async function handleGetMonthINCAnalysis(params?: any) { const data = await request(`/Revenue/GetMonthINCAnalysis`, { diff --git a/src/services/options/index.ts b/src/services/options/index.ts index 7f06668..f1bf6d8 100644 --- a/src/services/options/index.ts +++ b/src/services/options/index.ts @@ -752,6 +752,22 @@ export const handleGetServerPartList = (list: any) => { return [] } +// 没有合计的情况 +export const handleGetServerPartListNoSum = (list: any) => { + const res: any = [] + if (list && list.length > 0) { + list.forEach((item: any) => { + if (item.children && item.children.length > 0) { + item.children.forEach((subItem: any) => { + res.push(subItem) + }) + } + }) + return res + } + return [] +} + // 数组去重 export const unique = (arr: any) => { if (!Array.isArray(arr)) { diff --git a/src/utils/requestPythonTest.ts b/src/utils/requestPythonTest.ts index 49bb49e..63318b2 100644 --- a/src/utils/requestPythonTest.ts +++ b/src/utils/requestPythonTest.ts @@ -60,7 +60,7 @@ const request = extend({ errorHandler, // default error handling // prefix: '/EShangApiMain',// 开发 // prefix: 'https://eshangtech.com:18900/EShangApiMain', // 正式 - prefix: 'http://127.0.0.1:8002/', // 正式 + prefix: 'http://192.168.1.207:8002/', // 正式 headers: { token: '', ProvinceCode: '',