diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js index 48fcfc0..19fe461 100644 --- a/src/components/Common/CommonBillEvent.js +++ b/src/components/Common/CommonBillEvent.js @@ -4489,9 +4489,9 @@ export default (ChildComponent) => { ListData.push(masterData); const param = JSON.stringify(ListData); if (eKey.indexOf('BtnPrint.') > -1) { - urlPrint = `${commonConfig.server_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; + urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; } else if (eKey.indexOf('BtnPrintCus.') > -1) { - urlPrint = `${commonConfig.server_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; + urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; } /* Get提交地址栏参数过多,更改Get提交为Post提交 */ this.handleOpenPost(urlPrint, param); @@ -4521,9 +4521,9 @@ export default (ChildComponent) => { if (bisMutiSelect === false || bisMutiSelect === undefined) { controlSelectedRowKeys = []; } - urlPrint = `${commonConfig.server_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&sControlIds=${commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlSelectedRowKeys : []}`; + urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&sControlIds=${commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlSelectedRowKeys : []}`; } else if (eKey.indexOf('BtnPrintCus.') > -1) { - urlPrint = `${commonConfig.server_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`; + urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`; } if (formRoute !== '/indexPage/printlabel') { window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`); @@ -5381,7 +5381,7 @@ export default (ChildComponent) => { } } if (commonUtils.isNotEmptyObject(sCustomerId)) { - url = `${commonConfig.server_host}printReport/getReportByCustomerId/${sCustomerId}?sModelsId=${sModelsId}`; + url = `${commonConfig.file_host}printReport/getReportByCustomerId/${sCustomerId}?sModelsId=${sModelsId}`; const values = {}; const masterReturn = (await commonServices.postValueService(token, values, url)).data; if (masterReturn.code === 1) { @@ -5400,7 +5400,7 @@ export default (ChildComponent) => { } } if (commonUtils.isNotEmptyObject(sProcessId)) { - url = `${commonConfig.server_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`; + url = `${commonConfig.file_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`; const values = {}; const masterReturn = (await commonServices.postValueService(token, values, url)).data; if (masterReturn.code === 1) { @@ -6856,7 +6856,7 @@ export default (ChildComponent) => { } /* 调用POST接口拿到PDF地址 */ - const dataUrl = `${commonConfig.server_host}printReport/printPreviewPdf/${sActiveId}/${printReportName}.pdf?${false ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`; + const dataUrl = `${commonConfig.file_host}printReport/printPreviewPdf/${sActiveId}/${printReportName}.pdf?${false ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`; const value = { queryFilter: queryFilterJson, }; @@ -6864,7 +6864,7 @@ export default (ChildComponent) => { if (dataReturn.code === 1) { const url = dataReturn.dataset.rows[0]; if (commonUtils.isNotEmptyObject(url)) { - const previewUrl = `${commonConfig.server_host}file/downloadPreviewPdf?savePathStr=${url}`; + const previewUrl = `${commonConfig.file_host}file/downloadPreviewPdf?savePathStr=${url}`; if (isWait) { console.log('previewUrl', previewUrl); return previewUrl; @@ -6915,9 +6915,9 @@ export default (ChildComponent) => { ListData.push(masterData); const param = JSON.stringify(ListData); if (eKey.indexOf('BtnPrint.') > -1) { - urlPrint = `${commonConfig.server_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; + urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; } else if (eKey.indexOf('BtnPrintCus.') > -1) { - urlPrint = `${commonConfig.server_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; + urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; } /* Get提交地址栏参数过多,更改Get提交为Post提交 */ this.handleOpenPost(urlPrint, param); @@ -6947,13 +6947,13 @@ export default (ChildComponent) => { if (bisMutiSelect === false || bisMutiSelect === undefined) { controlSelectedRowKeys = []; } - urlPrint = `${commonConfig.server_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&sControlIds=${commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlSelectedRowKeys : []}`; + urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&sControlIds=${commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlSelectedRowKeys : []}`; } else if (eKey.indexOf('BtnPrintCus.') > -1) { - urlPrint = `${commonConfig.server_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`; + urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`; } if (formRoute !== '/indexPage/printlabel') { /* 调用POST接口拿到PDF地址 */ - const dataUrl = `${commonConfig.server_host}printReport/printPreviewPdf/${sActiveId}/${printReportName}.pdf?${false ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`; + const dataUrl = `${commonConfig.file_host}printReport/printPreviewPdf/${sActiveId}/${printReportName}.pdf?${false ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`; const value = { queryFilter: queryFilterJson, }; @@ -6961,7 +6961,7 @@ export default (ChildComponent) => { if (dataReturn.code === 1) { const url = dataReturn.dataset.rows[0]; if (commonUtils.isNotEmptyObject(url)) { - const previewUrl = `${commonConfig.server_host}file/downloadPreviewPdf?savePathStr=${url}`; + const previewUrl = `${commonConfig.file_host}file/downloadPreviewPdf?savePathStr=${url}`; console.log('previewUrl:', previewUrl); if (true) { this.handleOpenPrintTab(previewUrl); diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js index c569952..58b4ff1 100644 --- a/src/components/Common/CommonComponent/index.js +++ b/src/components/Common/CommonComponent/index.js @@ -947,7 +947,7 @@ export default class CommonComponent extends Component { return { listType: 'picture-card', className: 'avatar-uploader', - action: `${commonConfig.server_host}file/upload?sModelsId=${formId}&token=${token}&sUploadType=model`, + action: `${commonConfig.file_host}file/upload?sModelsId=${formId}&token=${token}&sUploadType=model`, disabled: !enabled || false, onChange: (info) => { const { file } = info; @@ -966,7 +966,7 @@ export default class CommonComponent extends Component { // 获取上传组件内容 getUploadContents = () => { const fileName = commonUtils.isUndefined(this.state.dataValue) ? '' : commonUtils.strUndefinedToEmpty(this.state.dataValue); - const imageUrl = `${commonConfig.server_host}file/download?savePathStr=${fileName}&sModelsId=100&token=${this.props.token}`; + const imageUrl = `${commonConfig.file_host}file/download?savePathStr=${fileName}&sModelsId=100&token=${this.props.token}`; return fileName ? ( { } async componentWillReceiveProps(nextProps) { - + const { app, formData, currentId, searchSolution, masterData, sGroupByList, formRoute, sModelsType, } = nextProps; let { slaveConfig: slaveConfigOld } = nextProps; // nextProps.onSaveState({ realizeHeight: nextProps.realizeHeight }); @@ -139,7 +139,7 @@ export default (ChildComponent) => { bFilterValue: app.sMachineNameSId, }); const pageNum = 1; - + addState = (await this.props.handleGetDataSet({ name: 'slave', configData: slaveConfig, @@ -344,7 +344,7 @@ export default (ChildComponent) => { if (commonUtils.isNotEmptyNumber(formData[0].iPageSize) && formData[0].iPageSize !== 0) { iPageSize = formData[0].iPageSize; } - + await this.handleGetData(slaveConfig, filterCondition, 1, commonUtils.isNotEmptyNumber(iPageSize) && iPageSize !== 0 ? iPageSize : commonConfig.pageSize, '', false, sGroupByList); slaveInfoConfig = formData[1]; slaveInfoColumn = {}; @@ -422,7 +422,7 @@ export default (ChildComponent) => { }); } else if (JSON.stringify(app.currentPane.conditonValues) !== JSON.stringify(this.props.app.currentPane.conditonValues)) { const { slaveConfig, slaveFilterCondition } = nextProps; - + this.handleGetData(slaveConfig, slaveFilterCondition, 1, commonUtils.isNotEmptyNumber(iPageSize) && iPageSize !== 0 ? iPageSize : commonConfig.pageSize, undefined, undefined, undefined, nextProps); } else if (JSON.stringify(nextProps.id) !== JSON.stringify(this.props.id)) { this.props.onSaveState({ slaveSelectedRowKeys: [] }); @@ -442,7 +442,7 @@ export default (ChildComponent) => { const slaveConfig = formData.filter(item => item.bGrd && item.sTbName === 'elemachine')[0]; const slaveColumn = commonFunc.getHeaderConfig(slaveConfig); - + this.handleGetData(slaveConfig, undefined, undefined, undefined, undefined, undefined, undefined, nextProps); this.props.onSaveState({ masterConfig: currConfig, masterData, slaveConfig, slaveColumn, enabled: true, pageLoading: false, @@ -452,10 +452,10 @@ export default (ChildComponent) => { if (this.props.pageNum >= Math.ceil(slavePagination.total / slavePagination.pageSize)) { this.props.onToFirst(); } else if (commonUtils.isNotEmptyArr(treeFilterCondition)) { /* 判断是否有树过滤条件 */ - + this.handleGetData(slaveConfig, slaveFilterCondition, nextProps.pageNum, slavePagination.pageSize, slaveOrderBy, '', sGroupByList, '', treeFilterCondition); } else { - + this.handleGetData(slaveConfig, slaveFilterCondition, nextProps.pageNum, slavePagination.pageSize, slaveOrderBy, '', sGroupByList); } } @@ -693,7 +693,7 @@ export default (ChildComponent) => { if (formRoute === '/indexPage/materialRequirementsPlanning' && clearSelectData) { const { slaveFilterCondition, slaveInfoConfig } = this.props; if (commonUtils.isNotEmptyObject(slaveInfoConfig)) { - + this.handleGetDataInfo(slaveInfoConfig, slaveFilterCondition, 1); } } @@ -2044,7 +2044,7 @@ export default (ChildComponent) => { printReportName = reportData[iIndex].sReportName; } } - const urlPrint = `${commonConfig.server_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}queryFilter=${queryFilterJson}&sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&token=${encodeURIComponent(token)}&sName=${formRoute}`; + const urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}queryFilter=${queryFilterJson}&sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&token=${encodeURIComponent(token)}&sName=${formRoute}`; window.open(urlPrint); } else if (key.indexOf('BtnPrintCus.') > -1) { if (commonUtils.isNotEmptyArr(menuChildData)) { @@ -2057,7 +2057,7 @@ export default (ChildComponent) => { // window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`); /* Get提交地址栏参数过多,更改Get提交为Post提交 */ - const url = `${commonConfig.server_host}printReport/printPdf/${printReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&printType=noquery&token=${encodeURIComponent(token)}`; + const url = `${commonConfig.file_host}printReport/printPdf/${printReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&printType=noquery&token=${encodeURIComponent(token)}`; const param = slaveOneData; this.handleOpenPost(url, param); } @@ -2249,7 +2249,7 @@ export default (ChildComponent) => { } } if (commonUtils.isNotEmptyObject(sProcessId)) { - url = `${commonConfig.server_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`; + url = `${commonConfig.file_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`; const values = {}; const masterReturn = (await commonServices.postValueService(token, values, url)).data; if (masterReturn.code === 1) { diff --git a/src/components/Common/CommonListTabEvent.js b/src/components/Common/CommonListTabEvent.js index 3df57be..94ecf41 100644 --- a/src/components/Common/CommonListTabEvent.js +++ b/src/components/Common/CommonListTabEvent.js @@ -1262,7 +1262,7 @@ export default (ChildComponent) => { conditionValues = this.props.getSqlCondition(slaveConfig, tableType, record); } else if(commonUtils.isNotEmptyObject(currentPane) && !commonUtils.isEmpty(currentPane.conditonValues)) { conditionValues = currentPane.conditonValues; - } + } /* 导出使用Post提交 */ const url = `${commonConfig.server_host}excel/export/${slaveConfig.sId}?sModelsId=${slaveConfig.sParentId}&sName=${formRoute}&token=${encodeURIComponent(this.props.app.token)}`; @@ -2065,7 +2065,7 @@ export default (ChildComponent) => { printReportName = reportData[iIndex].sReportName; } } - const urlPrint = `${commonConfig.server_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}queryFilter=${queryFilterJson}&sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&token=${encodeURIComponent(token)}&sName=${formRoute}`; + const urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}queryFilter=${queryFilterJson}&sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&token=${encodeURIComponent(token)}&sName=${formRoute}`; window.open(urlPrint); } else if (key.indexOf('BtnPrintCus.') > -1) { if (commonUtils.isNotEmptyArr(menuChildData)) { @@ -2078,7 +2078,7 @@ export default (ChildComponent) => { // window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`); /* Get提交地址栏参数过多,更改Get提交为Post提交 */ - const url = `${commonConfig.server_host}printReport/printPdf/${printReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&printType=noquery&token=${encodeURIComponent(token)}`; + const url = `${commonConfig.file_host}printReport/printPdf/${printReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&printType=noquery&token=${encodeURIComponent(token)}`; const param = slaveOneData; this.handleOpenPost(url, param); } @@ -2271,7 +2271,7 @@ export default (ChildComponent) => { } } if (commonUtils.isNotEmptyObject(sProcessId)) { - url = `${commonConfig.server_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`; + url = `${commonConfig.file_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`; const values = {}; const masterReturn = (await commonServices.postValueService(token, values, url)).data; if (masterReturn.code === 1) { diff --git a/src/components/Common/CommonListTreeEvent.js b/src/components/Common/CommonListTreeEvent.js index 3f8d685..7786780 100644 --- a/src/components/Common/CommonListTreeEvent.js +++ b/src/components/Common/CommonListTreeEvent.js @@ -1446,7 +1446,7 @@ export default (ChildComponent) => { printReportName = reportData[iIndex].sReportName; } } - const urlPrint = `${commonConfig.server_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}queryFilter=${queryFilterJson}&sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&token=${encodeURIComponent(token)}&sName=${formRoute}`; + const urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}queryFilter=${queryFilterJson}&sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&token=${encodeURIComponent(token)}&sName=${formRoute}`; window.open(urlPrint); } else if (key.indexOf('BtnPrintCus.') > -1) { if (commonUtils.isNotEmptyArr(menuChildData)) { @@ -1459,7 +1459,7 @@ export default (ChildComponent) => { // window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`); /* Get提交地址栏参数过多,更改Get提交为Post提交 */ - const url = `${commonConfig.server_host}printReport/printPdf/${printReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&printType=noquery&token=${encodeURIComponent(token)}`; + const url = `${commonConfig.file_host}printReport/printPdf/${printReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&printType=noquery&token=${encodeURIComponent(token)}`; const param = slaveOneData; this.handleOpenPost(url, param); } @@ -1650,7 +1650,7 @@ export default (ChildComponent) => { } } if (commonUtils.isNotEmptyObject(sProcessId)) { - url = `${commonConfig.server_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`; + url = `${commonConfig.file_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`; const values = {}; const masterReturn = (await commonServices.postValueService(token, values, url)).data; if (masterReturn.code === 1) { diff --git a/src/components/Common/CommonSubBillEvent.js b/src/components/Common/CommonSubBillEvent.js index 0eef840..388c6da 100644 --- a/src/components/Common/CommonSubBillEvent.js +++ b/src/components/Common/CommonSubBillEvent.js @@ -4235,9 +4235,9 @@ export default (ChildComponent) => { ListData.push(masterData); const param = JSON.stringify(ListData); if (eKey.indexOf('BtnPrint.') > -1) { - urlPrint = `${commonConfig.server_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; + urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; } else if (eKey.indexOf('BtnPrintCus.') > -1) { - urlPrint = `${commonConfig.server_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; + urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; } /* Get提交地址栏参数过多,更改Get提交为Post提交 */ this.handleOpenPost(urlPrint, param); @@ -4267,9 +4267,9 @@ export default (ChildComponent) => { if (bisMutiSelect === false || bisMutiSelect === undefined) { controlSelectedRowKeys = []; } - urlPrint = `${commonConfig.server_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&sControlIds=${commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlSelectedRowKeys : []}`; + urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&sControlIds=${commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlSelectedRowKeys : []}`; } else if (eKey.indexOf('BtnPrintCus.') > -1) { - urlPrint = `${commonConfig.server_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`; + urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`; } if (formRoute !== '/indexPage/printlabel') { window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`); @@ -4880,7 +4880,7 @@ export default (ChildComponent) => { } } if (commonUtils.isNotEmptyObject(sCustomerId)) { - url = `${commonConfig.server_host}printReport/getReportByCustomerId/${sCustomerId}?sModelsId=${sModelsId}`; + url = `${commonConfig.file_host}printReport/getReportByCustomerId/${sCustomerId}?sModelsId=${sModelsId}`; const values = {}; const masterReturn = (await commonServices.postValueService(token, values, url)).data; if (masterReturn.code === 1) { @@ -4899,7 +4899,7 @@ export default (ChildComponent) => { } } if (commonUtils.isNotEmptyObject(sProcessId)) { - url = `${commonConfig.server_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`; + url = `${commonConfig.file_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`; const values = {}; const masterReturn = (await commonServices.postValueService(token, values, url)).data; if (masterReturn.code === 1) { diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index b7039ff..9c2f487 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -8531,7 +8531,7 @@ class CommonTableRc extends React.Component { if (commonUtils.isNotEmptyObject(picAddr)) { const { token } = props.app; const dataUrl = picAddr[0].includes("xlyerpfiles") - ? `${commonConfig.server_host}file/download?savePathStr=${ + ? `${commonConfig.file_host}file/download?savePathStr=${ picAddr[0] }&scale=0.1&sModelsId=100&token=${token}` : picAddr[0]; /* 缩略图 */ diff --git a/src/components/Common/CommonView/index.js b/src/components/Common/CommonView/index.js index a375a7b..349093c 100644 --- a/src/components/Common/CommonView/index.js +++ b/src/components/Common/CommonView/index.js @@ -118,7 +118,7 @@ export default class CommonView extends Component { const { token } = this.props.app; const previewImageArr = []; dataUrlArr.forEach((item) => { - const dataPreviewUrl = `${commonConfig.server_host}file/download?savePathStr=${item}&width=800&&height=500&sModelsId=100&token=${token}`; /* 预览 */ + const dataPreviewUrl = `${commonConfig.file_host}file/download?savePathStr=${item}&width=800&&height=500&sModelsId=100&token=${token}`; /* 预览 */ previewImageArr.push(dataPreviewUrl); }); this.setState({ diff --git a/src/mes/scheduledTasks/boxTypeDetail/boxTypeDetail.js b/src/mes/scheduledTasks/boxTypeDetail/boxTypeDetail.js index 0ea378a..38566ba 100644 --- a/src/mes/scheduledTasks/boxTypeDetail/boxTypeDetail.js +++ b/src/mes/scheduledTasks/boxTypeDetail/boxTypeDetail.js @@ -26,7 +26,7 @@ const removeExtension = (filename) => { const getImageUrl = (sName) => { console.log('getImageUrl', sName); - return `${commonConfig.server_host}file/downloadPrice?sLogoName=${sName}&date=${new Date().getTime()}`; + return `${commonConfig.file_host}file/downloadPrice?sLogoName=${sName}&date=${new Date().getTime()}`; }; const CuttingComponent = (props) => { diff --git a/src/oee/common/oeeCurrentState.js b/src/oee/common/oeeCurrentState.js index 6b74074..4ce60b7 100644 --- a/src/oee/common/oeeCurrentState.js +++ b/src/oee/common/oeeCurrentState.js @@ -451,7 +451,7 @@ class OeeCurrentState extends Component { const { token } = app; const iIndex = slaveConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'BtnForceComplete' || item.sControlName === 'BtnNoPurchase'); const btnConfig = slaveConfig.gdsconfigformslave[iIndex]; - // + // const { sRelation } = btnConfig; let selectedRowKeys = ''; @@ -624,7 +624,7 @@ const CommonOeeReportComponent = Form.create({ // eslint-disable-next-line jsx-a11y/anchor-is-valid,react/no-array-index-key onBtnClick(item)}> {item.showName} diff --git a/src/oee/common/oeeLabelPrint.js b/src/oee/common/oeeLabelPrint.js index 47b41da..ff83bb6 100644 --- a/src/oee/common/oeeLabelPrint.js +++ b/src/oee/common/oeeLabelPrint.js @@ -101,7 +101,7 @@ class PrintOeeLabel extends Component { : {}; if (name === "view") { /* 打印预览 */ - urlPrint = `${commonConfig.server_host}printReport/printPdfOee?${ + urlPrint = `${commonConfig.file_host}printReport/printPdfOee?${ false ? "fileType=.xlsx&" : "" }printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent( token @@ -116,7 +116,7 @@ class PrintOeeLabel extends Component { sReportParam: printReportName }; const dataUrl = `${ - commonConfig.server_host + commonConfig.file_host }printReport/printPdfOeeOnline?sModelsId=${sModelsId}&sName=${formRoute}`; const dataReturn = (await commonServices.postValueService( token, diff --git a/src/utils/config.js b/src/utils/config.js index f01d69f..6d066fb 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -4,7 +4,7 @@ const bHttps = location.protocol === 'https:' ; export const webSite = { // ipAddress: '//t0.xlyprint.com:8000/xlyEntry/', /* 服务器地址 */ // faceAddress: isDev ? '//192.168.11.22:8080/xlyFace' : '//' + location.host + '/xlyFace', - fileAddress: isDev ? '//bmj_np.ruijieddnsa.com:3543/xlyEntry/' : '//' + '172.19.18.21:9181' + '/xlyEntry/', // 接口地址 + fileAddress: isDev ? '//bmj_np.ruijieddnsa.com:3543/xlyEntry/' : '//' + location.host + '/xlyReport/', // 接口地址 faceAddress: isDev ? '//bmj_np.ruijieddnsa.com:3543/xlyFace' : '//' + location.host + '/xlyFace', ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//bmj_np.ruijieddnsa.com:3543/xlyEntry/' : '//' + location.host + '/xlyEntry/', interfaceAddress: isDev ? '//bmj_np.ruijieddnsa.com:3543/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址1