From 02fe0b4daf808a52c983cd2c85e983324089c4a0 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 8 Aug 2022 16:04:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/exporthistory/index.vue    |  2 +-
 .../commponts/conventionalmodle.vue           | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue
index cd59122b3..ecd48eb3d 100644
--- a/jero-web/src/components/exporthistory/index.vue
+++ b/jero-web/src/components/exporthistory/index.vue
@@ -40,7 +40,7 @@
       :dataSource='areaTable'
       :pagination='false'
       :loading='loading'
-      :scroll='{x: 600}'
+      :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
       :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
       @change='handleTableChange'>
 
diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
index 765546dd3..b8481bf71 100644
--- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
+++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue
@@ -78,7 +78,7 @@
                 </div>
               </a-col>
             </a-row>
-            <a-row :gutter="24" v-if='!required'>
+            <a-row :gutter="24" v-if='combineFlag'>
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text">
@@ -122,18 +122,20 @@ export default {
   data() {
     return {
       formInline: {
+
       },
       confirmLoading: false,
       description:false,
       dictOptions:[],
       visible: false,
+      combineFlag:false,
       required:false,
       disabled:false,
       rules: {
         separator:[
           { required: true, message: this.$t('PleaseEnter')+this.$t('MergeSeparator'), trigger: 'change' },
           {
-            pattern: /[`~!@$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/,
+            pattern: /[`~!@$%^&*()_\-+=<>?:"{}|.\/;'\\[\]·~！@￥%……&*（）——\-+={}|《》？：“”【】、；‘'。、]/,
             message: this.$t('punctuationmark'),
             trigger: 'blur'
           }
@@ -166,11 +168,11 @@ export default {
   },
   mounted() {
     this.getNameList()
-    if(this.formInline.combineFlag == '1'){
-      this.required = false
-    }else{
-      this.required = true
-    }
+    // if(this.formInline.combineFlag == '1'){
+    //   this.required = false
+    // }else{
+    //   this.required = true
+    // }
   },
   methods: {
     uploadSuccess(data) {
@@ -196,11 +198,10 @@ export default {
       })
     },
     flagChange(value){
-      console.log(value.target.value)
       if(value.target.value == 2){
-        this.required = false
+        this.combineFlag = true
       }else{
-        this.required = true
+        this.combineFlag = false
       }
     },
     getNameList() {
@@ -217,6 +218,7 @@ export default {
       this.title = this.$t('ConventionalExport')
       this.formInline = {}
       this.formInline.separator = ','
+      this.formInline.combineFlag = '1',
       this.formInline = {...this.formInline}
       this.getConfigure()
       this.$nextTick(() => {