Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-web/src/views/parameter/parameterlist/components/addModel.vue

@@ -122,7 +122,7 @@
                 <span class="title-text-text"
                       :title="$t('NParameterDescription')">{{$t('NParameterDescription')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="description">
+                <a-form-model-item class="itemModel-text" prop="description">
                   <a-input class="box-input add-input"
                            style='height: 95px; width: 100%'
                            type="textarea"
@@ -803,7 +803,11 @@ export default {
   height: 38px;
   width: 100%;
 }
-
+.itemModel-text {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
 .itemModel {
   width: calc(100% - 130px);
   display: inline-block;

jero-web/src/views/parameter/parameterlist/index.vue

@@ -1,6 +1,7 @@
 <template>
   <a-card :bordered="false">
     <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
       <a-row :gutter="24">
         <a-col :md="6" :sm="8">
           <div class="box-title-text">
@@ -38,6 +39,7 @@
                </a-col>
       </span>
       </a-row>
+      </a-form>
     </div>
     <div class="table-operator">
       <div @click="handleAdd" class="operator-text" v-has="'params:paramsInfo:add'">