From c5ccf1f28a7dd70079408691b2ec91317fcf68a2 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 19 Jul 2022 18:04:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../src/views/system/UserAnnouncementList.vue | 21 +++++++++++--------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index fbec2b870..5dd92cd36 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1151,4 +1151,5 @@ module.exports = {
   CommentsCollectionResultsForReference:'Comments Collection Results For Reference',
   TechnicalEvaluationResultsForReference:'Technical Evaluation Results For Reference',
   ComplianceConfirmationRecord:'Compliance Confirmation Record',
+  complianceConfirmation:'Compliance Confirmation',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index ac2cf6d24..7f6f9e1aa 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1155,4 +1155,5 @@ module.exports = {
   CommentsCollectionResultsForReference:'意见收集结果参考',
   TechnicalEvaluationResultsForReference:'技术评估结果参考',
   ComplianceConfirmationRecord:'符合性确认记录',
+  complianceConfirmation:'符合性确认',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue
index ab48a5967..e7ac57559 100644
--- a/jero-web/src/views/system/UserAnnouncementList.vue
+++ b/jero-web/src/views/system/UserAnnouncementList.vue
@@ -106,16 +106,19 @@
           '2': this.$t('warningInformation'),
           '3': this.$t('ForwardPush'),
           '4': this.$t('authenticationMessage'),
-          '6':this.$t('RegulationListConfirmationTask'),
-          '7':this.$t('RegulationListConfirmationNotification'),
-          '8':this.$t('RegulationTaskConfirmation'),
-          '9':this.$t('DesignComplianceTask'),
-          '10':this.$t('PreHomoTask'),
-          '11':this.$t('ValidationTask'),
-          '12':this.$t('DesignComplianceNotification'),
-          '13':this.$t('PreHomoNotification'),
-          '14':this.$t('ValidationComplianceNotification'),
+          // '6':this.$t('RegulationListConfirmationTask'),
+          // '7':this.$t('RegulationListConfirmationNotification'),
+          // '8':this.$t('RegulationTaskConfirmation'),
+          // '9':this.$t('DesignComplianceTask'),
+          // '10':this.$t('PreHomoTask'),
+          // '11':this.$t('ValidationTask'),
+          // '12':this.$t('DesignComplianceNotification'),
+          // '13':this.$t('PreHomoNotification'),
+          // '14':this.$t('ValidationComplianceNotification'),
           '15':this.$t('RegulationTaskConfirmationNotification'),
+          '17':this.$t('listConfirmation'),
+          '18':this.$t('taskAffirm'),
+          '19':this.$t('complianceConfirmation'),
         },
         columns: [
           {