From 0415f4c1c98109117873bcd82cf2f1216afc0fb9 Mon Sep 17 00:00:00 2001 From: chenzeping <ChenZeping02609@163.com> Date: 星期一, 15 三月 2021 17:03:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master --- src/components/panel/topicSearch/SewersSearch.vue | 54 ++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 40 insertions(+), 14 deletions(-) diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue index cc64bb0..1b709f2 100644 --- a/src/components/panel/topicSearch/SewersSearch.vue +++ b/src/components/panel/topicSearch/SewersSearch.vue @@ -1,12 +1,9 @@ <template> - <div class="sewers-search"> - <div class="el-message-box__content" style="padding:6px;font-size: 13px;"> - <div class="box__content" v-if="gdVisible"> - <div> - <el-card class="search-panel"> + <div class="sewers-search" v-if="gdVisible"> + <div class="search-panel "> <el-form ref="form" :model="form" label-width="90px" class="search-form"> <el-form-item label="璁炬柦绫诲瀷锛�" size="mini" class="search-panel-item"> - <el-select v-model="form.pipelineType" @change="handlePipelineType" popper-class="select-down"> + <el-select style="width: 100%" :popper-append-to-body="false" v-model="form.pipelineType" @change="handlePipelineType" :popper-class="'select-down'"> <el-option v-for="item in pipelineTypeOptions" :key="item.value" @@ -16,7 +13,7 @@ </el-select> </el-form-item> <el-form-item :label="form.pipelineType+'锛�'" size="mini"> - <el-select v-model="form.dataType" @change="handleDataType" popper-class="select-down"> + <el-select style="width: 100%" :popper-append-to-body="false" v-model="form.dataType" @change="handleDataType" :popper-class="'select-down'"> <el-option v-for="item in dataTypeOptions" :key="item.value" @@ -38,7 +35,7 @@ <!-- <input type="button" class="btn-reset" @click="handleSearch" value="閲嶇疆">--> <!-- </el-form-item>--> </el-form> - </el-card> + </div> <el-scrollbar style="height:100%"> <el-card class="search-result" > <div class="B-TMD-table-list" v-for="(item,index) in list" :key="index"> @@ -97,16 +94,12 @@ </el-pagination> </el-card> </div> - </div> <!-- <div class="monitor2" v-if="hbVisible">--> <!-- <env-protect-search></env-protect-search>--> <!-- </div>--> <!-- <div class="monitor2" v-if="pkVisible">--> <!-- <discharge-search></discharge-search>--> <!-- </div>--> - </div> - </div> - </template> <script> @@ -187,6 +180,39 @@ } </script> -<style lang="less"> -//@import '@assets/css/map/map-elem-ui'; +<style lang="less" scoped> +.sewers-search{ + position: relative; + overflow: hidden; + .search-panel{ + background-color: transparent; + border: 1px solid @background-color-split; + padding: 10px; + + /deep/ input { + border-radius: 0; + background-color: @background-color-split ; + border: solid 1px @color ; + color: @color-gray; + font-size: 0.01rem; + .el-select .el-input.is-focus .el-input__inner{ + border-color: @color; + } + } + /deep/ input:focus{ + border-color: @color; + } + } + .search-btn{ + + } + //location-btn{ + // + //} + + .location-btn:hover,.el-input__icon:hover{ + color: @color; + cursor: pointer; + } +} </style> -- Gitblit v1.8.0