Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'
视图中心-日志视图的下拉列表样式调整，查询按钮背景颜色统一 #1 See merge request !693
Showing
6 changed files
with
20 additions
and
6 deletions
| @@ -5488,6 +5488,13 @@ grayColor { | @@ -5488,6 +5488,13 @@ grayColor { | ||
| 5488 | .favorites-container .breadcrumb a:hover, .favorites-container .breadcrumb a.active { | 5488 | .favorites-container .breadcrumb a:hover, .favorites-container .breadcrumb a.active { |
| 5489 | color: #09ABEA !important; | 5489 | color: #09ABEA !important; |
| 5490 | } | 5490 | } |
| 5491 | +.favorites-container .layui-card-header .layui-status .layui-form-item{ | ||
| 5492 | + display:flex!important; | ||
| 5493 | + align-items: center; | ||
| 5494 | +} | ||
| 5495 | +.favorites-container .layui-form-item .layui-inline{ | ||
| 5496 | + margin-bottom: 0; | ||
| 5497 | +} | ||
| 5491 | 5498 | ||
| 5492 | .layout-nav-hide .layui-header, .layout-nav-hide .layui-side-menu, .layout-nav-hide .layadmin-pagetabs { | 5499 | .layout-nav-hide .layui-header, .layout-nav-hide .layui-side-menu, .layout-nav-hide .layadmin-pagetabs { |
| 5493 | display: none; | 5500 | display: none; |
| @@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
| 21 | </div> | 21 | </div> |
| 22 | </div> | 22 | </div> |
| 23 | <div class="layui-inline favorite-cards"> | 23 | <div class="layui-inline favorite-cards"> |
| 24 | - <div class="layui-input-inline layui-input-inline--long" style="margin-top: -4px;"> | 24 | + <div class="layui-input-inline layui-input-inline--long" > |
| 25 | <button type="button" id="fav_keyword" | 25 | <button type="button" id="fav_keyword" |
| 26 | class="layui-btn layui-btn-normal layui-btn-normal"> | 26 | class="layui-btn layui-btn-normal layui-btn-normal"> |
| 27 | 搜索 | 27 | 搜索 |
| @@ -61,7 +61,13 @@ | @@ -61,7 +61,13 @@ | ||
| 61 | margin-bottom: 3px !important; | 61 | margin-bottom: 3px !important; |
| 62 | /*width: 250px !important;*/ | 62 | /*width: 250px !important;*/ |
| 63 | } | 63 | } |
| 64 | - | 64 | +/*lsq esData下的搜索条件栏样式调整 2022-06-27*/ |
| 65 | +.container .cm-card .search .condition.esData-conditon div { | ||
| 66 | + margin-bottom: 0px !important; | ||
| 67 | +} | ||
| 68 | +.container .cm-card .search .condition.esData-conditon{ | ||
| 69 | + margin-bottom: 3px; | ||
| 70 | +} | ||
| 65 | .container .cm-card .search .btns { | 71 | .container .cm-card .search .btns { |
| 66 | width: 200px; | 72 | width: 200px; |
| 67 | display: flex; | 73 | display: flex; |
hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/inputbiztypetree/index.html
| 1 | <div> | 1 | <div> |
| 2 | - <el-select :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter" | 2 | + <el-select :size="$global.elementConfig.size.input" :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter" |
| 3 | :size="size" @change="selectChangeMethod" @visible-change="selectClose" clearable placeholder="所属系统" | 3 | :size="size" @change="selectChangeMethod" @visible-change="selectClose" clearable placeholder="所属系统" |
| 4 | style="min-width: 120px;" v-model="modelValueLabel"> | 4 | style="min-width: 120px;" v-model="modelValueLabel"> |
| 5 | <el-option :value="modelValue" style="height: auto;padding: 0;"> | 5 | <el-option :value="modelValue" style="height: auto;padding: 0;"> |
hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/inputrestypetree/index.html
| 1 | <div> | 1 | <div> |
| 2 | - <el-select :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter" | 2 | + <el-select :size="$global.elementConfig.size.input" :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter" |
| 3 | :size="size" @change="selectChangeMethod" @visible-change="selectClose" clearable placeholder="资源类型" | 3 | :size="size" @change="selectChangeMethod" @visible-change="selectClose" clearable placeholder="资源类型" |
| 4 | style="min-width: 120px;" v-model="modelValueLabel"> | 4 | style="min-width: 120px;" v-model="modelValueLabel"> |
| 5 | <el-option :value="modelValue" style="height: auto;padding: 0;"> | 5 | <el-option :value="modelValue" style="height: auto;padding: 0;"> |
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <div :style="{'min-height':height+'px','max-height':height+'px','height':'100%','padding-top':'3px'}" | 2 | <div :style="{'min-height':height+'px','max-height':height+'px','height':'100%','padding-top':'3px'}" |
| 3 | class="cm-card"> | 3 | class="cm-card"> |
| 4 | <div class="search"> | 4 | <div class="search"> |
| 5 | - <div class="condition"> | 5 | + <div class="condition esData-conditon"> |
| 6 | <el-form-item> | 6 | <el-form-item> |
| 7 | <el-input :size="$global.elementConfig.size.input" placeholder="=资源名称、日志内容=" | 7 | <el-input :size="$global.elementConfig.size.input" placeholder="=资源名称、日志内容=" |
| 8 | v-model="search.keyword"></el-input> | 8 | v-model="search.keyword"></el-input> |
| @@ -26,6 +26,7 @@ | @@ -26,6 +26,7 @@ | ||
| 26 | 26 | ||
| 27 | <el-form-item> | 27 | <el-form-item> |
| 28 | <el-date-picker | 28 | <el-date-picker |
| 29 | + :size="$global.elementConfig.size.input" | ||
| 29 | end-placeholder="结束时间" | 30 | end-placeholder="结束时间" |
| 30 | format="YYYY-MM-DD HH:mm:ss" | 31 | format="YYYY-MM-DD HH:mm:ss" |
| 31 | range-separator="-" | 32 | range-separator="-" |
| @@ -36,7 +37,7 @@ | @@ -36,7 +37,7 @@ | ||
| 36 | /> | 37 | /> |
| 37 | </el-form-item> | 38 | </el-form-item> |
| 38 | <el-form-item> | 39 | <el-form-item> |
| 39 | - <el-button :size="$global.elementConfig.size.button" @click="getDataList">查询</el-button> | 40 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="getDataList">查询</el-button> |
| 40 | </el-form-item> | 41 | </el-form-item> |
| 41 | </div> | 42 | </div> |
| 42 | </div> | 43 | </div> |
-
Please register or login to post a comment