上报库-参数项查看-保存

jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue

@@ -66,7 +66,7 @@
                       :title="$t('WhetherMergeParameters')">{{$t('WhetherMergeParameters')}}</span>
                   </div>
                   <a-form-model-item class="itemModel" prop="combineFlag">
-                    <a-radio-group style="margin-top: 2px" @change="flagChange" class="box-input" v-model="formInline.combineFlag">
+                    <a-radio-group style="margin-top: 2px" @change="flagChange" defaultValue='1' class="box-input" v-model="formInline.combineFlag">
                       <a-radio value="1">
                         {{$t('nonjoinder')}}
                       </a-radio>
@@ -82,11 +82,11 @@
               <a-col :span="24">
                 <div class="box-title-text">
                   <div class="title-text">
-                    <span class="Required" v-if='required'>*</span>
+                    <span class="Required" v-if='!required'>*</span>
                 <span class="title-text-text"
                       :title="$t('MergeSeparator')">{{$t('MergeSeparator')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" :prop="required?'separator':''">
+                  <a-form-model-item class="itemModel" :prop="!required?'separator':''">
 <!--                    :disabled="disabled"-->
                     <a-input class="box-input"
                              v-model="formInline.separator"
@@ -132,6 +132,11 @@ export default {
       rules: {
         separator:[
           { required: true, message: this.$t('PleaseEnter')+this.$t('MergeSeparator'), trigger: 'change' },
+          {
+            pattern: /[`~!@$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/,
+            message: this.$t('punctuationmark'),
+            trigger: 'blur'
+          }
         ],
         certCategory:[
           { required: true, message: this.$t('PleaseEnter')+this.$t('certificationCategory'), trigger: 'change' },
@@ -188,9 +193,9 @@ export default {
     flagChange(value){
       console.log(value.target.value)
       if(value.target.value == 2){
-        this.required = true
-      }else{
         this.required = false
+      }else{
+        this.required = true
       }
     },
     getNameList() {