monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit b622067e951c8117d53efcb94880efc286c2bcf0 2 parents 99707353 9d1a7869

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

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



See merge request !694
Inline Side-by-side
Showing 2 changed files with 10 additions and 5 deletions
@@ -159,3 +159,8 @@ custom-class="config-dialog" @@ -159,3 +159,8 @@ custom-class="config-dialog"
159 .tree-table .el-table .el-table__cell.is-center div { 159 .tree-table .el-table .el-table__cell.is-center div {
160 justify-content: center; 160 justify-content: center;
161 } 161 }
  162 +/*lsq 资产视图下搜索栏样式调整 2022-06-27*/
  163 +.resList-form.el-form--inline .el-form-item{
  164 + align-items: center;
  165 + margin-right:6px;
  166 +}
@@ -12,10 +12,10 @@ @@ -12,10 +12,10 @@
12 <div :style="{'min-height':height+'px','height':'100%'}" class="cm-card"> 12 <div :style="{'min-height':height+'px','height':'100%'}" class="cm-card">
13 <div style="height: 50px;text-align: left;margin-left: 10px;margin-top: 10px;display: flex"> 13 <div style="height: 50px;text-align: left;margin-left: 10px;margin-top: 10px;display: flex">
14 <div style="width: calc(100% - 100px)"> 14 <div style="width: calc(100% - 100px)">
15 - <el-form :inline="true" :model="searchForm" class="demo-form-inline"> 15 + <el-form :inline="true" :model="searchForm" class="demo-form-inline resList-form">
16 <el-form-item :label="searchInfo.name" v-for="searchInfo in obj.searchList"> 16 <el-form-item :label="searchInfo.name" v-for="searchInfo in obj.searchList">
17 17
18 - <el-select :placeholder="'请选择' + searchInfo.name" clearable 18 + <el-select :size="$global.elementConfig.size.input" :placeholder="'请选择' + searchInfo.name" clearable
19 filterable 19 filterable
20 v-else v-if="searchInfo.type == 'TABLE_REL'" v-model="searchForm[searchInfo.key + '_' + searchInfo.type]"> 20 v-else v-if="searchInfo.type == 'TABLE_REL'" v-model="searchForm[searchInfo.key + '_' + searchInfo.type]">
21 <el-option 21 <el-option
@@ -26,18 +26,18 @@ @@ -26,18 +26,18 @@
26 </el-option> 26 </el-option>
27 </el-select> 27 </el-select>
28 28
29 - <el-input :placeholder="'请输入' + searchInfo.name" v-else 29 + <el-input :size="$global.elementConfig.size.input" :placeholder="'请输入' + searchInfo.name" v-else
30 v-model="searchForm[searchInfo.key + '_' + searchInfo.type]"></el-input> 30 v-model="searchForm[searchInfo.key + '_' + searchInfo.type]"></el-input>
31 31
32 </el-form-item> 32 </el-form-item>
33 33
34 <el-form-item> 34 <el-form-item>
35 - <el-button @click="loadResList" v-if="obj.searchList.length > 0">查询</el-button> 35 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="loadResList" v-if="obj.searchList.length > 0">查询</el-button>
36 </el-form-item> 36 </el-form-item>
37 </el-form> 37 </el-form>
38 </div> 38 </div>
39 <div style="width: 100px" v-if="$global.common.isAdminManager()"> 39 <div style="width: 100px" v-if="$global.common.isAdminManager()">
40 - <el-button @click="showConfigDialog(true)" type="primary">配置</el-button> 40 + <el-button :size="$global.elementConfig.size.button" @click="showConfigDialog(true)" type="primary">配置</el-button>
41 </div> 41 </div>
42 </div> 42 </div>
43 43