From 84379bb43b9ba28e3eccee98390c71633601cea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 12 Mar 2024 14:34:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E6=97=A7=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E5=8D=95=E5=AF=B9=E6=AF=94--=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/jero/JUpload.vue                      | 2 +-
 .../documentTool/documentComparison/comparisonTermsView.vue   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/components/jero/JUpload.vue b/jero-web/src/components/jero/JUpload.vue
index 939dc23..1abb770 100644
--- a/jero-web/src/components/jero/JUpload.vue
+++ b/jero-web/src/components/jero/JUpload.vue
@@ -493,7 +493,7 @@ export default {
      */
     handleDownload (file) {
       // 下载文件
-      downloadFile(`/sys/common/download/${file.response.result.id}`, file.name)
+      downloadFile(`/sys/common/downloadWithoutWaterMark/${file.response.result.id}`, file.name)
     }
   },
   mounted () {
diff --git a/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue b/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue
index 4a0f692..17ced13 100644
--- a/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue
+++ b/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue
@@ -6,7 +6,7 @@
                         @back="handleBack">
     <div class="can-scroll-content">
       <div class="can-scroll-content-header">
-         {{$route.query.titleLeft + ' ' + $route.query.serialNumberLeft + ' —— ' + $route.query.titleRight + ' ' + $route.query.serialNumberRight}}
+         {{titleLeft + ' ' + $route.query.serialNumberLeft + ' —— ' + titleRight + ' ' + $route.query.serialNumberRight}}
         <a-button icon="upload"
                   type="primary"
                   ghost
@@ -49,6 +49,8 @@ export default {
     return {
       loading: false,
       resultData: {},
+      titleLeft: this.$route.query.titleLeft || '',
+      titleRight: this.$route.query.titleRight || '',
       columns: [
         {
           title: '旧条款号',

From 8769062fd7bfb308cf5181b22734f50e6d61d814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 12 Mar 2024 14:50:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=20=E6=96=B0=E6=97=A7=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E5=8D=95=E5=AF=B9=E6=AF=94--=E5=88=97=E8=A1=A8--=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documentTool/documentComparison/DocumentDataComparison.vue | 3 ++-
 .../documentTool/documentComparison/comparisonTermsView.vue    | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue b/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue
index 4ad52ce..3e3bb9f 100644
--- a/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue
+++ b/jero-web/src/views/documentTool/documentComparison/DocumentDataComparison.vue
@@ -458,7 +458,8 @@ export default {
       // }
     },
     handleExportXls () {
-      const fileName = '全文比对信息'
+
+      const fileName = this.$route.query.infoNumberLeft + ' - ' + this.$route.query.infoNumberRight + '比对结果'
       const fileSuffix = '.xls'
       const param = {}
       param.id = this.$route.query.id
diff --git a/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue b/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue
index 17ced13..380e381 100644
--- a/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue
+++ b/jero-web/src/views/documentTool/documentComparison/comparisonTermsView.vue
@@ -127,8 +127,7 @@ export default {
       this.loadData()
     },
     handleExportXls () {
-
-      const fileName = '条款比对信息'
+      const fileName = this.$route.query.serialNumberLeft + ' - ' + this.$route.query.serialNumberRight + '比对结果'
       const fileSuffix = '.xlsx'
       const param = {}
       param.standHisId = this.standHisId