ca5ad8c5 by lihua

调整报告生成样式

1 parent fcaf8f28
......@@ -4,7 +4,8 @@ VITE_APP_TITLE = 可信数据服务平台
# VITE_API_BASEURL = https://www.zgsjzc.com/api
# VITE_API_BASEURL = https://swzl-test.csbr.cn/api
# VITE_API_BASEURL = http://localhost:9000
VITE_API_BASEURL = https://daop-zcgl-test.zgsjzc.com/
# VITE_API_BASEURL = https://daop-zcgl-test.zgsjzc.com/
VITE_API_BASEURL = http://10.4.82.1:58052/
VITE_IDASS_BASEURL = https://daop-test.zgsjzc.com/portalLogin
......
......@@ -131,7 +131,7 @@ const getAnalysisResultPageData = (isFull = false) => {
});
obj['equivalenceClassNum'] = changeNum(d.equivalenceClassNum || 0, 0);
obj['reIdentifyRisk'] = changeNum(d.reIdentifyRisk || 0, 2);
obj['isGtThreshold'] = d.isGtThreshold;
obj['isGtThreshold'] = d.isGtThreshold === 'Y' ? '是取值为1' : '否取值为0';
fullResultData.value.push(obj);
});
resultData.value = fullResultData.value.slice(0, pageInfo.value.limit);
......@@ -145,7 +145,7 @@ const getAnalysisResultPageData = (isFull = false) => {
});
obj['equivalenceClassNum'] = changeNum(d.equivalenceClassNum || 0, 0);
obj['reIdentifyRisk'] = changeNum(d.reIdentifyRisk || 0, 2);
obj['isGtThreshold'] = d.isGtThreshold;
obj['isGtThreshold'] = d.isGtThreshold === 'Y' ? '是取值为1' : '否取值为0';
resultData.value.push(obj);
});
pageInfo.value.rows = res.data?.totalRows ?? 0;
......@@ -212,8 +212,23 @@ const downloadWord = () => {
resultDataLoading.value = true;
loadingText.value = `评测报告正在${route.query.dataOwner == '1' ? '发送' : '下载' }中,请勿关闭浏览器...`;
downPromise.value = convertHtml2Img(report, dom).then(() => {
const htmlContent = getHTML(dom.innerHTML);
const pageBreakRegex = /<br\s[^>]*>/gi;
const match = htmlContent.match(pageBreakRegex);
let htmlOverview = htmlContent;
let htmlContentPart = '';
if (match && match.length >= 1) {
const secondBr = match[0];
const index = htmlContent.indexOf(secondBr);
if (index !== -1) {
htmlOverview = htmlContent.substring(0, index + secondBr.length);
htmlContentPart = 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, html: encodeURIComponent(`<div>${getHTML(dom.innerHTML)}</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>`) }).then((res: any) => {
downPromise.value = null
loadingText.value = '';
resultDataLoading.value = false;
......@@ -224,7 +239,7 @@ const downloadWord = () => {
}
})
} else {
downloadAnonReport({ taskGuid: taskGuid.value, title: `${analysisResultInfo.value.tenantName}持有的“${oldAnonTaskValueInfo.value.taskName}”`, evaluationDate: analysisResultInfo.value.execTime ? analysisResultInfo.value.execTime.substring(0, 10) : '', deIdentProcessorName: userData.tenantName, html: encodeURIComponent(`<div>${getHTML(dom.innerHTML)}</div>`) }).then((res: any) => {
downloadAnonReport({ 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) => {
downPromise.value = null
loadingText.value = '';
resultDataLoading.value = false;
......
......@@ -2138,7 +2138,7 @@ const getAnalysisResultPageData = (isFull = false) => {
});
obj['equivalenceClassNum'] = changeNum(d.equivalenceClassNum || 0, 0);
obj['reIdentifyRisk'] = changeNum(d.reIdentifyRisk || 0, 2);
obj['isGtThreshold'] = d.isGtThreshold;
obj['isGtThreshold'] = d.isGtThreshold === 'Y' ? '是取值为1' : '否取值为0';
fullResultData.value.push(obj);
});
resultData.value = fullResultData.value.slice(0, pageInfo.value.limit);
......@@ -2152,7 +2152,7 @@ const getAnalysisResultPageData = (isFull = false) => {
});
obj['equivalenceClassNum'] = changeNum(d.equivalenceClassNum || 0, 0);
obj['reIdentifyRisk'] = changeNum(d.reIdentifyRisk || 0, 2);
obj['isGtThreshold'] = d.isGtThreshold;
obj['isGtThreshold'] = d.isGtThreshold === 'Y' ? '是取值为1' : '否取值为0';
resultData.value.push(obj);
});
pageInfo.value.rows = res.data?.totalRows ?? 0;
......@@ -2221,6 +2221,7 @@ const downloadWord = () => {
dom.innerHTML = report?.innerHTML;
loadingText.value = '报告正在下载中,请勿关闭浏览器...';
downloadLoading.value = true;
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, html: encodeURIComponent(`<div>${getHTML(dom.innerHTML)}</div>`) }).then((res: any) => {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!