Commit da726c8f83a48dac339818f3c76a833b0d89d8fe

Authored by qmj
1 parent d200fd5f

11

src/components/Common/CommonBillEvent.js
@@ -4489,9 +4489,9 @@ export default (ChildComponent) => { @@ -4489,9 +4489,9 @@ export default (ChildComponent) => {
4489 ListData.push(masterData); 4489 ListData.push(masterData);
4490 const param = JSON.stringify(ListData); 4490 const param = JSON.stringify(ListData);
4491 if (eKey.indexOf('BtnPrint.') > -1) { 4491 if (eKey.indexOf('BtnPrint.') > -1) {
4492 - urlPrint = `${commonConfig.server_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; 4492 + urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`;
4493 } else if (eKey.indexOf('BtnPrintCus.') > -1) { 4493 } else if (eKey.indexOf('BtnPrintCus.') > -1) {
4494 - urlPrint = `${commonConfig.server_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; 4494 + urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`;
4495 } 4495 }
4496 /* Get提交地址栏参数过多,更改Get提交为Post提交 */ 4496 /* Get提交地址栏参数过多,更改Get提交为Post提交 */
4497 this.handleOpenPost(urlPrint, param); 4497 this.handleOpenPost(urlPrint, param);
@@ -4521,9 +4521,9 @@ export default (ChildComponent) => { @@ -4521,9 +4521,9 @@ export default (ChildComponent) => {
4521 if (bisMutiSelect === false || bisMutiSelect === undefined) { 4521 if (bisMutiSelect === false || bisMutiSelect === undefined) {
4522 controlSelectedRowKeys = []; 4522 controlSelectedRowKeys = [];
4523 } 4523 }
4524 - urlPrint = `${commonConfig.server_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&sControlIds=${commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlSelectedRowKeys : []}`; 4524 + urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&sControlIds=${commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlSelectedRowKeys : []}`;
4525 } else if (eKey.indexOf('BtnPrintCus.') > -1) { 4525 } else if (eKey.indexOf('BtnPrintCus.') > -1) {
4526 - urlPrint = `${commonConfig.server_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`; 4526 + urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`;
4527 } 4527 }
4528 if (formRoute !== '/indexPage/printlabel') { 4528 if (formRoute !== '/indexPage/printlabel') {
4529 window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`); 4529 window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`);
@@ -5381,7 +5381,7 @@ export default (ChildComponent) => { @@ -5381,7 +5381,7 @@ export default (ChildComponent) => {
5381 } 5381 }
5382 } 5382 }
5383 if (commonUtils.isNotEmptyObject(sCustomerId)) { 5383 if (commonUtils.isNotEmptyObject(sCustomerId)) {
5384 - url = `${commonConfig.server_host}printReport/getReportByCustomerId/${sCustomerId}?sModelsId=${sModelsId}`; 5384 + url = `${commonConfig.file_host}printReport/getReportByCustomerId/${sCustomerId}?sModelsId=${sModelsId}`;
5385 const values = {}; 5385 const values = {};
5386 const masterReturn = (await commonServices.postValueService(token, values, url)).data; 5386 const masterReturn = (await commonServices.postValueService(token, values, url)).data;
5387 if (masterReturn.code === 1) { 5387 if (masterReturn.code === 1) {
@@ -5400,7 +5400,7 @@ export default (ChildComponent) => { @@ -5400,7 +5400,7 @@ export default (ChildComponent) => {
5400 } 5400 }
5401 } 5401 }
5402 if (commonUtils.isNotEmptyObject(sProcessId)) { 5402 if (commonUtils.isNotEmptyObject(sProcessId)) {
5403 - url = `${commonConfig.server_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`; 5403 + url = `${commonConfig.file_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`;
5404 const values = {}; 5404 const values = {};
5405 const masterReturn = (await commonServices.postValueService(token, values, url)).data; 5405 const masterReturn = (await commonServices.postValueService(token, values, url)).data;
5406 if (masterReturn.code === 1) { 5406 if (masterReturn.code === 1) {
@@ -6856,7 +6856,7 @@ export default (ChildComponent) => { @@ -6856,7 +6856,7 @@ export default (ChildComponent) => {
6856 } 6856 }
6857 6857
6858 /* 调用POST接口拿到PDF地址 */ 6858 /* 调用POST接口拿到PDF地址 */
6859 - const dataUrl = `${commonConfig.server_host}printReport/printPreviewPdf/${sActiveId}/${printReportName}.pdf?${false ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`; 6859 + const dataUrl = `${commonConfig.file_host}printReport/printPreviewPdf/${sActiveId}/${printReportName}.pdf?${false ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`;
6860 const value = { 6860 const value = {
6861 queryFilter: queryFilterJson, 6861 queryFilter: queryFilterJson,
6862 }; 6862 };
@@ -6864,7 +6864,7 @@ export default (ChildComponent) => { @@ -6864,7 +6864,7 @@ export default (ChildComponent) => {
6864 if (dataReturn.code === 1) { 6864 if (dataReturn.code === 1) {
6865 const url = dataReturn.dataset.rows[0]; 6865 const url = dataReturn.dataset.rows[0];
6866 if (commonUtils.isNotEmptyObject(url)) { 6866 if (commonUtils.isNotEmptyObject(url)) {
6867 - const previewUrl = `${commonConfig.server_host}file/downloadPreviewPdf?savePathStr=${url}`; 6867 + const previewUrl = `${commonConfig.file_host}file/downloadPreviewPdf?savePathStr=${url}`;
6868 if (isWait) { 6868 if (isWait) {
6869 console.log('previewUrl', previewUrl); 6869 console.log('previewUrl', previewUrl);
6870 return previewUrl; 6870 return previewUrl;
@@ -6915,9 +6915,9 @@ export default (ChildComponent) => { @@ -6915,9 +6915,9 @@ export default (ChildComponent) => {
6915 ListData.push(masterData); 6915 ListData.push(masterData);
6916 const param = JSON.stringify(ListData); 6916 const param = JSON.stringify(ListData);
6917 if (eKey.indexOf('BtnPrint.') > -1) { 6917 if (eKey.indexOf('BtnPrint.') > -1) {
6918 - urlPrint = `${commonConfig.server_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; 6918 + urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`;
6919 } else if (eKey.indexOf('BtnPrintCus.') > -1) { 6919 } else if (eKey.indexOf('BtnPrintCus.') > -1) {
6920 - urlPrint = `${commonConfig.server_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; 6920 + urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`;
6921 } 6921 }
6922 /* Get提交地址栏参数过多,更改Get提交为Post提交 */ 6922 /* Get提交地址栏参数过多,更改Get提交为Post提交 */
6923 this.handleOpenPost(urlPrint, param); 6923 this.handleOpenPost(urlPrint, param);
@@ -6947,13 +6947,13 @@ export default (ChildComponent) => { @@ -6947,13 +6947,13 @@ export default (ChildComponent) => {
6947 if (bisMutiSelect === false || bisMutiSelect === undefined) { 6947 if (bisMutiSelect === false || bisMutiSelect === undefined) {
6948 controlSelectedRowKeys = []; 6948 controlSelectedRowKeys = [];
6949 } 6949 }
6950 - urlPrint = `${commonConfig.server_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&sControlIds=${commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlSelectedRowKeys : []}`; 6950 + urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&sControlIds=${commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlSelectedRowKeys : []}`;
6951 } else if (eKey.indexOf('BtnPrintCus.') > -1) { 6951 } else if (eKey.indexOf('BtnPrintCus.') > -1) {
6952 - urlPrint = `${commonConfig.server_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`; 6952 + urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`;
6953 } 6953 }
6954 if (formRoute !== '/indexPage/printlabel') { 6954 if (formRoute !== '/indexPage/printlabel') {
6955 /* 调用POST接口拿到PDF地址 */ 6955 /* 调用POST接口拿到PDF地址 */
6956 - const dataUrl = `${commonConfig.server_host}printReport/printPreviewPdf/${sActiveId}/${printReportName}.pdf?${false ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`; 6956 + const dataUrl = `${commonConfig.file_host}printReport/printPreviewPdf/${sActiveId}/${printReportName}.pdf?${false ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`;
6957 const value = { 6957 const value = {
6958 queryFilter: queryFilterJson, 6958 queryFilter: queryFilterJson,
6959 }; 6959 };
@@ -6961,7 +6961,7 @@ export default (ChildComponent) => { @@ -6961,7 +6961,7 @@ export default (ChildComponent) => {
6961 if (dataReturn.code === 1) { 6961 if (dataReturn.code === 1) {
6962 const url = dataReturn.dataset.rows[0]; 6962 const url = dataReturn.dataset.rows[0];
6963 if (commonUtils.isNotEmptyObject(url)) { 6963 if (commonUtils.isNotEmptyObject(url)) {
6964 - const previewUrl = `${commonConfig.server_host}file/downloadPreviewPdf?savePathStr=${url}`; 6964 + const previewUrl = `${commonConfig.file_host}file/downloadPreviewPdf?savePathStr=${url}`;
6965 console.log('previewUrl:', previewUrl); 6965 console.log('previewUrl:', previewUrl);
6966 if (true) { 6966 if (true) {
6967 this.handleOpenPrintTab(previewUrl); 6967 this.handleOpenPrintTab(previewUrl);
src/components/Common/CommonComponent/index.js
@@ -947,7 +947,7 @@ export default class CommonComponent extends Component { @@ -947,7 +947,7 @@ export default class CommonComponent extends Component {
947 return { 947 return {
948 listType: 'picture-card', 948 listType: 'picture-card',
949 className: 'avatar-uploader', 949 className: 'avatar-uploader',
950 - action: `${commonConfig.server_host}file/upload?sModelsId=${formId}&token=${token}&sUploadType=model`, 950 + action: `${commonConfig.file_host}file/upload?sModelsId=${formId}&token=${token}&sUploadType=model`,
951 disabled: !enabled || false, 951 disabled: !enabled || false,
952 onChange: (info) => { 952 onChange: (info) => {
953 const { file } = info; 953 const { file } = info;
@@ -966,7 +966,7 @@ export default class CommonComponent extends Component { @@ -966,7 +966,7 @@ export default class CommonComponent extends Component {
966 // 获取上传组件内容 966 // 获取上传组件内容
967 getUploadContents = () => { 967 getUploadContents = () => {
968 const fileName = commonUtils.isUndefined(this.state.dataValue) ? '' : commonUtils.strUndefinedToEmpty(this.state.dataValue); 968 const fileName = commonUtils.isUndefined(this.state.dataValue) ? '' : commonUtils.strUndefinedToEmpty(this.state.dataValue);
969 - const imageUrl = `${commonConfig.server_host}file/download?savePathStr=${fileName}&sModelsId=100&token=${this.props.token}`; 969 + const imageUrl = `${commonConfig.file_host}file/download?savePathStr=${fileName}&sModelsId=100&token=${this.props.token}`;
970 return fileName ? 970 return fileName ?
971 (<Image 971 (<Image
972 key={fileName} 972 key={fileName}
@@ -2656,7 +2656,7 @@ export default class CommonComponent extends Component { @@ -2656,7 +2656,7 @@ export default class CommonComponent extends Component {
2656 const { token } = app; 2656 const { token } = app;
2657 const sActiveId = this.props.showConfig.sActiveId === '1' ? commonUtils.isEmpty(record.sFormId) ? record.sSrcFormId : record.sFormId : this.props.showConfig.sActiveId; 2657 const sActiveId = this.props.showConfig.sActiveId === '1' ? commonUtils.isEmpty(record.sFormId) ? record.sSrcFormId : record.sFormId : this.props.showConfig.sActiveId;
2658 const printsId = record[sActiveKey]; 2658 const printsId = record[sActiveKey];
2659 - const urlPrint = `${commonConfig.server_host}printReport/printPdfByFromDataId/${printsId}.pdf?sModelsId=${sActiveId}&sId=${printsId}&token=${encodeURIComponent(token)}`; 2659 + const urlPrint = `${commonConfig.file_host}printReport/printPdfByFromDataId/${printsId}.pdf?sModelsId=${sActiveId}&sId=${printsId}&token=${encodeURIComponent(token)}`;
2660 // const urlPrint = `${commonConfig.server_host}printReport/printPdfByFromDataId?sModelsId=${sActiveId}&sId=${printsId}&token=${encodeURIComponent(token)}`; 2660 // const urlPrint = `${commonConfig.server_host}printReport/printPdfByFromDataId?sModelsId=${sActiveId}&sId=${printsId}&token=${encodeURIComponent(token)}`;
2661 window.open(urlPrint); 2661 window.open(urlPrint);
2662 } else { 2662 } else {
@@ -2981,7 +2981,7 @@ export default class CommonComponent extends Component { @@ -2981,7 +2981,7 @@ export default class CommonComponent extends Component {
2981 const picAddr = commonUtils.isNotEmptyObject(record[sName]) ? record[sName].split(',') : ''; 2981 const picAddr = commonUtils.isNotEmptyObject(record[sName]) ? record[sName].split(',') : '';
2982 if (commonUtils.isNotEmptyObject(picAddr)) { 2982 if (commonUtils.isNotEmptyObject(picAddr)) {
2983 const { token } = this.props.app; 2983 const { token } = this.props.app;
2984 - const dataUrl = picAddr[0].includes('xlyerpfiles') ? `${commonConfig.server_host}file/download?savePathStr=${picAddr[0]}&scale=0.1&sModelsId=100&token=${token}` : picAddr[0]; /* 缩略图 */ 2984 + const dataUrl = picAddr[0].includes('xlyerpfiles') ? `${commonConfig.file_host}file/download?savePathStr=${picAddr[0]}&scale=0.1&sModelsId=100&token=${token}` : picAddr[0]; /* 缩略图 */
2985 // const dataPriviewUrl = `${commonConfig.server_host}file/download?savePathStr=${picAddr}&width=800&&height=500&sModelsId=100&token=${token}`; /* 预览 */ 2985 // const dataPriviewUrl = `${commonConfig.server_host}file/download?savePathStr=${picAddr}&width=800&&height=500&sModelsId=100&token=${token}`; /* 预览 */
2986 const officeFileTypeList = ['PDF', 'DOCX', 'XLSX']; 2986 const officeFileTypeList = ['PDF', 'DOCX', 'XLSX'];
2987 const imgTypeList = ['PNG', 'SVG', 'JPG', 'JPEG', 'GIF', 'BMP', 'TIFF', 'ICO']; 2987 const imgTypeList = ['PNG', 'SVG', 'JPG', 'JPEG', 'GIF', 'BMP', 'TIFF', 'ICO'];
src/components/Common/CommonComponent/index_new.js
@@ -1020,7 +1020,7 @@ function CommonComponent(props) { @@ -1020,7 +1020,7 @@ function CommonComponent(props) {
1020 const { token } = app; 1020 const { token } = app;
1021 const sActiveId = props.showConfig.sActiveId === '1' ? commonUtils.isEmpty(record.sFormId) ? record.sSrcFormId : record.sFormId : props.showConfig.sActiveId; 1021 const sActiveId = props.showConfig.sActiveId === '1' ? commonUtils.isEmpty(record.sFormId) ? record.sSrcFormId : record.sFormId : props.showConfig.sActiveId;
1022 const printsId = record[sActiveKey]; 1022 const printsId = record[sActiveKey];
1023 - const urlPrint = `${commonConfig.server_host}printReport/printPdfByFromDataId?sModelsId=${sActiveId}&sId=${printsId}&token=${encodeURIComponent(token)}`; 1023 + const urlPrint = `${commonConfig.file_host}printReport/printPdfByFromDataId?sModelsId=${sActiveId}&sId=${printsId}&token=${encodeURIComponent(token)}`;
1024 window.open(urlPrint); 1024 window.open(urlPrint);
1025 } else { 1025 } else {
1026 props.onViewClick(props.name, props.showConfig.sName, props.record); 1026 props.onViewClick(props.name, props.showConfig.sName, props.record);
@@ -1158,7 +1158,7 @@ function CommonComponent(props) { @@ -1158,7 +1158,7 @@ function CommonComponent(props) {
1158 const picAddr = commonUtils.isNotEmptyObject(record[sName]) ? record[sName].split(',') : ''; 1158 const picAddr = commonUtils.isNotEmptyObject(record[sName]) ? record[sName].split(',') : '';
1159 if (commonUtils.isNotEmptyObject(picAddr)) { 1159 if (commonUtils.isNotEmptyObject(picAddr)) {
1160 const { token } = props.app; 1160 const { token } = props.app;
1161 - const dataUrl = `${commonConfig.server_host}file/download?savePathStr=${picAddr}&scale=0.1&sModelsId=100&token=${token}`; /* 缩略图 */ 1161 + const dataUrl = `${commonConfig.file_host}file/download?savePathStr=${picAddr}&scale=0.1&sModelsId=100&token=${token}`; /* 缩略图 */
1162 imgBox = ( 1162 imgBox = (
1163 <div 1163 <div
1164 className="sActiveIdStyle" 1164 className="sActiveIdStyle"
src/components/Common/CommonListEvent.js
@@ -49,7 +49,7 @@ export default (ChildComponent) =&gt; { @@ -49,7 +49,7 @@ export default (ChildComponent) =&gt; {
49 } 49 }
50 50
51 async componentWillReceiveProps(nextProps) { 51 async componentWillReceiveProps(nextProps) {
52 - 52 +
53 const { app, formData, currentId, searchSolution, masterData, sGroupByList, formRoute, sModelsType, } = nextProps; 53 const { app, formData, currentId, searchSolution, masterData, sGroupByList, formRoute, sModelsType, } = nextProps;
54 let { slaveConfig: slaveConfigOld } = nextProps; 54 let { slaveConfig: slaveConfigOld } = nextProps;
55 // nextProps.onSaveState({ realizeHeight: nextProps.realizeHeight }); 55 // nextProps.onSaveState({ realizeHeight: nextProps.realizeHeight });
@@ -139,7 +139,7 @@ export default (ChildComponent) =&gt; { @@ -139,7 +139,7 @@ export default (ChildComponent) =&gt; {
139 bFilterValue: app.sMachineNameSId, 139 bFilterValue: app.sMachineNameSId,
140 }); 140 });
141 const pageNum = 1; 141 const pageNum = 1;
142 - 142 +
143 addState = (await this.props.handleGetDataSet({ 143 addState = (await this.props.handleGetDataSet({
144 name: 'slave', 144 name: 'slave',
145 configData: slaveConfig, 145 configData: slaveConfig,
@@ -344,7 +344,7 @@ export default (ChildComponent) =&gt; { @@ -344,7 +344,7 @@ export default (ChildComponent) =&gt; {
344 if (commonUtils.isNotEmptyNumber(formData[0].iPageSize) && formData[0].iPageSize !== 0) { 344 if (commonUtils.isNotEmptyNumber(formData[0].iPageSize) && formData[0].iPageSize !== 0) {
345 iPageSize = formData[0].iPageSize; 345 iPageSize = formData[0].iPageSize;
346 } 346 }
347 - 347 +
348 await this.handleGetData(slaveConfig, filterCondition, 1, commonUtils.isNotEmptyNumber(iPageSize) && iPageSize !== 0 ? iPageSize : commonConfig.pageSize, '', false, sGroupByList); 348 await this.handleGetData(slaveConfig, filterCondition, 1, commonUtils.isNotEmptyNumber(iPageSize) && iPageSize !== 0 ? iPageSize : commonConfig.pageSize, '', false, sGroupByList);
349 slaveInfoConfig = formData[1]; 349 slaveInfoConfig = formData[1];
350 slaveInfoColumn = {}; 350 slaveInfoColumn = {};
@@ -422,7 +422,7 @@ export default (ChildComponent) =&gt; { @@ -422,7 +422,7 @@ export default (ChildComponent) =&gt; {
422 }); 422 });
423 } else if (JSON.stringify(app.currentPane.conditonValues) !== JSON.stringify(this.props.app.currentPane.conditonValues)) { 423 } else if (JSON.stringify(app.currentPane.conditonValues) !== JSON.stringify(this.props.app.currentPane.conditonValues)) {
424 const { slaveConfig, slaveFilterCondition } = nextProps; 424 const { slaveConfig, slaveFilterCondition } = nextProps;
425 - 425 +
426 this.handleGetData(slaveConfig, slaveFilterCondition, 1, commonUtils.isNotEmptyNumber(iPageSize) && iPageSize !== 0 ? iPageSize : commonConfig.pageSize, undefined, undefined, undefined, nextProps); 426 this.handleGetData(slaveConfig, slaveFilterCondition, 1, commonUtils.isNotEmptyNumber(iPageSize) && iPageSize !== 0 ? iPageSize : commonConfig.pageSize, undefined, undefined, undefined, nextProps);
427 } else if (JSON.stringify(nextProps.id) !== JSON.stringify(this.props.id)) { 427 } else if (JSON.stringify(nextProps.id) !== JSON.stringify(this.props.id)) {
428 this.props.onSaveState({ slaveSelectedRowKeys: [] }); 428 this.props.onSaveState({ slaveSelectedRowKeys: [] });
@@ -442,7 +442,7 @@ export default (ChildComponent) =&gt; { @@ -442,7 +442,7 @@ export default (ChildComponent) =&gt; {
442 442
443 const slaveConfig = formData.filter(item => item.bGrd && item.sTbName === 'elemachine')[0]; 443 const slaveConfig = formData.filter(item => item.bGrd && item.sTbName === 'elemachine')[0];
444 const slaveColumn = commonFunc.getHeaderConfig(slaveConfig); 444 const slaveColumn = commonFunc.getHeaderConfig(slaveConfig);
445 - 445 +
446 this.handleGetData(slaveConfig, undefined, undefined, undefined, undefined, undefined, undefined, nextProps); 446 this.handleGetData(slaveConfig, undefined, undefined, undefined, undefined, undefined, undefined, nextProps);
447 this.props.onSaveState({ 447 this.props.onSaveState({
448 masterConfig: currConfig, masterData, slaveConfig, slaveColumn, enabled: true, pageLoading: false, 448 masterConfig: currConfig, masterData, slaveConfig, slaveColumn, enabled: true, pageLoading: false,
@@ -452,10 +452,10 @@ export default (ChildComponent) =&gt; { @@ -452,10 +452,10 @@ export default (ChildComponent) =&gt; {
452 if (this.props.pageNum >= Math.ceil(slavePagination.total / slavePagination.pageSize)) { 452 if (this.props.pageNum >= Math.ceil(slavePagination.total / slavePagination.pageSize)) {
453 this.props.onToFirst(); 453 this.props.onToFirst();
454 } else if (commonUtils.isNotEmptyArr(treeFilterCondition)) { /* 判断是否有树过滤条件 */ 454 } else if (commonUtils.isNotEmptyArr(treeFilterCondition)) { /* 判断是否有树过滤条件 */
455 - 455 +
456 this.handleGetData(slaveConfig, slaveFilterCondition, nextProps.pageNum, slavePagination.pageSize, slaveOrderBy, '', sGroupByList, '', treeFilterCondition); 456 this.handleGetData(slaveConfig, slaveFilterCondition, nextProps.pageNum, slavePagination.pageSize, slaveOrderBy, '', sGroupByList, '', treeFilterCondition);
457 } else { 457 } else {
458 - 458 +
459 this.handleGetData(slaveConfig, slaveFilterCondition, nextProps.pageNum, slavePagination.pageSize, slaveOrderBy, '', sGroupByList); 459 this.handleGetData(slaveConfig, slaveFilterCondition, nextProps.pageNum, slavePagination.pageSize, slaveOrderBy, '', sGroupByList);
460 } 460 }
461 } 461 }
@@ -693,7 +693,7 @@ export default (ChildComponent) =&gt; { @@ -693,7 +693,7 @@ export default (ChildComponent) =&gt; {
693 if (formRoute === '/indexPage/materialRequirementsPlanning' && clearSelectData) { 693 if (formRoute === '/indexPage/materialRequirementsPlanning' && clearSelectData) {
694 const { slaveFilterCondition, slaveInfoConfig } = this.props; 694 const { slaveFilterCondition, slaveInfoConfig } = this.props;
695 if (commonUtils.isNotEmptyObject(slaveInfoConfig)) { 695 if (commonUtils.isNotEmptyObject(slaveInfoConfig)) {
696 - 696 +
697 this.handleGetDataInfo(slaveInfoConfig, slaveFilterCondition, 1); 697 this.handleGetDataInfo(slaveInfoConfig, slaveFilterCondition, 1);
698 } 698 }
699 } 699 }
@@ -2044,7 +2044,7 @@ export default (ChildComponent) =&gt; { @@ -2044,7 +2044,7 @@ export default (ChildComponent) =&gt; {
2044 printReportName = reportData[iIndex].sReportName; 2044 printReportName = reportData[iIndex].sReportName;
2045 } 2045 }
2046 } 2046 }
2047 - 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}`; 2047 + 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}`;
2048 window.open(urlPrint); 2048 window.open(urlPrint);
2049 } else if (key.indexOf('BtnPrintCus.') > -1) { 2049 } else if (key.indexOf('BtnPrintCus.') > -1) {
2050 if (commonUtils.isNotEmptyArr(menuChildData)) { 2050 if (commonUtils.isNotEmptyArr(menuChildData)) {
@@ -2057,7 +2057,7 @@ export default (ChildComponent) =&gt; { @@ -2057,7 +2057,7 @@ export default (ChildComponent) =&gt; {
2057 // window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`); 2057 // window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`);
2058 2058
2059 /* Get提交地址栏参数过多,更改Get提交为Post提交 */ 2059 /* Get提交地址栏参数过多,更改Get提交为Post提交 */
2060 - const url = `${commonConfig.server_host}printReport/printPdf/${printReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&printType=noquery&token=${encodeURIComponent(token)}`; 2060 + const url = `${commonConfig.file_host}printReport/printPdf/${printReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&printType=noquery&token=${encodeURIComponent(token)}`;
2061 const param = slaveOneData; 2061 const param = slaveOneData;
2062 this.handleOpenPost(url, param); 2062 this.handleOpenPost(url, param);
2063 } 2063 }
@@ -2249,7 +2249,7 @@ export default (ChildComponent) =&gt; { @@ -2249,7 +2249,7 @@ export default (ChildComponent) =&gt; {
2249 } 2249 }
2250 } 2250 }
2251 if (commonUtils.isNotEmptyObject(sProcessId)) { 2251 if (commonUtils.isNotEmptyObject(sProcessId)) {
2252 - url = `${commonConfig.server_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`; 2252 + url = `${commonConfig.file_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`;
2253 const values = {}; 2253 const values = {};
2254 const masterReturn = (await commonServices.postValueService(token, values, url)).data; 2254 const masterReturn = (await commonServices.postValueService(token, values, url)).data;
2255 if (masterReturn.code === 1) { 2255 if (masterReturn.code === 1) {
src/components/Common/CommonListTabEvent.js
@@ -1262,7 +1262,7 @@ export default (ChildComponent) =&gt; { @@ -1262,7 +1262,7 @@ export default (ChildComponent) =&gt; {
1262 conditionValues = this.props.getSqlCondition(slaveConfig, tableType, record); 1262 conditionValues = this.props.getSqlCondition(slaveConfig, tableType, record);
1263 } else if(commonUtils.isNotEmptyObject(currentPane) && !commonUtils.isEmpty(currentPane.conditonValues)) { 1263 } else if(commonUtils.isNotEmptyObject(currentPane) && !commonUtils.isEmpty(currentPane.conditonValues)) {
1264 conditionValues = currentPane.conditonValues; 1264 conditionValues = currentPane.conditonValues;
1265 - } 1265 + }
1266 1266
1267 /* 导出使用Post提交 */ 1267 /* 导出使用Post提交 */
1268 const url = `${commonConfig.server_host}excel/export/${slaveConfig.sId}?sModelsId=${slaveConfig.sParentId}&sName=${formRoute}&token=${encodeURIComponent(this.props.app.token)}`; 1268 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) =&gt; { @@ -2065,7 +2065,7 @@ export default (ChildComponent) =&gt; {
2065 printReportName = reportData[iIndex].sReportName; 2065 printReportName = reportData[iIndex].sReportName;
2066 } 2066 }
2067 } 2067 }
2068 - 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}`; 2068 + 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}`;
2069 window.open(urlPrint); 2069 window.open(urlPrint);
2070 } else if (key.indexOf('BtnPrintCus.') > -1) { 2070 } else if (key.indexOf('BtnPrintCus.') > -1) {
2071 if (commonUtils.isNotEmptyArr(menuChildData)) { 2071 if (commonUtils.isNotEmptyArr(menuChildData)) {
@@ -2078,7 +2078,7 @@ export default (ChildComponent) =&gt; { @@ -2078,7 +2078,7 @@ export default (ChildComponent) =&gt; {
2078 // window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`); 2078 // window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`);
2079 2079
2080 /* Get提交地址栏参数过多,更改Get提交为Post提交 */ 2080 /* Get提交地址栏参数过多,更改Get提交为Post提交 */
2081 - const url = `${commonConfig.server_host}printReport/printPdf/${printReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&printType=noquery&token=${encodeURIComponent(token)}`; 2081 + const url = `${commonConfig.file_host}printReport/printPdf/${printReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&printType=noquery&token=${encodeURIComponent(token)}`;
2082 const param = slaveOneData; 2082 const param = slaveOneData;
2083 this.handleOpenPost(url, param); 2083 this.handleOpenPost(url, param);
2084 } 2084 }
@@ -2271,7 +2271,7 @@ export default (ChildComponent) =&gt; { @@ -2271,7 +2271,7 @@ export default (ChildComponent) =&gt; {
2271 } 2271 }
2272 } 2272 }
2273 if (commonUtils.isNotEmptyObject(sProcessId)) { 2273 if (commonUtils.isNotEmptyObject(sProcessId)) {
2274 - url = `${commonConfig.server_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`; 2274 + url = `${commonConfig.file_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`;
2275 const values = {}; 2275 const values = {};
2276 const masterReturn = (await commonServices.postValueService(token, values, url)).data; 2276 const masterReturn = (await commonServices.postValueService(token, values, url)).data;
2277 if (masterReturn.code === 1) { 2277 if (masterReturn.code === 1) {
src/components/Common/CommonListTreeEvent.js
@@ -1446,7 +1446,7 @@ export default (ChildComponent) =&gt; { @@ -1446,7 +1446,7 @@ export default (ChildComponent) =&gt; {
1446 printReportName = reportData[iIndex].sReportName; 1446 printReportName = reportData[iIndex].sReportName;
1447 } 1447 }
1448 } 1448 }
1449 - 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}`; 1449 + 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}`;
1450 window.open(urlPrint); 1450 window.open(urlPrint);
1451 } else if (key.indexOf('BtnPrintCus.') > -1) { 1451 } else if (key.indexOf('BtnPrintCus.') > -1) {
1452 if (commonUtils.isNotEmptyArr(menuChildData)) { 1452 if (commonUtils.isNotEmptyArr(menuChildData)) {
@@ -1459,7 +1459,7 @@ export default (ChildComponent) =&gt; { @@ -1459,7 +1459,7 @@ export default (ChildComponent) =&gt; {
1459 // window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`); 1459 // window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`);
1460 1460
1461 /* Get提交地址栏参数过多,更改Get提交为Post提交 */ 1461 /* Get提交地址栏参数过多,更改Get提交为Post提交 */
1462 - const url = `${commonConfig.server_host}printReport/printPdf/${printReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&printType=noquery&token=${encodeURIComponent(token)}`; 1462 + const url = `${commonConfig.file_host}printReport/printPdf/${printReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&printType=noquery&token=${encodeURIComponent(token)}`;
1463 const param = slaveOneData; 1463 const param = slaveOneData;
1464 this.handleOpenPost(url, param); 1464 this.handleOpenPost(url, param);
1465 } 1465 }
@@ -1650,7 +1650,7 @@ export default (ChildComponent) =&gt; { @@ -1650,7 +1650,7 @@ export default (ChildComponent) =&gt; {
1650 } 1650 }
1651 } 1651 }
1652 if (commonUtils.isNotEmptyObject(sProcessId)) { 1652 if (commonUtils.isNotEmptyObject(sProcessId)) {
1653 - url = `${commonConfig.server_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`; 1653 + url = `${commonConfig.file_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`;
1654 const values = {}; 1654 const values = {};
1655 const masterReturn = (await commonServices.postValueService(token, values, url)).data; 1655 const masterReturn = (await commonServices.postValueService(token, values, url)).data;
1656 if (masterReturn.code === 1) { 1656 if (masterReturn.code === 1) {
src/components/Common/CommonSubBillEvent.js
@@ -4235,9 +4235,9 @@ export default (ChildComponent) =&gt; { @@ -4235,9 +4235,9 @@ export default (ChildComponent) =&gt; {
4235 ListData.push(masterData); 4235 ListData.push(masterData);
4236 const param = JSON.stringify(ListData); 4236 const param = JSON.stringify(ListData);
4237 if (eKey.indexOf('BtnPrint.') > -1) { 4237 if (eKey.indexOf('BtnPrint.') > -1) {
4238 - urlPrint = `${commonConfig.server_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; 4238 + urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`;
4239 } else if (eKey.indexOf('BtnPrintCus.') > -1) { 4239 } else if (eKey.indexOf('BtnPrintCus.') > -1) {
4240 - urlPrint = `${commonConfig.server_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`; 4240 + urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(token)}`;
4241 } 4241 }
4242 /* Get提交地址栏参数过多,更改Get提交为Post提交 */ 4242 /* Get提交地址栏参数过多,更改Get提交为Post提交 */
4243 this.handleOpenPost(urlPrint, param); 4243 this.handleOpenPost(urlPrint, param);
@@ -4267,9 +4267,9 @@ export default (ChildComponent) =&gt; { @@ -4267,9 +4267,9 @@ export default (ChildComponent) =&gt; {
4267 if (bisMutiSelect === false || bisMutiSelect === undefined) { 4267 if (bisMutiSelect === false || bisMutiSelect === undefined) {
4268 controlSelectedRowKeys = []; 4268 controlSelectedRowKeys = [];
4269 } 4269 }
4270 - urlPrint = `${commonConfig.server_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&sControlIds=${commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlSelectedRowKeys : []}`; 4270 + urlPrint = `${commonConfig.file_host}printReport/printPdf/${sActiveId}/${printReportName}.pdf?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}&sControlIds=${commonUtils.isNotEmptyArr(controlSelectedRowKeys) ? controlSelectedRowKeys : []}`;
4271 } else if (eKey.indexOf('BtnPrintCus.') > -1) { 4271 } else if (eKey.indexOf('BtnPrintCus.') > -1) {
4272 - urlPrint = `${commonConfig.server_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`; 4272 + urlPrint = `${commonConfig.file_host}printReport/printPdf/${printCustomerReportName}?${checked ? 'fileType=.xlsx&' : ''}sModelsId=${sModelsId}&sMaintableId=${masterConfig.sId}`;
4273 } 4273 }
4274 if (formRoute !== '/indexPage/printlabel') { 4274 if (formRoute !== '/indexPage/printlabel') {
4275 window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`); 4275 window.open(`${encodeURI(`${urlPrint}&queryFilter=${queryFilterJson}`)}&token=${encodeURIComponent(token)}`);
@@ -4880,7 +4880,7 @@ export default (ChildComponent) =&gt; { @@ -4880,7 +4880,7 @@ export default (ChildComponent) =&gt; {
4880 } 4880 }
4881 } 4881 }
4882 if (commonUtils.isNotEmptyObject(sCustomerId)) { 4882 if (commonUtils.isNotEmptyObject(sCustomerId)) {
4883 - url = `${commonConfig.server_host}printReport/getReportByCustomerId/${sCustomerId}?sModelsId=${sModelsId}`; 4883 + url = `${commonConfig.file_host}printReport/getReportByCustomerId/${sCustomerId}?sModelsId=${sModelsId}`;
4884 const values = {}; 4884 const values = {};
4885 const masterReturn = (await commonServices.postValueService(token, values, url)).data; 4885 const masterReturn = (await commonServices.postValueService(token, values, url)).data;
4886 if (masterReturn.code === 1) { 4886 if (masterReturn.code === 1) {
@@ -4899,7 +4899,7 @@ export default (ChildComponent) =&gt; { @@ -4899,7 +4899,7 @@ export default (ChildComponent) =&gt; {
4899 } 4899 }
4900 } 4900 }
4901 if (commonUtils.isNotEmptyObject(sProcessId)) { 4901 if (commonUtils.isNotEmptyObject(sProcessId)) {
4902 - url = `${commonConfig.server_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`; 4902 + url = `${commonConfig.file_host}printReport/getReportByProcessId/${sProcessId}?sModelsId=${sModelsId}`;
4903 const values = {}; 4903 const values = {};
4904 const masterReturn = (await commonServices.postValueService(token, values, url)).data; 4904 const masterReturn = (await commonServices.postValueService(token, values, url)).data;
4905 if (masterReturn.code === 1) { 4905 if (masterReturn.code === 1) {
src/components/Common/CommonTable/index.js
@@ -8531,7 +8531,7 @@ class CommonTableRc extends React.Component { @@ -8531,7 +8531,7 @@ class CommonTableRc extends React.Component {
8531 if (commonUtils.isNotEmptyObject(picAddr)) { 8531 if (commonUtils.isNotEmptyObject(picAddr)) {
8532 const { token } = props.app; 8532 const { token } = props.app;
8533 const dataUrl = picAddr[0].includes("xlyerpfiles") 8533 const dataUrl = picAddr[0].includes("xlyerpfiles")
8534 - ? `${commonConfig.server_host}file/download?savePathStr=${ 8534 + ? `${commonConfig.file_host}file/download?savePathStr=${
8535 picAddr[0] 8535 picAddr[0]
8536 }&scale=0.1&sModelsId=100&token=${token}` 8536 }&scale=0.1&sModelsId=100&token=${token}`
8537 : picAddr[0]; /* 缩略图 */ 8537 : picAddr[0]; /* 缩略图 */
src/components/Common/CommonView/index.js
@@ -118,7 +118,7 @@ export default class CommonView extends Component { @@ -118,7 +118,7 @@ export default class CommonView extends Component {
118 const { token } = this.props.app; 118 const { token } = this.props.app;
119 const previewImageArr = []; 119 const previewImageArr = [];
120 dataUrlArr.forEach((item) => { 120 dataUrlArr.forEach((item) => {
121 - const dataPreviewUrl = `${commonConfig.server_host}file/download?savePathStr=${item}&width=800&&height=500&sModelsId=100&token=${token}`; /* 预览 */ 121 + const dataPreviewUrl = `${commonConfig.file_host}file/download?savePathStr=${item}&width=800&&height=500&sModelsId=100&token=${token}`; /* 预览 */
122 previewImageArr.push(dataPreviewUrl); 122 previewImageArr.push(dataPreviewUrl);
123 }); 123 });
124 this.setState({ 124 this.setState({
src/mes/scheduledTasks/boxTypeDetail/boxTypeDetail.js
@@ -26,7 +26,7 @@ const removeExtension = (filename) =&gt; { @@ -26,7 +26,7 @@ const removeExtension = (filename) =&gt; {
26 26
27 const getImageUrl = (sName) => { 27 const getImageUrl = (sName) => {
28 console.log('getImageUrl', sName); 28 console.log('getImageUrl', sName);
29 - return `${commonConfig.server_host}file/downloadPrice?sLogoName=${sName}&date=${new Date().getTime()}`; 29 + return `${commonConfig.file_host}file/downloadPrice?sLogoName=${sName}&date=${new Date().getTime()}`;
30 }; 30 };
31 31
32 const CuttingComponent = (props) => { 32 const CuttingComponent = (props) => {
src/oee/common/oeeCurrentState.js
@@ -451,7 +451,7 @@ class OeeCurrentState extends Component { @@ -451,7 +451,7 @@ class OeeCurrentState extends Component {
451 const { token } = app; 451 const { token } = app;
452 const iIndex = slaveConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'BtnForceComplete' || item.sControlName === 'BtnNoPurchase'); 452 const iIndex = slaveConfig.gdsconfigformslave.findIndex(item => item.sControlName === 'BtnForceComplete' || item.sControlName === 'BtnNoPurchase');
453 const btnConfig = slaveConfig.gdsconfigformslave[iIndex]; 453 const btnConfig = slaveConfig.gdsconfigformslave[iIndex];
454 - // 454 + //
455 const { sRelation } = btnConfig; 455 const { sRelation } = btnConfig;
456 456
457 let selectedRowKeys = ''; 457 let selectedRowKeys = '';
@@ -624,7 +624,7 @@ const CommonOeeReportComponent = Form.create({ @@ -624,7 +624,7 @@ const CommonOeeReportComponent = Form.create({
624 // eslint-disable-next-line jsx-a11y/anchor-is-valid,react/no-array-index-key 624 // eslint-disable-next-line jsx-a11y/anchor-is-valid,react/no-array-index-key
625 <a key={index} style={{ background: `${item.sColorTerms}` }} className={oeeStyle.btnIcon} onClick={() => onBtnClick(item)}> 625 <a key={index} style={{ background: `${item.sColorTerms}` }} className={oeeStyle.btnIcon} onClick={() => onBtnClick(item)}>
626 <img 626 <img
627 - src={`${commonConfig.server_host}file/download?savePathStr=${picName}&sModelsId=100&token=${token}`} 627 + src={`${commonConfig.file_host}file/download?savePathStr=${picName}&sModelsId=100&token=${token}`}
628 alt="" 628 alt=""
629 /> 629 />
630 {item.showName} 630 {item.showName}
src/oee/common/oeeLabelPrint.js
@@ -101,7 +101,7 @@ class PrintOeeLabel extends Component { @@ -101,7 +101,7 @@ class PrintOeeLabel extends Component {
101 : {}; 101 : {};
102 if (name === "view") { 102 if (name === "view") {
103 /* 打印预览 */ 103 /* 打印预览 */
104 - urlPrint = `${commonConfig.server_host}printReport/printPdfOee?${ 104 + urlPrint = `${commonConfig.file_host}printReport/printPdfOee?${
105 false ? "fileType=.xlsx&" : "" 105 false ? "fileType=.xlsx&" : ""
106 }printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent( 106 }printType=noquery&sModelsId=${sModelsId}&token=${encodeURIComponent(
107 token 107 token
@@ -116,7 +116,7 @@ class PrintOeeLabel extends Component { @@ -116,7 +116,7 @@ class PrintOeeLabel extends Component {
116 sReportParam: printReportName 116 sReportParam: printReportName
117 }; 117 };
118 const dataUrl = `${ 118 const dataUrl = `${
119 - commonConfig.server_host 119 + commonConfig.file_host
120 }printReport/printPdfOeeOnline?sModelsId=${sModelsId}&sName=${formRoute}`; 120 }printReport/printPdfOeeOnline?sModelsId=${sModelsId}&sName=${formRoute}`;
121 const dataReturn = (await commonServices.postValueService( 121 const dataReturn = (await commonServices.postValueService(
122 token, 122 token,
src/utils/config.js
@@ -4,7 +4,7 @@ const bHttps = location.protocol === &#39;https:&#39; ; @@ -4,7 +4,7 @@ const bHttps = location.protocol === &#39;https:&#39; ;
4 export const webSite = { 4 export const webSite = {
5 // ipAddress: '//t0.xlyprint.com:8000/xlyEntry/', /* 服务器地址 */ 5 // ipAddress: '//t0.xlyprint.com:8000/xlyEntry/', /* 服务器地址 */
6 // faceAddress: isDev ? '//192.168.11.22:8080/xlyFace' : '//' + location.host + '/xlyFace', 6 // faceAddress: isDev ? '//192.168.11.22:8080/xlyFace' : '//' + location.host + '/xlyFace',
7 - fileAddress: isDev ? '//bmj_np.ruijieddnsa.com:3543/xlyEntry/' : '//' + '172.19.18.21:9181' + '/xlyEntry/', // 接口地址 7 + fileAddress: isDev ? '//bmj_np.ruijieddnsa.com:3543/xlyEntry/' : '//' + location.host + '/xlyReport/', // 接口地址
8 faceAddress: isDev ? '//bmj_np.ruijieddnsa.com:3543/xlyFace' : '//' + location.host + '/xlyFace', 8 faceAddress: isDev ? '//bmj_np.ruijieddnsa.com:3543/xlyFace' : '//' + location.host + '/xlyFace',
9 ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//bmj_np.ruijieddnsa.com:3543/xlyEntry/' : '//' + location.host + '/xlyEntry/', 9 ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//bmj_np.ruijieddnsa.com:3543/xlyEntry/' : '//' + location.host + '/xlyEntry/',
10 interfaceAddress: isDev ? '//bmj_np.ruijieddnsa.com:3543/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址1 10 interfaceAddress: isDev ? '//bmj_np.ruijieddnsa.com:3543/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址1