Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

视图中心-资产视图搜索栏样式调整 #1



See merge request !694

@@ -159,3 +159,8 @@ custom-class="config-dialog"
 .tree-table .el-table .el-table__cell.is-center div {
     justify-content: center;
 }
+/*lsq 资产视图下搜索栏样式调整 2022-06-27*/
+.resList-form.el-form--inline .el-form-item{
+    align-items: center;
+    margin-right:6px;
+}
\ No newline at end of file

@@ -12,10 +12,10 @@
             <div :style="{'min-height':height+'px','height':'100%'}" class="cm-card">
                 <div style="height: 50px;text-align: left;margin-left: 10px;margin-top: 10px;display: flex">
                     <div style="width: calc(100% - 100px)">
-                        <el-form :inline="true" :model="searchForm" class="demo-form-inline">
+                        <el-form :inline="true" :model="searchForm" class="demo-form-inline resList-form">
                             <el-form-item :label="searchInfo.name" v-for="searchInfo in obj.searchList">
 
-                                <el-select :placeholder="'请选择' + searchInfo.name" clearable
+                                <el-select :size="$global.elementConfig.size.input" :placeholder="'请选择' + searchInfo.name" clearable
                                            filterable
                                            v-else v-if="searchInfo.type == 'TABLE_REL'" v-model="searchForm[searchInfo.key + '_' + searchInfo.type]">
                                     <el-option
@@ -26,18 +26,18 @@
                                     </el-option>
                                 </el-select>
 
-                                <el-input :placeholder="'请输入' + searchInfo.name" v-else
+                                <el-input :size="$global.elementConfig.size.input" :placeholder="'请输入' + searchInfo.name" v-else
                                           v-model="searchForm[searchInfo.key + '_' + searchInfo.type]"></el-input>
 
                             </el-form-item>
 
                             <el-form-item>
-                                <el-button @click="loadResList" v-if="obj.searchList.length > 0">查询</el-button>
+                                <el-button :size="$global.elementConfig.size.button" type="primary" @click="loadResList" v-if="obj.searchList.length > 0">查询</el-button>
                             </el-form-item>
                         </el-form>
                     </div>
                     <div style="width: 100px" v-if="$global.common.isAdminManager()">
-                        <el-button @click="showConfigDialog(true)" type="primary">配置</el-button>
+                        <el-button :size="$global.elementConfig.size.button" @click="showConfigDialog(true)" type="primary">配置</el-button>
                     </div>
                 </div>