qiangmj / ebc-Mes

Commit 2857547d3ecf43924a0bc2049a9b21499775ec1e

Authored by Min
2 parents 4e6110cb da726c8f

Merge branch 'release/customer/2025/AJT' of http://git.xlyprint.cn/qiangmj/ebc-M… 

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