update
This commit is contained in:
ylj20011123
parent
19e42b8ff5
commit
a147eccee7
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ant-design-pro",
|
"name": "ant-design-pro",
|
||||||
"version": "4.5.77",
|
"version": "4.5.79",
|
||||||
"private": true,
|
"private": true,
|
||||||
"description": "An out-of-box UI solution for enterprise applications",
|
"description": "An out-of-box UI solution for enterprise applications",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@ -3368,5 +3368,398 @@ export default {
|
|||||||
{ "title": "LoadBearing_Id", "dataType": "integer", "content": "服务区承载内码" },
|
{ "title": "LoadBearing_Id", "dataType": "integer", "content": "服务区承载内码" },
|
||||||
{ "title": "LoadBearing_State", "dataType": "integer", "content": "服务区承载状态，枚举：LOAD_BEARING" }
|
{ "title": "LoadBearing_State", "dataType": "integer", "content": "服务区承载状态，枚举：LOAD_BEARING" }
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
// python测试的内容
|
||||||
|
"http://localhost:8002/api/revenue/query/": {
|
||||||
|
req: [
|
||||||
|
{
|
||||||
|
"title": "SERVERPART_ID",
|
||||||
|
"dataType": "string",
|
||||||
|
"content": "服务区内码",
|
||||||
|
"isRequired": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "STATISTICS_DATE_START",
|
||||||
|
"dataType": "string",
|
||||||
|
"content": "开始统计时间",
|
||||||
|
"isRequired": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "STATISTICS_DATE_END",
|
||||||
|
"dataType": "string",
|
||||||
|
"content": "结束统计时间",
|
||||||
|
"isRequired": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "PageIndex",
|
||||||
|
"dataType": "Integer",
|
||||||
|
"content": "页码,从1开始",
|
||||||
|
"isRequired": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "PageSize",
|
||||||
|
"dataType": "Integer",
|
||||||
|
"content": "每页数量",
|
||||||
|
"isRequired": false
|
||||||
|
},
|
||||||
|
],
|
||||||
|
data: [
|
||||||
|
{
|
||||||
|
"title": "LineIndex",
|
||||||
|
"dataType": "string",
|
||||||
|
"content": "索引"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Serverpart_ID",
|
||||||
|
"dataType": "integer",
|
||||||
|
"content": "服务区内码"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Serverpart_Name",
|
||||||
|
"dataType": "string",
|
||||||
|
"content": "服务区名称"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "ServerpartShop_Id",
|
||||||
|
"dataType": "string",
|
||||||
|
"content": "门店ID"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "ServerpartShop_Name",
|
||||||
|
"dataType": "string",
|
||||||
|
"content": "门店名称"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Shop_Count",
|
||||||
|
"dataType": "integer",
|
||||||
|
"content": "门店数量"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Business_Type",
|
||||||
|
"dataType": "integer",
|
||||||
|
"content": "经营模式"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Business_Type_Text",
|
||||||
|
"dataType": "string",
|
||||||
|
"content": "经营模式（中文）"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Transfer_Type",
|
||||||
|
"dataType": "integer",
|
||||||
|
"content": "传输方式（0：收银系统；1：扫码传输；2：接口传输）"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Statistics_Date",
|
||||||
|
"dataType": "string",
|
||||||
|
"content": "统计日期"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "ShopTrade",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "商品业态"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "MERCHANTS_ID",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "经营商户ID"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "MERCHANTS_NAME",
|
||||||
|
"dataType": "string",
|
||||||
|
"content": "经营商户"
|
||||||
|
},
|
||||||
|
// {
|
||||||
|
// "title": "TotalRevenue",
|
||||||
|
// "dataType": "object",
|
||||||
|
// "content": "合计项营收数据",
|
||||||
|
// "children": [
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueTicket_Count",
|
||||||
|
"dataType": "integer",
|
||||||
|
"content": "客单数量"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueTotal_Count",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "总数量"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueTotal_OffAmount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "优惠金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueRevenue_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "实收金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueDifferent_Price_Less",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "短款金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueDifferent_Price_More",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "长款金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueCashPay_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "现金支付金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueMobilePay_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "移动支付金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueCostBill_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "大巴优惠券金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueInternalPay_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "企业会员金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueYFHD_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "油非互动金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueBankAccount_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "银行到账金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueCorrect_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "日结冲正金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueMobile_Correct",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "移动支付冲正"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueCash_Correct",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "现金支付冲正"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueSupplement_State",
|
||||||
|
"dataType": "integer",
|
||||||
|
"content": "营收补录标识（0：纯自然日营收；1：包含从日结表复制的数据）"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueSupplement_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "补录金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "TotalRevenueCigarette_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "香烟金额"
|
||||||
|
},
|
||||||
|
// ]
|
||||||
|
// },
|
||||||
|
{
|
||||||
|
"title": "RegionARevenue",
|
||||||
|
"dataType": "object",
|
||||||
|
"content": "东(南)区 / 上线 / A区营收数据",
|
||||||
|
"children": [
|
||||||
|
{
|
||||||
|
"title": "Ticket_Count",
|
||||||
|
"dataType": "integer",
|
||||||
|
"content": "客单数量"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Total_Count",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "总数量"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Total_OffAmount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "优惠金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Revenue_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "实收金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Different_Price_Less",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "短款金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Different_Price_More",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "长款金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "CashPay_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "现金支付金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "MobilePay_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "移动支付金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "CostBill_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "大巴优惠券金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "InternalPay_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "企业会员金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "YFHD_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "油非互动金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "BankAccount_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "银行到账金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Correct_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "日结冲正金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Mobile_Correct",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "移动支付冲正"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Cash_Correct",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "现金支付冲正"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Supplement_State",
|
||||||
|
"dataType": "integer",
|
||||||
|
"content": "营收补录标识（0：纯自然日营收；1：包含从日结表复制的数据）"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Supplement_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "补录金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Cigarette_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "香烟金额"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "RegionBRevenue",
|
||||||
|
"dataType": "object",
|
||||||
|
"content": "西(北)区 / 下线 / B区营收数据",
|
||||||
|
"children": [
|
||||||
|
{
|
||||||
|
"title": "Ticket_Count",
|
||||||
|
"dataType": "integer",
|
||||||
|
"content": "客单数量"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Total_Count",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "总数量"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Total_OffAmount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "优惠金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Revenue_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "实收金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Different_Price_Less",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "短款金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Different_Price_More",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "长款金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "CashPay_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "现金支付金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "MobilePay_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "移动支付金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "CostBill_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "大巴优惠券金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "InternalPay_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "企业会员金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "YFHD_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "油非互动金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "BankAccount_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "银行到账金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Correct_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "日结冲正金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Mobile_Correct",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "移动支付冲正"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Cash_Correct",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "现金支付冲正"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Supplement_State",
|
||||||
|
"dataType": "integer",
|
||||||
|
"content": "营收补录标识（0：纯自然日营收；1：包含从日结表复制的数据）"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Supplement_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "补录金额"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Cigarette_Amount",
|
||||||
|
"dataType": "number",
|
||||||
|
"content": "香烟金额"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -12,5 +12,5 @@ export async function handleGetIPDetail(params: any) {
|
|||||||
return []
|
return []
|
||||||
}
|
}
|
||||||
|
|
||||||
return data.content.address_detail
|
return data?.content?.address_detail
|
||||||
}
|
}
|
||||||
@ -614,27 +614,15 @@ const vehicleOwner: React.FC<{ currentUser: CurrentUser }> = (props) => {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
const logReq: any = await handleChangeKeyTo(req, paramsSort)
|
|
||||||
const logReq2: any = await handleChangeKeyTo(exportReq, paramsSort)
|
|
||||||
console.log('logReq', logReq);
|
|
||||||
handleSetPublicLog({
|
|
||||||
desc: [
|
|
||||||
{
|
|
||||||
url: '/CommercialApi/BigData/GetBayonetOwnerAHTreeList', params: logReq, time: (endTime1 - startTime1) / 1000,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
url: '/CommercialApi/BigData/GetBayonetOwnerAHTreeList', params: logReq2, time: (endTime2 - startTime2) / 1000,
|
|
||||||
}
|
|
||||||
],
|
|
||||||
startTime: allStartTime,
|
|
||||||
endTime: allEndTime,
|
|
||||||
buttonType: 1
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
// 导出数据
|
// 导出数据
|
||||||
|
console.log('datadatadatadatadatadata', data);
|
||||||
const exportDataList: any = []
|
const exportDataList: any = []
|
||||||
if (data && data.length > 0) {
|
if (data && data.length > 0) {
|
||||||
|
console.log('111');
|
||||||
|
|
||||||
data.forEach((item: any) => {
|
data.forEach((item: any) => {
|
||||||
if (item.children && item.children.length > 0) {
|
if (item.children && item.children.length > 0) {
|
||||||
item.children.forEach((subItem: any) => {
|
item.children.forEach((subItem: any) => {
|
||||||
@ -650,6 +638,7 @@ const vehicleOwner: React.FC<{ currentUser: CurrentUser }> = (props) => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
console.log('222');
|
||||||
if (isMoreArea) {
|
if (isMoreArea) {
|
||||||
let TotalCountSum: number = 0
|
let TotalCountSum: number = 0
|
||||||
let LightDutyTotalCountSum: number = 0
|
let LightDutyTotalCountSum: number = 0
|
||||||
@ -696,6 +685,23 @@ const vehicleOwner: React.FC<{ currentUser: CurrentUser }> = (props) => {
|
|||||||
setTableLoading(false)
|
setTableLoading(false)
|
||||||
setLoadingText('')
|
setLoadingText('')
|
||||||
setTableData(data)
|
setTableData(data)
|
||||||
|
|
||||||
|
const logReq: any = await handleChangeKeyTo(req, paramsSort)
|
||||||
|
const logReq2: any = await handleChangeKeyTo(exportReq, paramsSort)
|
||||||
|
handleSetPublicLog({
|
||||||
|
desc: [
|
||||||
|
{
|
||||||
|
url: '/CommercialApi/BigData/GetBayonetOwnerAHTreeList', params: logReq, time: (endTime1 - startTime1) / 1000,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
url: '/CommercialApi/BigData/GetBayonetOwnerAHTreeList', params: logReq2, time: (endTime2 - startTime2) / 1000,
|
||||||
|
}
|
||||||
|
],
|
||||||
|
startTime: allStartTime,
|
||||||
|
endTime: allEndTime,
|
||||||
|
buttonType: 1
|
||||||
|
})
|
||||||
|
|
||||||
return { data, success: true }
|
return { data, success: true }
|
||||||
}
|
}
|
||||||
setTableLoading(false)
|
setTableLoading(false)
|
||||||
|
|||||||
@ -1762,6 +1762,7 @@ const businessWarning: React.FC<{ currentUser?: CurrentUser }> = (props) => {
|
|||||||
setSearchParams(params)
|
setSearchParams(params)
|
||||||
handleCallLogs()
|
handleCallLogs()
|
||||||
const data = await handleGetMonthINCAnalysis(req)
|
const data = await handleGetMonthINCAnalysis(req)
|
||||||
|
|
||||||
const list: any = []
|
const list: any = []
|
||||||
setSummaryInfo({
|
setSummaryInfo({
|
||||||
RevenueINC: data.RevenueINC,
|
RevenueINC: data.RevenueINC,
|
||||||
|
|||||||
@ -1,6 +1,27 @@
|
|||||||
import { tableList, wrapTreeNode } from '@/utils/format';
|
import { tableList, wrapTreeNode } from '@/utils/format';
|
||||||
import request from '@/utils/requestCode';
|
import request from '@/utils/requestCode';
|
||||||
import requestNormal from '@/utils/request';
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// 获取月度车流分析数据
|
// 获取月度车流分析数据
|
||||||
|
|||||||
@ -1629,7 +1629,6 @@ const revenueAnalysis: React.FC<{ currentUser?: CurrentUser, route?: string }> =
|
|||||||
setSearchParams(params)
|
setSearchParams(params)
|
||||||
handleCallLogs()
|
handleCallLogs()
|
||||||
const data = await handleGetMonthINCAnalysis(req)
|
const data = await handleGetMonthINCAnalysis(req)
|
||||||
|
|
||||||
const list: any = []
|
const list: any = []
|
||||||
setSummaryInfo({
|
setSummaryInfo({
|
||||||
RevenueINC: data.RevenueINC,
|
RevenueINC: data.RevenueINC,
|
||||||
@ -1638,7 +1637,7 @@ const revenueAnalysis: React.FC<{ currentUser?: CurrentUser, route?: string }> =
|
|||||||
})
|
})
|
||||||
if (data.List && data.List.length > 0) {
|
if (data.List && data.List.length > 0) {
|
||||||
let result: any = wrapTreeNode(data.List)
|
let result: any = wrapTreeNode(data.List)
|
||||||
console.log('321312', result);
|
console.log('321312', JSON.parse(JSON.stringify(result)));
|
||||||
if (params.sorterType === '1') {
|
if (params.sorterType === '1') {
|
||||||
// 之前的 表格数据非全是服务区排名的内容到这儿开始
|
// 之前的 表格数据非全是服务区排名的内容到这儿开始
|
||||||
let exportListData: any = JSON.parse(JSON.stringify(result))
|
let exportListData: any = JSON.parse(JSON.stringify(result))
|
||||||
|
|||||||
@ -2917,7 +2917,7 @@ const compareList: React.FC<{
|
|||||||
重新申请
|
重新申请
|
||||||
</Button> :
|
</Button> :
|
||||||
// pend_state 为 0 是原先的按钮判断 后面 是添加 当前如果是12月份 12月份还没过完 不让它进行 发起结算的操作
|
// pend_state 为 0 是原先的按钮判断 后面 是添加 当前如果是12月份 12月份还没过完 不让它进行 发起结算的操作
|
||||||
compareCurrent?.PEND_STATE === 0 && moment().format('YYYY/MM') !== compareCurrent?.STATISTICS_MONTH ?
|
compareCurrent?.PEND_STATE === 0 && (new Date().getTime() > new Date(moment(compareCurrent?.CLOSED_DATE || compareCurrent?.ENDDATE).endOf('day').format('YYYY-MM-DD HH:mm:ss')).getTime() ? true : moment().format('YYYY/MM') !== compareCurrent?.STATISTICS_MONTH) ?
|
||||||
<Popconfirm
|
<Popconfirm
|
||||||
title="确认提交结算?"
|
title="确认提交结算?"
|
||||||
onConfirm={async () => {
|
onConfirm={async () => {
|
||||||
|
|||||||
@ -667,7 +667,7 @@ export const handleSetPublicLog = (obj: any) => {
|
|||||||
BUSINESSMAN_ID: currentUser.BusinessManID,
|
BUSINESSMAN_ID: currentUser.BusinessManID,
|
||||||
BUSINESSMAN_NAME: currentUser.BusinessManName,
|
BUSINESSMAN_NAME: currentUser.BusinessManName,
|
||||||
SOURCE_PLATFORM: '驿商云平台',
|
SOURCE_PLATFORM: '驿商云平台',
|
||||||
USER_LOGINIP: basicInfo.ip,
|
USER_LOGINIP: basicInfo?.ip,
|
||||||
USER_LOGINPLACE: `${basicInfo?.prov ? basicInfo?.prov : ''}${basicInfo?.prov && basicInfo?.city ? '-' : ''}${basicInfo?.city ? basicInfo?.city : ''}${basicInfo?.prov && basicInfo?.city && basicInfo?.district ? '-' : ''}${basicInfo?.district ? basicInfo?.district : ''}`,
|
USER_LOGINPLACE: `${basicInfo?.prov ? basicInfo?.prov : ''}${basicInfo?.prov && basicInfo?.city ? '-' : ''}${basicInfo?.city ? basicInfo?.city : ''}${basicInfo?.prov && basicInfo?.city && basicInfo?.district ? '-' : ''}${basicInfo?.district ? basicInfo?.district : ''}`,
|
||||||
BROWSER_VERSION: browserVersion,
|
BROWSER_VERSION: browserVersion,
|
||||||
OPERATING_SYSTEM: systemBasin
|
OPERATING_SYSTEM: systemBasin
|
||||||
@ -1189,7 +1189,7 @@ export async function getLocationByIP(ip: string, ak: string): Promise<{
|
|||||||
|
|
||||||
// 解析百度地图返回的数据
|
// 解析百度地图返回的数据
|
||||||
const content = data.content;
|
const content = data.content;
|
||||||
const addressDetail = content.address_detail;
|
const addressDetail = content?.address_detail;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
country: '中国', // 百度地图IP定位默认中国
|
country: '中国', // 百度地图IP定位默认中国
|
||||||
|
|||||||
221
src/utils/requestPythonTest.ts
Normal file
221
src/utils/requestPythonTest.ts
Normal file
@ -0,0 +1,221 @@
|
|||||||
|
/** Request 网络请求工具 更详细的 api 文档: https://github.com/umijs/umi-request */
|
||||||
|
import { extend } from 'umi-request';
|
||||||
|
|
||||||
|
import { notification } from 'antd';
|
||||||
|
|
||||||
|
import Cookies from 'js-cookie';
|
||||||
|
import moment from 'moment';
|
||||||
|
import session from './session';
|
||||||
|
import type { CurrentUser } from '@/models/user';
|
||||||
|
import { SynchroBEHAVIORRECORD } from '@/services/user';
|
||||||
|
import { encryptAES } from './handleAes';
|
||||||
|
|
||||||
|
const codeMessage: Record<number, string> = {
|
||||||
|
200: '服务器成功返回请求的数据。',
|
||||||
|
201: '新建或修改数据成功。',
|
||||||
|
202: '一个请求已经进入后台排队（异步任务）。',
|
||||||
|
204: '删除数据成功。',
|
||||||
|
400: '发出的请求有错误，服务器没有进行新建或修改数据的操作。',
|
||||||
|
401: '用户没有权限（令牌、用户名、密码错误）。',
|
||||||
|
403: '用户得到授权，但是访问是被禁止的。',
|
||||||
|
404: '发出的请求针对的是不存在的记录，服务器没有进行操作。',
|
||||||
|
406: '请求的格式不可得。',
|
||||||
|
410: '请求的资源被永久删除，且不会再得到的。',
|
||||||
|
422: '当创建一个对象时，发生一个验证错误。',
|
||||||
|
500: '服务器发生错误，请检查服务器。',
|
||||||
|
502: '网关错误。',
|
||||||
|
503: '服务不可用，服务器暂时过载或维护。',
|
||||||
|
504: '网关超时。',
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @zh-CN 异常处理程序
|
||||||
|
* @en-US Exception handler
|
||||||
|
*/
|
||||||
|
const errorHandler = (error: { response: Response }): Response => {
|
||||||
|
const { response } = error;
|
||||||
|
|
||||||
|
|
||||||
|
if (response && response.status) {
|
||||||
|
const errorText = codeMessage[response.status] || response.statusText;
|
||||||
|
const { status, url } = response;
|
||||||
|
|
||||||
|
notification.error({
|
||||||
|
message: `请求错误 ${status}: ${url}`,
|
||||||
|
description: errorText,
|
||||||
|
});
|
||||||
|
} else if (!response) {
|
||||||
|
notification.error({
|
||||||
|
description: '您的网络异常，无法连接到服务器.',
|
||||||
|
message: '网络异常',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return response;
|
||||||
|
};
|
||||||
|
/**
|
||||||
|
* @en-US Configure the default parameters for request
|
||||||
|
* @zh-CN 配置request请求时的默认参数
|
||||||
|
*/
|
||||||
|
const request = extend({
|
||||||
|
errorHandler, // default error handling
|
||||||
|
// prefix: '/EShangApiMain',// 开发
|
||||||
|
// prefix: 'https://eshangtech.com:18900/EShangApiMain', // 正式
|
||||||
|
prefix: 'http://127.0.0.1:8002/', // 正式
|
||||||
|
headers: {
|
||||||
|
token: '',
|
||||||
|
ProvinceCode: '',
|
||||||
|
ServerpartCodes: '',
|
||||||
|
// tmp: (new Date()).getTime()
|
||||||
|
}
|
||||||
|
|
||||||
|
// credentials: 'include', // Does the default request bring cookies
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
// 存一下进来调用的值
|
||||||
|
// let userbeHaviObj: any = {}
|
||||||
|
|
||||||
|
|
||||||
|
// request拦截器, 改变url 或 options.
|
||||||
|
request.interceptors.request.use((url, opt: any) => {
|
||||||
|
const options = { ...opt }
|
||||||
|
const currentUser: CurrentUser = session.get('currentUser');
|
||||||
|
// let userbeHaviObj = {
|
||||||
|
// url: url,
|
||||||
|
// options: options,
|
||||||
|
// currentUser: currentUser,
|
||||||
|
// startTime: new Date().getTime()
|
||||||
|
// }
|
||||||
|
// options.userbeHaviObj = userbeHaviObj
|
||||||
|
|
||||||
|
if (currentUser) {
|
||||||
|
if (options.headers) {
|
||||||
|
if (url.indexOf('SynchroSERVERPART') > -1) {
|
||||||
|
options.headers = {
|
||||||
|
...options.headers,
|
||||||
|
PROVINCE_CODE: opt?.data?.PROVINCE_CODE,
|
||||||
|
ProvinceCode: opt?.data?.PROVINCE_CODE,
|
||||||
|
provincecode: opt?.data?.PROVINCE_CODE,
|
||||||
|
token: currentUser.UserToken || '',
|
||||||
|
ServerpartCodes: currentUser.CityAuthority || '',
|
||||||
|
ServerpartShopIds: currentUser.ServerpartShopIds || '',
|
||||||
|
UserPattern: currentUser?.UserPattern || '',
|
||||||
|
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
options.headers = {
|
||||||
|
...options.headers,
|
||||||
|
token: currentUser.UserToken || '',
|
||||||
|
ProvinceCode: opt?.data?.noProvinceCode ? '' : (currentUser.ProvinceCode || ''),
|
||||||
|
ServerpartCodes: currentUser.CityAuthority || '',
|
||||||
|
ServerpartShopIds: currentUser.ServerpartShopIds || '',
|
||||||
|
UserPattern: currentUser?.UserPattern || '',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (url.indexOf('SynchroSERVERPART') > -1) {
|
||||||
|
options.data = {
|
||||||
|
...options.data,
|
||||||
|
STAFF_ID: currentUser.ID,
|
||||||
|
STAFF_NAME: currentUser.Name,
|
||||||
|
OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'),
|
||||||
|
PROVINCE_CODE: opt?.data?.PROVINCE_CODE,
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if ((url.indexOf('Synchro') > -1 || url.indexOf('Save') > -1) &&
|
||||||
|
url.indexOf('Picture/SaveImgFile') === -1) {
|
||||||
|
|
||||||
|
// 添加操作人和业主单位信息
|
||||||
|
options.data = {
|
||||||
|
...options.data,
|
||||||
|
STAFF_ID: currentUser.ID,
|
||||||
|
STAFF_NAME: currentUser.Name,
|
||||||
|
OWNERUNIT_ID: options.data.OWNERUNIT_ID || currentUser.OwnerUnitId,
|
||||||
|
OWNERUNIT_NAME: options.data.OWNERUNIT_NAME || currentUser.ProvinceUnit,
|
||||||
|
PROVINCE_CODE: (options.data.PROVINCE_CODE || currentUser.ProvinceCode),
|
||||||
|
|
||||||
|
OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss')
|
||||||
|
}
|
||||||
|
if (currentUser?.UserPattern === 2000) {
|
||||||
|
options.data = {
|
||||||
|
...options.data,
|
||||||
|
PROVINCE_CODE: (options.data.PROVINCE_CODE || currentUser.ProvinceCode),
|
||||||
|
BUSINESSMAN_ID: currentUser.BusinessManID,
|
||||||
|
OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options && options.data && options.data.requestEncryption) {
|
||||||
|
options.data = {
|
||||||
|
name: "",
|
||||||
|
value: encryptAES(JSON.stringify(options.data))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
// url: url.indexOf('handler_ajax.ashx')>-1 ?`https://user.eshangtech.com${url}`: `http://47.96.233.105/EShangApiMain${url}`,
|
||||||
|
url,// .indexOf('handler_ajax.ashx')>-1 ?`${url}`: `/EShangApiMain${url}`,
|
||||||
|
options,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
request.interceptors.response.use((response, option) => {
|
||||||
|
const nowTmp = moment()
|
||||||
|
Cookies.set('tmp', nowTmp.format())
|
||||||
|
|
||||||
|
// // 加个数组 如果请求地址是数组里面的 那就不调用 记录用户行为了
|
||||||
|
// let specialList = ['/FrameWork/GetFieldEnumByField', "/FrameWork/GetUserModuleList", "/FrameWork/GetFieldEnumTree", '/Logging/GetPassportInfoByToken', '/Logging/UserLogin', 'Dictionary/GetFieEnumList', '/Platform/SynchroBehaviorrecord']
|
||||||
|
// // 判断一下 现在的这次请求 是不是特殊 不需要进行记录的
|
||||||
|
// let isOk: boolean = true
|
||||||
|
|
||||||
|
// let userbeHaviObj = option?.userbeHaviObj || {}
|
||||||
|
|
||||||
|
// specialList.forEach((item: any) => {
|
||||||
|
// if (userbeHaviObj.url.indexOf(item) !== -1) {
|
||||||
|
// isOk = false
|
||||||
|
// }
|
||||||
|
// })
|
||||||
|
|
||||||
|
// if (isOk) {
|
||||||
|
// let nowMenu = session.get("currentMenu")
|
||||||
|
// let endTime = new Date().getTime()
|
||||||
|
// let basicInfo = session.get("basicInfo")
|
||||||
|
// let systemBasin = session.get("systemBasin")
|
||||||
|
// let browserVersion = session.get("browserVersion")
|
||||||
|
|
||||||
|
// const req: any = {
|
||||||
|
// USER_ID: userbeHaviObj.currentUser.ID,
|
||||||
|
// USER_NAME: userbeHaviObj.currentUser.Name,
|
||||||
|
// BEHAVIORRECORD_TYPE: "2000", // 1000 浏览页面 2000 行为记录
|
||||||
|
// BEHAVIORRECORD_EXPLAIN: `在页面${nowMenu.name}调用接口${userbeHaviObj.url.split('https://eshangtech.com:18900')[1]}`,
|
||||||
|
// BEHAVIORRECORD_TIME: moment(new Date(userbeHaviObj.startTime)).format('YYYY-MM-DD HH:mm:ss'),
|
||||||
|
// BEHAVIORRECORD_ROUT: nowMenu.pathname,
|
||||||
|
// BEHAVIORRECORD_ROUTNAME: nowMenu.name,
|
||||||
|
// BEHAVIORRECORD_LEAVETIME: moment(new Date(endTime)).format('YYYY-MM-DD HH:mm:ss'),
|
||||||
|
// BEHAVIORRECORD_DURATION: (endTime - userbeHaviObj.startTime) / 1000,
|
||||||
|
// OWNERUNIT_ID: userbeHaviObj.currentUser.OwnerUnitId,
|
||||||
|
// OWNERUNIT_NAME: userbeHaviObj.currentUser.OwnerUnitName,
|
||||||
|
// BUSINESSMAN_ID: userbeHaviObj.currentUser.BusinessManID,
|
||||||
|
// BUSINESSMAN_NAME: userbeHaviObj.currentUser.BusinessManName,
|
||||||
|
// SOURCE_PLATFORM: '驿商云平台',
|
||||||
|
// BEHAVIORRECORD_DESC: JSON.stringify(userbeHaviObj.options.params) === '{}' ? userbeHaviObj.url.split('?')[1] : JSON.stringify(userbeHaviObj.options.params), // 入参
|
||||||
|
// USER_LOGINIP: basicInfo.ip,
|
||||||
|
// USER_LOGINPLACE: `${basicInfo.country}${basicInfo.prov}${basicInfo.city}${basicInfo.district}`,
|
||||||
|
// BROWSER_VERSION: browserVersion,
|
||||||
|
// OPERATING_SYSTEM: systemBasin
|
||||||
|
// }
|
||||||
|
// console.log('reqreqreqreqreq', req);
|
||||||
|
// // fetch('https://eshangtech.com:18900/EShangApiMain/Platform/SynchroBEHAVIORRECORD', {
|
||||||
|
// // method: 'POST',
|
||||||
|
// // headers: {
|
||||||
|
// // 'Content-Type': 'application/json',
|
||||||
|
// // },
|
||||||
|
// // body: JSON.stringify(req),
|
||||||
|
// // })
|
||||||
|
// }
|
||||||
|
return response
|
||||||
|
})
|
||||||
|
export default request;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
// 由 scripts/writeVersion.js 自动生成
|
// 由 scripts/writeVersion.js 自动生成
|
||||||
export const VERSION = "4.5.77";
|
export const VERSION = "4.5.79";
|
||||||
export const GIT_HASH = "f2fa634";
|
export const GIT_HASH = "19e42b8";
|
||||||
export const BUILD_TIME = "2025-12-11T08:48:46.590Z";
|
export const BUILD_TIME = "2025-12-24T06:15:18.426Z";
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user