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

视图中心-日志视图的下拉列表样式调整，查询按钮背景颜色统一 #1



See merge request !693

@@ -5488,6 +5488,13 @@ grayColor {
 .favorites-container .breadcrumb a:hover, .favorites-container .breadcrumb a.active {
     color: #09ABEA !important;
 }
+.favorites-container .layui-card-header .layui-status .layui-form-item{
+    display:flex!important;
+    align-items: center;
+}
+.favorites-container .layui-form-item .layui-inline{
+    margin-bottom: 0;
+}
 
 .layout-nav-hide .layui-header, .layout-nav-hide .layui-side-menu, .layout-nav-hide .layadmin-pagetabs {
     display: none;

@@ -21,7 +21,7 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline favorite-cards">
-                                    <div class="layui-input-inline layui-input-inline--long" style="margin-top: -4px;">
+                                    <div class="layui-input-inline layui-input-inline--long" >
                                         <button type="button" id="fav_keyword"
                                                 class="layui-btn layui-btn-normal layui-btn-normal">
                                             搜索

@@ -61,7 +61,13 @@
     margin-bottom: 3px !important;
     /*width: 250px !important;*/
 }
-
+/*lsq esData下的搜索条件栏样式调整 2022-06-27*/
+.container .cm-card .search .condition.esData-conditon div {
+    margin-bottom: 0px !important;
+}
+.container .cm-card .search .condition.esData-conditon{
+    margin-bottom: 3px;
+}
 .container .cm-card .search .btns {
     width: 200px;
     display: flex;

 <div>
-    <el-select :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter"
+    <el-select :size="$global.elementConfig.size.input" :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter"
                :size="size" @change="selectChangeMethod" @visible-change="selectClose" clearable placeholder="所属系统"
                style="min-width: 120px;" v-model="modelValueLabel">
         <el-option :value="modelValue" style="height: auto;padding: 0;">

 <div>
-    <el-select :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter"
+    <el-select :size="$global.elementConfig.size.input" :collapse-tags="true" :filter-method="selectFilterMethod" :filterable="isFilter"
                :size="size" @change="selectChangeMethod" @visible-change="selectClose" clearable placeholder="资源类型"
                style="min-width: 120px;" v-model="modelValueLabel">
         <el-option :value="modelValue" style="height: auto;padding: 0;">

@@ -2,7 +2,7 @@
     <div :style="{'min-height':height+'px','max-height':height+'px','height':'100%','padding-top':'3px'}"
          class="cm-card">
         <div class="search">
-            <div class="condition">
+            <div class="condition esData-conditon">
                 <el-form-item>
                     <el-input :size="$global.elementConfig.size.input" placeholder="=资源名称、日志内容="
                               v-model="search.keyword"></el-input>
@@ -26,6 +26,7 @@
 
                 <el-form-item>
                     <el-date-picker
+                            :size="$global.elementConfig.size.input"
                             end-placeholder="结束时间"
                             format="YYYY-MM-DD HH:mm:ss"
                             range-separator="-"
@@ -36,7 +37,7 @@
                     />
                 </el-form-item>
                 <el-form-item>
-                    <el-button :size="$global.elementConfig.size.button" @click="getDataList">查询</el-button>
+                    <el-button :size="$global.elementConfig.size.button" type="primary" @click="getDataList">查询</el-button>
                 </el-form-item>
             </div>
         </div>