0eedaa43 by lihua

附录支持换行到下一页。

1 parent d732b721
......@@ -219,18 +219,27 @@ const downloadWord = () => {
const match = htmlContent.match(pageBreakRegex);
let htmlOverview = htmlContent;
let htmlContentPart = '';
let htmlAppendix = '';
if (match && match.length >= 1) {
const secondBr = match[0];
const index = htmlContent.indexOf(secondBr);
const firstBr = match[0];
const index = htmlContent.indexOf(firstBr);
if (index !== -1) {
htmlOverview = htmlContent.substring(0, index + secondBr.length);
htmlContentPart = htmlContent.substring(index + secondBr.length);
htmlOverview = htmlContent.substring(0, index + firstBr.length);
htmlContentPart = htmlContent.substring(index + firstBr.length);
}
let secondBr = match[1];
if (secondBr) {
const index = htmlContent.indexOf(secondBr);
if (index !== -1) {
htmlAppendix = htmlContent.substring(index + secondBr.length);
}
}
}
if (route.query.dataOwner == '1') {
sendAnonReport({ taskGuid: taskGuid.value, title: `${analysisResultInfo.value.tenantName}持有的“${oldAnonTaskValueInfo.value.taskName}”`, evaluationDate: analysisResultInfo.value.execTime ? analysisResultInfo.value.execTime.substring(0, 10) : '', deIdentProcessorName: userData.tenantName, htmlOverview: encodeURIComponent(`<div>${htmlOverview}</div>`), htmlContent: encodeURIComponent(`<div>${htmlContentPart}</div>`) }).then((res: any) => {
sendAnonReport({ taskGuid: taskGuid.value, title: `${analysisResultInfo.value.tenantName}持有的“${oldAnonTaskValueInfo.value.taskName}”`, evaluationDate: analysisResultInfo.value.execTime ? analysisResultInfo.value.execTime.substring(0, 10) : '', deIdentProcessorName: userData.tenantName, htmlOverview: encodeURIComponent(`<div>${htmlOverview}</div>`),
htmlContent: encodeURIComponent(`<div>${htmlContentPart}</div>`), htmlAppendix: encodeURIComponent(`<div>${htmlAppendix}</div>`) }).then((res: any) => {
downPromise.value = null
loadingText.value = '';
resultDataLoading.value = false;
......
......@@ -2238,20 +2238,30 @@ const downloadWord = () => {
const match = htmlContent.match(pageBreakRegex);
let htmlOverview = htmlContent;
let htmlContentPart = '';
let htmlAppendix = '';
if (match && match.length >= 1) {
const secondBr = match[0];
const index = htmlContent.indexOf(secondBr);
const firstBr = match[0];
const index = htmlContent.indexOf(firstBr);
if (index !== -1) {
htmlOverview = htmlContent.substring(0, index + secondBr.length);
htmlContentPart = htmlContent.substring(index + secondBr.length);
htmlOverview = htmlContent.substring(0, index + firstBr.length);
htmlContentPart = htmlContent.substring(index + firstBr.length);
}
let secondBr = match[1];
if (secondBr) {
const index = htmlContent.indexOf(secondBr);
if (index !== -1) {
htmlAppendix = htmlContent.substring(index + secondBr.length);
}
}
}
downPromise.value = convertHtml2Img(report, dom).then(() => {
downloadAnonReport({ taskGuid: oldAnonTaskValueInfo.value.guid, title: `${analysisResultInfo.value.tenantName}持有的“${oldAnonTaskValueInfo.value.taskName}”`, evaluationDate: analysisResultInfo.value.execTime ? analysisResultInfo.value.execTime.substring(0, 10) : '',
deIdentProcessorName: userData.tenantName,
htmlOverview: encodeURIComponent(`<div>${htmlOverview}</div>`),
htmlContent: encodeURIComponent(`<div>${htmlContentPart}</div>`) }).then((res: any) => {
htmlContent: encodeURIComponent(`<div>${htmlContentPart}</div>`),
htmlAppendix: encodeURIComponent(`<div>${htmlAppendix}</div>`) }).then((res: any) => {
downPromise.value = null
loadingText.value = '';
downloadLoading.value = false;
......
......@@ -356,7 +356,8 @@
<br clear="all" style="page-break-before:always;mso-break-type:section-break">
<!-- 附录:不符合规则的文件清单 -->
<h1 v-if="noComplianceList.length" style="text-align: left;margin-top: 10px;margin-bottom: 10px;">附录:不符合规则的文件清单</h1>
<br v-if="noComplianceList.length" clear="all" style="page-break-before:always;mso-break-type:section-break">
<h1 class="MsoHeading1" v-if="noComplianceList.length" style="text-align: left;margin-top: 10px;margin-bottom: 10px;">附录:不符合规则的文件清单</h1>
<table v-if="noComplianceList.length" border="0" cellspacing="0"
style="width:100%;word-break: break-all;margin: 0 auto;text-align: left;border-collapse: collapse;color: #212121">
<thead>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!