From d2b7ff9b95a28d18bee37a29e2b3a995b3f1f9f1 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Mon, 19 Sep 2022 19:26:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commponts/conventionalmodle.vue           | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
index 93bdcf666..d6adc03d0 100644
--- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
+++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
@@ -95,6 +95,21 @@
                 </div>
               </a-col>
             </a-row>
+            <a-row :gutter="24">
+              <a-col :span="24">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('exportFileName')">
+                    <span class="Required">*</span>
+                    <span>{{$t('exportFileName')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel" prop="exportName">
+                    <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('exportFileName')"
+                             v-model.trim="formInline.exportName"></a-input>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+
+            </a-row>
           </a-form-model>
         </a-form>
       </a-spin>
@@ -141,6 +156,14 @@ export default {
             trigger: 'blur'
           }
         ],
+        exportName:[
+          {
+            max: 70,
+            message: this.$t('exportFileName') + this.$t('cannotExceed') + 70 + this.$t('Characters'),
+            trigger: 'blur'
+          },
+          { required: true, message: this.$t('PleaseEnter')+this.$t('exportFileName'), trigger: 'blur' },
+        ],
         certCategory:[
           { required: true, message: this.$t('PleaseEnter')+this.$t('certificationCategory'), trigger: 'change' },
           // { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('MergeSeparator'), trigger: 'blur' },
@@ -289,12 +312,12 @@ export default {
             query.certCategoryName = this.contentListStart
           }
           query.paramsManifestId = this.$route.query.id
-          let long = localStorage.getItem('language')
-          if (long && long === 'zh-cn') {
-            query.exportName = '常规导出'
-          } else if (long && long === 'en-us') {
-            query.exportName = 'Normal'
-          }
+          // let long = localStorage.getItem('language')
+          // if (long && long === 'zh-cn') {
+          //   query.exportName = '常规导出'
+          // } else if (long && long === 'en-us') {
+          //   query.exportName = 'Normal'
+          // }
           this.confirmLoading = true
           downloadFile('report/detail/exportNormal', query.exportName+'.zip', query)
           this.confirmLoading = false