From 6a5d5a1ef5f645aa370ae92371e601989f7a8294 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Mon, 11 Apr 2022 20:25:58 +0800 Subject: [PATCH] =?UTF-8?q?4.11=20weboffice=E9=80=9A=E7=94=A8=E5=92=8C?= =?UTF-8?q?=E8=AF=84=E5=AE=A1=E5=AE=A4=E6=8A=A5=E8=A1=A8=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6=E5=90=8D=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Evaluation/ReportPrint/index.tsx | 4 +++- src/pages/webOffice/weboffice0609.tsx | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pages/Evaluation/ReportPrint/index.tsx b/src/pages/Evaluation/ReportPrint/index.tsx index 31191d8..f1066eb 100644 --- a/src/pages/Evaluation/ReportPrint/index.tsx +++ b/src/pages/Evaluation/ReportPrint/index.tsx @@ -88,7 +88,9 @@ const ReportPrint: React.FC<{}> = () => { const onClickLink = (url: string, name: string, data: any) => { editLoading(); - window.ntkoBrowser.openWindow('/Weboffice4Path.html?path=' + encodeURIComponent(url) + '&fileName=' + `${data.sectionName}-${data.sectionNum}-${data.roomType == 1 ? '预审' : ''}${name}${defId == 'recruit_multi' ? `第${data.roomSort}轮` : ''}${data.reviewMark == 1 ? `(第${data.reviewSort}次重新评审)` : ''}`); + const fileName: string = `${data.sectionName}-${data.sectionNum}-${data.roomType == 1 ? '预审' : ''}${name}${defId == 'recruit_multi' ? `第${data.roomSort}轮` : ''}${data.reviewMark == 1 ? `(第${data.reviewSort}次重新评审)` : ''}`; + const format = fileName.replace(/\//g, "-") //格式化文件名称 + window.ntkoBrowser.openWindow('/Weboffice4Path.html?path=' + encodeURIComponent(url) + '&fileName=' + format); }; return ( diff --git a/src/pages/webOffice/weboffice0609.tsx b/src/pages/webOffice/weboffice0609.tsx index e91b84a..fadad0b 100644 --- a/src/pages/webOffice/weboffice0609.tsx +++ b/src/pages/webOffice/weboffice0609.tsx @@ -2,7 +2,7 @@ * @Author: zhoujianlong * @Date: 2021-06-09 15:29:07 * @Last Modified by: zhoujianlong - * @Last Modified time: 2022-03-07 10:51:39 + * @Last Modified time: 2022-04-11 20:13:27 */ import { Button, Modal } from 'antd'; import { LoadingOutlined } from '@ant-design/icons'; @@ -259,7 +259,8 @@ const WebOffice0609: React.FC = (props) => { } openUrl += `.html?readonly=${readOnly}&DocfileCode=${docFileCode_}&PDFfileCode=${pdfFileCode_}&HTMLfileCode=${htmlFileCode_}&savePDF=${savePDF}&saveHTML=${saveHTML}`; if (fileName != '') { - openUrl += `&fileName=${fileName}` + const format = fileName.replace(/\//g, "-") //格式化文件名称 + openUrl += `&fileName=${format}` } window.ntkoBrowser.openWindow(openUrl); }}