Compare commits

..

No commits in common. "f2fa634ea4dbc516a5cad4b43ef219e1139d3d15" and "dde90fb97b44cf34d473ed588b9091644dbfaffc" have entirely different histories.

20 changed files with 2479 additions and 3106 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "ant-design-pro", "name": "ant-design-pro",
"version": "4.5.75", "version": "4.5.71",
"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": {

View File

@ -84,7 +84,7 @@
const tableName = getreqstr('tablename'); const tableName = getreqstr('tablename');
const tableType = getreqstr('tabletype'); const tableType = getreqstr('tabletype');
const readonly = getreqstr('readonly') ? true : false; const readonly = getreqstr('readonly') ? true : false;
const actions = 'https://eshangtech.com:18900/EShangApiMain' const actions = 'https://api.eshangtech.com/EShangApiMain'
let uploadRef = ref(null) let uploadRef = ref(null)
let showPreviewRef = ref(null) let showPreviewRef = ref(null)
let filename = ref('') let filename = ref('')

View File

@ -24,7 +24,6 @@ const configAiModal = ({ onRef, configType, interfaceName, parentFormRef }: Deta
const [selectedModalOrderRowKeys, setSelectedModalOrderRowKeys] = useState<any>() const [selectedModalOrderRowKeys, setSelectedModalOrderRowKeys] = useState<any>()
// 勾选的行的详情数据 // 勾选的行的详情数据
const [selectModalRowList, setSelectModalRowList] = useState<any>() const [selectModalRowList, setSelectModalRowList] = useState<any>()
const [childRowKeys, setChildRowKeys] = useState<any>()
const columns: any = [ const columns: any = [
{ {
@ -32,15 +31,25 @@ const configAiModal = ({ onRef, configType, interfaceName, parentFormRef }: Deta
dataIndex: 'title', dataIndex: 'title',
readonly: true, readonly: true,
}, },
{
title: '字段类型',
dataIndex: 'dataType',
readonly: true,
},
{ {
title: '字段说明', title: '字段说明',
dataIndex: 'content', dataIndex: 'content',
}, },
// {
// title: '操作',
// valueType: 'option',
// width: 200,
// render: (text, record, _, action) => {
// return <a
// key="editable"
// onClick={() => {
// action?.startEditable?.(record.id);
// }}
// >
// 编辑
// </a>
// }
// }
] ]
useEffect(() => { useEffect(() => {
@ -53,101 +62,89 @@ const configAiModal = ({ onRef, configType, interfaceName, parentFormRef }: Deta
if (configType === 1) { if (configType === 1) {
let list: any = obj && obj.req && obj.req.length > 0 ? obj.req : [] let list: any = obj && obj.req && obj.req.length > 0 ? obj.req : []
let keyList: any = []
let uniqueIdCounter = 0; let disableList: any = []
const listWithIds = list.map((item: any) => { let disableDetail: any = []
const id = `${item.title}-${uniqueIdCounter++}`;
return { ...item, id: id };
});
let keyList: any = [] // Will store IDs for editableKeys
let disableList: any = [] // Will store IDs for selected items
let disableDetail: any = [] // Will store actual item objects for selected items
let defaultObj: any = formDetail?.PARAM_FIELD ? JSON.parse(formDetail?.PARAM_FIELD) : '' let defaultObj: any = formDetail?.PARAM_FIELD ? JSON.parse(formDetail?.PARAM_FIELD) : ''
console.log('defaultObj', defaultObj); console.log('defaultObj', defaultObj);
// Populate keyList, initial disableList based on isRequired // disableList 为默认勾选起来的字段
if (listWithIds && listWithIds.length > 0) { // 有两种 一种是必填项 那么默认勾选好的 一种是之前的勾选记录
listWithIds.forEach((item: any) => { if (list && list.length > 0) {
keyList.push(item.id) // Use item.id for editableKeys list.forEach((item: any) => {
keyList.push(item.title)
if (item.isRequired) { if (item.isRequired) {
disableList.push(item.id) // Use item.id for selection disableList.push(item.title)
disableDetail.push(item) disableDetail.push(item)
} }
}) })
} }
console.log('disableList', disableList); console.log('disableList', disableList);
// Handle default selections from formDetail
if (defaultObj) { if (defaultObj) {
listWithIds.forEach((item: any) => { for (let key in defaultObj) {
if (defaultObj[item.title]) { // Check if this item's title exists in defaultObj list.forEach((item: any) => {
item.content = defaultObj[item.title]; // Update content if (item.title === key) {
item.content = defaultObj[key]
// If not already in disableList (e.g., from isRequired), add it
if (disableList.indexOf(item.id) === -1) {
disableList.push(item.id);
disableDetail.push(item);
} }
} })
}); if (disableList.indexOf(key) === -1) {
} list.forEach((item: any) => {
setSelectedModalOrderRowKeys(disableList) // disableList now contains IDs if (item.title === key) {
setSelectModalRowList(disableDetail) // disableDetail now contains objects with IDs disableList.push(item.title)
setEditableKeys(keyList) // keyList now contains IDs disableDetail.push(item)
setTableData(listWithIds) // tableData now contains objects with IDs
} else if (configType === 2) {
let list: any = obj?.data && obj.data.length > 0 ? obj.data : [];
let uniqueIdCounter = 0;
const listWithIds = list.map((item: any) => {
const parentId = `${item.title}-${uniqueIdCounter++}`;
const newItem = { ...item, id: parentId };
if (newItem.children) {
newItem.children = newItem.children.map((child: any) => {
const childId = `${child.title}-${uniqueIdCounter++}`;
return { ...child, id: childId };
});
}
return newItem;
});
let disableList: any = []
let disableDetail: any = []
let defaultObj: any = formDetail?.RESPONSE_FIELD ? JSON.parse(formDetail?.RESPONSE_FIELD) : ''
console.log('defaultObj', defaultObj);
const childrenKeys: any[] = [];
if (listWithIds && listWithIds.length > 0) {
listWithIds.forEach((item: any) => {
if (item.children && item.children.length > 0) {
item.children.forEach((child: any) => {
childrenKeys.push(child.id);
});
} }
}) })
} }
setChildRowKeys(childrenKeys);
if (defaultObj) {
const allRowsWithIds = listWithIds.flatMap((item: any) => [item, ...(item.children || [])]);
for (const key in defaultObj) {
const matchingRows = allRowsWithIds.filter((row: any) => row.title === key);
matchingRows.forEach((row: any) => {
row.content = defaultObj[key];
if (disableList.indexOf(row.id) === -1) {
disableList.push(row.id);
disableDetail.push(row);
}
});
} }
} }
setSelectedModalOrderRowKeys(disableList) setSelectedModalOrderRowKeys(disableList)
setSelectModalRowList(disableDetail) setSelectModalRowList(disableDetail)
setEditableKeys(listWithIds.map((item: any) => item.id)) setEditableKeys(keyList)
setTableData(listWithIds) setTableData(list)
} else if (configType === 2) {
let list: any = obj && obj.data && obj.data.length > 0 ? obj.data : ''
let keyList: any = []
let disableList: any = []
let disableDetail: any = []
let defaultObj: any = formDetail?.RESPONSE_FIELD ? JSON.parse(formDetail?.RESPONSE_FIELD) : ''
console.log('defaultObj', defaultObj);
if (list && list.length > 0) {
list.forEach((item: any) => {
keyList.push(item.title)
if (item.isRequired) {
disableList.push(item.title)
disableDetail.push(item)
}
})
}
if (defaultObj) {
for (let key in defaultObj) {
list.forEach((item: any) => {
if (item.title === key) {
item.content = defaultObj[key]
}
})
if (disableList.indexOf(key) === -1) {
list.forEach((item: any) => {
if (item.title === key) {
disableList.push(item.title)
disableDetail.push(item)
}
})
}
}
}
setSelectedModalOrderRowKeys(disableList)
setSelectModalRowList(disableDetail)
setEditableKeys(keyList)
setTableData(list)
} }
} }
}, []) }, [])
@ -159,7 +156,9 @@ const configAiModal = ({ onRef, configType, interfaceName, parentFormRef }: Deta
return ( return (
<div> <div>
<EditableProTable <EditableProTable
rowKey={'id'} rowKey={(record: any) => {
return `${record?.title}`
}}
className={"configAiModalTable"} className={"configAiModalTable"}
actionRef={actionRef} actionRef={actionRef}
formRef={formRef} formRef={formRef}
@ -182,7 +181,7 @@ const configAiModal = ({ onRef, configType, interfaceName, parentFormRef }: Deta
let detailList: any = [] let detailList: any = []
if (recordList && recordList.length > 0 && selectedModalOrderRowKeys && selectedModalOrderRowKeys.length > 0) { if (recordList && recordList.length > 0 && selectedModalOrderRowKeys && selectedModalOrderRowKeys.length > 0) {
recordList.forEach((item: any) => { recordList.forEach((item: any) => {
if (selectedModalOrderRowKeys.indexOf(item.id) !== -1) { // Changed item.title to item.id if (selectedModalOrderRowKeys.indexOf(item.title) !== -1) {
detailList.push(item) detailList.push(item)
} }
}) })
@ -195,48 +194,13 @@ const configAiModal = ({ onRef, configType, interfaceName, parentFormRef }: Deta
type: 'checkbox', type: 'checkbox',
selectedRowKeys: selectedModalOrderRowKeys, selectedRowKeys: selectedModalOrderRowKeys,
onChange: (selectedRowKeys: any, selectedRows: any) => { onChange: (selectedRowKeys: any, selectedRows: any) => {
const newSelectedKeys = new Set(selectedRowKeys); console.log('selectedRowKeys', selectedRowKeys);
const oldSelectedKeys = new Set(selectedModalOrderRowKeys || []); console.log('selectedRows', selectedRows);
setSelectModalRowList(selectedRows)
// Only apply parent-child logic for configType === 2 setSelectedModalOrderRowKeys(selectedRowKeys)
if (configType === 2) {
tableData.forEach((parent: any) => {
if (parent.children) {
const parentKey = parent.id;
const childKeys = parent.children.map((child: any) => child.id);
// if parent was just selected
if (newSelectedKeys.has(parentKey) && !oldSelectedKeys.has(parentKey)) {
childKeys.forEach((key: any) => newSelectedKeys.add(key));
}
// if parent was just deselected
if (!newSelectedKeys.has(parentKey) && oldSelectedKeys.has(parentKey)) {
childKeys.forEach((key: any) => newSelectedKeys.delete(key));
}
}
});
}
const finalKeys = Array.from(newSelectedKeys);
const allRowsForSelection: any[] = [];
if (tableData) {
tableData.forEach((item: any) => {
allRowsForSelection.push(item);
if (item.children) {
allRowsForSelection.push(...item.children);
}
});
}
const finalRows = allRowsForSelection.filter((row: any) => newSelectedKeys.has(row.id));
setSelectModalRowList(finalRows);
setSelectedModalOrderRowKeys(finalKeys);
}, },
getCheckboxProps: (record: any) => ({ getCheckboxProps: (record: any) => ({
disabled: (configType === 2 && childRowKeys && childRowKeys.includes(record.id)), // Only disable children for configType 2 disabled: record.isRequired,
}), }),
}} }}
recordCreatorProps={false} recordCreatorProps={false}

View File

@ -159,6 +159,16 @@ const Login: React.FC<LoginProps> = (props) => {
} }
}, []) }, [])
function successCallback(position: { coords: { latitude: any; longitude: any; }; }) {
const latitude = position.coords.latitude;
const longitude = position.coords.longitude;
}
function errorCallback(error) {
}
function getBrowserVersion() { function getBrowserVersion() {
const userAgent: string = navigator.userAgent; const userAgent: string = navigator.userAgent;
let version: any = ""; let version: any = "";

View File

@ -2916,20 +2916,13 @@ const compareList: React.FC<{
}}> }}>
</Button> : </Button> :
// pend_state 为 0 是原先的按钮判断 后面 是添加 当前如果是12月份 12月份还没过完 不让它进行 发起结算的操作 compareCurrent?.PEND_STATE === 0 ?
compareCurrent?.PEND_STATE === 0 && moment().format('YYYY/MM') !== compareCurrent?.STATISTICS_MONTH ?
<Popconfirm <Popconfirm
title="确认提交结算?" title="确认提交结算?"
onConfirm={async () => { onConfirm={async () => {
console.log('compareCurrent', compareCurrent); console.log('compareCurrent', compareCurrent);
console.log('lastMonthIsOverlastMonthIsOverlastMonthIsOver', lastMonthIsOver); console.log('lastMonthIsOverlastMonthIsOverlastMonthIsOver', lastMonthIsOver);
console.log('MonthSettlementRefMonthSettlementRefMonthSettlementRef', MonthSettlementRef); console.log('MonthSettlementRefMonthSettlementRefMonthSettlementRef', MonthSettlementRef);
// if (moment().format('YYYY/MM') === compareCurrent?.STATISTICS_MONTH) {
// message.error('未到结算日期,无法发起结算!')
// return
// }
if (lastMonthIsOver) { if (lastMonthIsOver) {
// 是否显示下面四项为0的时候的询问框 // 是否显示下面四项为0的时候的询问框
let showNotice: any = false let showNotice: any = false

View File

@ -2816,8 +2816,7 @@ const YearExamineDetailTable = ({ parentRow, currentApprovalstate, onRef, setIsS
{/* 判断当期项目 是不是最后一期 是最后一期的话 就显示 历史期的数据 */} {/* 判断当期项目 是不是最后一期 是最后一期的话 就显示 历史期的数据 */}
{/* <HistoricalProjects parentRow={parentRow} /> */} {/* <HistoricalProjects parentRow={parentRow} /> */}
{ {
// parentRow?.PROJECT_ENDDATE && parentRow?.ENDDATE && moment(parentRow?.PROJECT_ENDDATE).format('YYYY-MM-DD') === moment(parentRow?.ENDDATE).format('YYYY-MM-DD') && parentRow?.BUSINESSAPPROVAL_ID > 0 ? parentRow?.PROJECT_ENDDATE && parentRow?.ENDDATE && moment(parentRow?.PROJECT_ENDDATE).format('YYYY-MM-DD') === moment(parentRow?.ENDDATE).format('YYYY-MM-DD') && parentRow?.BUSINESSAPPROVAL_ID > 0 ?
parentRow?.ProjectExit ?
<HistoricalProjects parentRow={parentRow} pageType={'search'} /> : "" <HistoricalProjects parentRow={parentRow} pageType={'search'} /> : ""
} }

View File

@ -561,8 +561,7 @@ const AfterSettlement = ({ parentRow, dataRef, onShow, setIsFinishCalibration, o
</> </>
{ {
// parentRow?.PROJECT_ENDDATE && parentRow?.ENDDATE && moment(parentRow?.PROJECT_ENDDATE).format('YYYY-MM-DD') === moment(parentRow?.ENDDATE).format('YYYY-MM-DD') ? parentRow?.PROJECT_ENDDATE && parentRow?.ENDDATE && moment(parentRow?.PROJECT_ENDDATE).format('YYYY-MM-DD') === moment(parentRow?.ENDDATE).format('YYYY-MM-DD') ?
parentRow?.ProjectExit ?
<HistoricalProjects parentRow={parentRow} onRef={HistoricalProjectsRef} pageType={'edit'} /> <HistoricalProjects parentRow={parentRow} onRef={HistoricalProjectsRef} pageType={'edit'} />
: "" : ""
} }

View File

@ -84,8 +84,7 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
} }
return record?.BUSINESSPROJECT_NAME ? indexStr > 0 ? <span> return record?.BUSINESSPROJECT_NAME ? indexStr > 0 ? <span>
{ {
// new Date(record?.PROJECT_ENDDATE).getTime() < new Date().getTime() ? new Date(record?.PROJECT_ENDDATE).getTime() < new Date().getTime() ?
record?.ProjectExit ?
<Tooltip title={record?.PROJECT_ENDDATE}> <Tooltip title={record?.PROJECT_ENDDATE}>
<span style={{ marginLeft: '4px', color: '#faad14' }}>退</span> <span style={{ marginLeft: '4px', color: '#faad14' }}>退</span>
</Tooltip> : </Tooltip> :
@ -104,8 +103,7 @@ const settlementAccount: React.FC<{ currentUser: CurrentUser }> = (props) => {
: :
<span> <span>
{ {
// new Date(record?.PROJECT_ENDDATE).getTime() < new Date().getTime() ? new Date(record?.PROJECT_ENDDATE).getTime() < new Date().getTime() ?
record?.ProjectExit ?
<Tooltip title={record?.PROJECT_ENDDATE}> <Tooltip title={record?.PROJECT_ENDDATE}>
<span style={{ marginLeft: '4px', color: '#faad14' }}>退</span> <span style={{ marginLeft: '4px', color: '#faad14' }}>退</span>
</Tooltip> : </Tooltip> :

View File

@ -212,8 +212,7 @@ export const handleNewPrint = (printName: string, title: string, neckBox?: any,
// styles 获取页面的样式 // styles 获取页面的样式
// tableDom 要打印显示的表格 直接dom元素拿进来(处理好的) // tableDom 要打印显示的表格 直接dom元素拿进来(处理好的)
// footer 打印内容底部的自定义样式 需求不一样 样式也不一样 外面写好样式和标签直接传入 // footer 打印内容底部的自定义样式 需求不一样 样式也不一样 外面写好样式和标签直接传入
// const printWindow = window.open('', '_blank', 'width=1400,height=800'); const printWindow = window.open('', '_blank', 'width=1400,height=800');
const printWindow = window.open('about:blank', '_blank', 'width=1400,height=800');
if (printWindow) { if (printWindow) {
printWindow.document.open(); printWindow.document.open();
printWindow.document.write(` printWindow.document.write(`
@ -644,7 +643,7 @@ export const handleSetPublicLog = (obj: any) => {
let browserVersion = session.get("browserVersion") let browserVersion = session.get("browserVersion")
if (obj.desc && obj.desc.length > 0) { if (obj.desc && obj.desc.length > 0) {
obj.desc.forEach((item: any) => { obj.desc.forEach((item: any) => {
item.url = 'https://eshangtech.com:18900' + item.url item.url = 'https://api.eshangtech.com' + item.url
}) })
} }

View File

@ -59,7 +59,7 @@ const errorHandler = (error: { response: Response }): Response => {
const request = extend({ const request = extend({
errorHandler, // default error handling errorHandler, // default error handling
// prefix: '/EShangApiMain',// 开发 // prefix: '/EShangApiMain',// 开发
prefix: 'https://eshangtech.com:18900/EShangApiMain', // 正式 prefix: 'https://api.eshangtech.com/EShangApiMain', // 正式
headers: { headers: {
token: '', token: '',
ProvinceCode: '', ProvinceCode: '',
@ -189,7 +189,7 @@ request.interceptors.response.use((response, option) => {
// USER_ID: userbeHaviObj.currentUser.ID, // USER_ID: userbeHaviObj.currentUser.ID,
// USER_NAME: userbeHaviObj.currentUser.Name, // USER_NAME: userbeHaviObj.currentUser.Name,
// BEHAVIORRECORD_TYPE: "2000", // 1000 浏览页面 2000 行为记录 // BEHAVIORRECORD_TYPE: "2000", // 1000 浏览页面 2000 行为记录
// BEHAVIORRECORD_EXPLAIN: `在页面${nowMenu.name}调用接口${userbeHaviObj.url.split('https://eshangtech.com:18900')[1]}`, // BEHAVIORRECORD_EXPLAIN: `在页面${nowMenu.name}调用接口${userbeHaviObj.url.split('https://api.eshangtech.com')[1]}`,
// BEHAVIORRECORD_TIME: moment(new Date(userbeHaviObj.startTime)).format('YYYY-MM-DD HH:mm:ss'), // BEHAVIORRECORD_TIME: moment(new Date(userbeHaviObj.startTime)).format('YYYY-MM-DD HH:mm:ss'),
// BEHAVIORRECORD_ROUT: nowMenu.pathname, // BEHAVIORRECORD_ROUT: nowMenu.pathname,
// BEHAVIORRECORD_ROUTNAME: nowMenu.name, // BEHAVIORRECORD_ROUTNAME: nowMenu.name,
@ -207,7 +207,7 @@ request.interceptors.response.use((response, option) => {
// OPERATING_SYSTEM: systemBasin // OPERATING_SYSTEM: systemBasin
// } // }
// console.log('reqreqreqreqreq', req); // console.log('reqreqreqreqreq', req);
// // fetch('https://eshangtech.com:18900/EShangApiMain/Platform/SynchroBEHAVIORRECORD', { // // fetch('https://api.eshangtech.com/EShangApiMain/Platform/SynchroBEHAVIORRECORD', {
// // method: 'POST', // // method: 'POST',
// // headers: { // // headers: {
// // 'Content-Type': 'application/json', // // 'Content-Type': 'application/json',

View File

@ -189,7 +189,7 @@ request.interceptors.response.use((response, option) => {
// USER_ID: userbeHaviObj.currentUser.ID, // USER_ID: userbeHaviObj.currentUser.ID,
// USER_NAME: userbeHaviObj.currentUser.Name, // USER_NAME: userbeHaviObj.currentUser.Name,
// BEHAVIORRECORD_TYPE: "2000", // 1000 浏览页面 2000 行为记录 // BEHAVIORRECORD_TYPE: "2000", // 1000 浏览页面 2000 行为记录
// BEHAVIORRECORD_EXPLAIN: `在页面${nowMenu.name}调用接口${userbeHaviObj.url.split('https://eshangtech.com:18900')[1]}`, // BEHAVIORRECORD_EXPLAIN: `在页面${nowMenu.name}调用接口${userbeHaviObj.url.split('https://api.eshangtech.com')[1]}`,
// BEHAVIORRECORD_TIME: moment(new Date(userbeHaviObj.startTime)).format('YYYY-MM-DD HH:mm:ss'), // BEHAVIORRECORD_TIME: moment(new Date(userbeHaviObj.startTime)).format('YYYY-MM-DD HH:mm:ss'),
// BEHAVIORRECORD_ROUT: nowMenu.pathname, // BEHAVIORRECORD_ROUT: nowMenu.pathname,
// BEHAVIORRECORD_ROUTNAME: nowMenu.name, // BEHAVIORRECORD_ROUTNAME: nowMenu.name,
@ -207,7 +207,7 @@ request.interceptors.response.use((response, option) => {
// OPERATING_SYSTEM: systemBasin // OPERATING_SYSTEM: systemBasin
// } // }
// console.log('reqreqreqreqreq', req); // console.log('reqreqreqreqreq', req);
// // fetch('https://eshangtech.com:18900/EShangApiMain/Platform/SynchroBEHAVIORRECORD', { // // fetch('https://api.eshangtech.com/EShangApiMain/Platform/SynchroBEHAVIORRECORD', {
// // method: 'POST', // // method: 'POST',
// // headers: { // // headers: {
// // 'Content-Type': 'application/json', // // 'Content-Type': 'application/json',

View File

@ -57,7 +57,7 @@ const errorHandler = (error: { response: Response }): Response => {
const request = extend({ const request = extend({
errorHandler, // default error handling errorHandler, // default error handling
// prefix: '/EShangApiMain',// 开发 // prefix: '/EShangApiMain',// 开发
prefix: 'https://eshangtech.com:18900/CommercialApi', // 正式 prefix: 'https://api.eshangtech.com/CommercialApi', // 正式
headers: { headers: {
token: '', token: '',
ProvinceCode: '', ProvinceCode: '',

View File

@ -57,7 +57,7 @@ const errorHandler = (error: { response: Response }): Response => {
const request = extend({ const request = extend({
errorHandler, // default error handling errorHandler, // default error handling
// prefix: '/EShangApiMain',// 开发 // prefix: '/EShangApiMain',// 开发
prefix: 'https://eshangtech.com:18900/EshangApiDashboard', // 正式 prefix: 'https://api.eshangtech.com/EshangApiDashboard', // 正式
headers: { headers: {
token: '', token: '',
ProvinceCode: '', ProvinceCode: '',

View File

@ -52,7 +52,7 @@ const errorHandler = (error: { response: Response }): Response => {
const requestEncryption = extend({ const requestEncryption = extend({
errorHandler, // default error handling errorHandler, // default error handling
// prefix: '/EShangApiMain',// 开发 // prefix: '/EShangApiMain',// 开发
prefix: 'https://eshangtech.com:18900/MemberApi', // 正式 prefix: 'https://api.eshangtech.com/MemberApi', // 正式
headers: { headers: {
token: '', token: '',
ProvinceCode: '', ProvinceCode: '',

View File

@ -183,7 +183,7 @@ request.interceptors.response.use((response, option) => {
// USER_ID: userbeHaviObj.currentUser.ID, // USER_ID: userbeHaviObj.currentUser.ID,
// USER_NAME: userbeHaviObj.currentUser.Name, // USER_NAME: userbeHaviObj.currentUser.Name,
// BEHAVIORRECORD_TYPE: "2000", // 1000 浏览页面 2000 行为记录 // BEHAVIORRECORD_TYPE: "2000", // 1000 浏览页面 2000 行为记录
// BEHAVIORRECORD_EXPLAIN: `在页面${nowMenu.name}调用接口${userbeHaviObj.url.split('https://eshangtech.com:18900')[1]}`, // BEHAVIORRECORD_EXPLAIN: `在页面${nowMenu.name}调用接口${userbeHaviObj.url.split('https://api.eshangtech.com')[1]}`,
// BEHAVIORRECORD_TIME: moment(new Date(userbeHaviObj.startTime)).format('YYYY-MM-DD HH:mm:ss'), // BEHAVIORRECORD_TIME: moment(new Date(userbeHaviObj.startTime)).format('YYYY-MM-DD HH:mm:ss'),
// BEHAVIORRECORD_ROUT: nowMenu.pathname, // BEHAVIORRECORD_ROUT: nowMenu.pathname,
// BEHAVIORRECORD_ROUTNAME: nowMenu.name, // BEHAVIORRECORD_ROUTNAME: nowMenu.name,
@ -201,7 +201,7 @@ request.interceptors.response.use((response, option) => {
// OPERATING_SYSTEM: systemBasin // OPERATING_SYSTEM: systemBasin
// } // }
// console.log('reqreqreqreqreq', req); // console.log('reqreqreqreqreq', req);
// // fetch('https://eshangtech.com:18900/EShangApiMain/Platform/SynchroBEHAVIORRECORD', { // // fetch('https://api.eshangtech.com/EShangApiMain/Platform/SynchroBEHAVIORRECORD', {
// // method: 'POST', // // method: 'POST',
// // headers: { // // headers: {
// // 'Content-Type': 'application/json', // // 'Content-Type': 'application/json',

View File

@ -183,7 +183,7 @@ request.interceptors.response.use((response, option) => {
// USER_ID: userbeHaviObj.currentUser.ID, // USER_ID: userbeHaviObj.currentUser.ID,
// USER_NAME: userbeHaviObj.currentUser.Name, // USER_NAME: userbeHaviObj.currentUser.Name,
// BEHAVIORRECORD_TYPE: "2000", // 1000 浏览页面 2000 行为记录 // BEHAVIORRECORD_TYPE: "2000", // 1000 浏览页面 2000 行为记录
// BEHAVIORRECORD_EXPLAIN: `在页面${nowMenu.name}调用接口${userbeHaviObj.url.split('https://eshangtech.com:18900')[1]}`, // BEHAVIORRECORD_EXPLAIN: `在页面${nowMenu.name}调用接口${userbeHaviObj.url.split('https://api.eshangtech.com')[1]}`,
// BEHAVIORRECORD_TIME: moment(new Date(userbeHaviObj.startTime)).format('YYYY-MM-DD HH:mm:ss'), // BEHAVIORRECORD_TIME: moment(new Date(userbeHaviObj.startTime)).format('YYYY-MM-DD HH:mm:ss'),
// BEHAVIORRECORD_ROUT: nowMenu.pathname, // BEHAVIORRECORD_ROUT: nowMenu.pathname,
// BEHAVIORRECORD_ROUTNAME: nowMenu.name, // BEHAVIORRECORD_ROUTNAME: nowMenu.name,
@ -201,7 +201,7 @@ request.interceptors.response.use((response, option) => {
// OPERATING_SYSTEM: systemBasin // OPERATING_SYSTEM: systemBasin
// } // }
// console.log('reqreqreqreqreq', req); // console.log('reqreqreqreqreq', req);
// // fetch('https://eshangtech.com:18900/EShangApiMain/Platform/SynchroBEHAVIORRECORD', { // // fetch('https://api.eshangtech.com/EShangApiMain/Platform/SynchroBEHAVIORRECORD', {
// // method: 'POST', // // method: 'POST',
// // headers: { // // headers: {
// // 'Content-Type': 'application/json', // // 'Content-Type': 'application/json',

View File

@ -59,9 +59,9 @@ const requestTest = extend({
// prefix: '/EShangApiMain',// 开发 // prefix: '/EShangApiMain',// 开发
// 'http://192.168.56.1/EShangApiMain' // 'http://192.168.56.1/EShangApiMain'
// "https://eshangtech.com:18900/EShangApiMain" // 正式 // "https://api.eshangtech.com/EShangApiMain" // 正式
// "http://192.168.56.1/EShangApiMain" // "http://192.168.56.1/EShangApiMain"
prefix: "https://eshangtech.com:18900/EShangApiMain", // 正式 prefix: "https://api.eshangtech.com/EShangApiMain", // 正式
// prefix: "http://10.104.1.186:8080", // 正式 // prefix: "http://10.104.1.186:8080", // 正式
headers: { headers: {
token: '', token: '',

View File

@ -57,7 +57,7 @@ const errorHandler = (error: { response: Response }): Response => {
const request = extend({ const request = extend({
errorHandler, // default error handling errorHandler, // default error handling
// prefix: '/EShangApiMain',// 开发 // prefix: '/EShangApiMain',// 开发
prefix: 'https://eshangtech.com:18900/', // 正式 prefix: 'https://api.eshangtech.com/', // 正式
headers: { headers: {
token: '', token: '',
ProvinceCode: '', ProvinceCode: '',

View File

@ -1,4 +1,4 @@
// 由 scripts/writeVersion.js 自动生成 // 由 scripts/writeVersion.js 自动生成
export const VERSION = "4.5.75"; export const VERSION = "4.5.71";
export const GIT_HASH = "4b17ea4"; export const GIT_HASH = "51b2e91";
export const BUILD_TIME = "2025-12-05T03:57:31.975Z"; export const BUILD_TIME = "2025-11-26T02:50:02.357Z";