From d6bb6c4485ea9134caf48ef09424594e1a26b30c Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 01 四月 2021 09:33:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 33 ++++++++++-----------------------
1 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index b9d023e..c969cde 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -1,12 +1,9 @@
<template>
- <div :class="'sewers-search map-background'">
- <div class="el-message-box__content" style="padding:6px;font-size: 13px;">
- <div class="box__content" v-if="gdVisible">
- <div>
+ <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 style="width: 100%" :popper-append-to-body="false" v-model="form.pipelineType" @change="handlePipelineType" :popper-class="'select-down'">
+ <el-select style="width: 100%" 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 style="width: 100%" :popper-append-to-body="false" v-model="form.dataType" @change="handleDataType" :popper-class="'select-down'">
+ <el-select style="width: 100%" v-model="form.dataType" @change="handleDataType" :popper-class="'select-down'">
<el-option
v-for="item in dataTypeOptions"
:key="item.value"
@@ -40,7 +37,6 @@
</el-form>
</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">
<div class="B-TMD-table-list-title">
<div class="B-TMD-table-list-head">
@@ -82,7 +78,6 @@
<!-- 璐х墿鍚嶇О锛�<span :title="item.materialName">{{ item.materialName }}</span></div>-->
<!-- </div>-->
</div>
- </el-card>
</el-scrollbar>
<el-card class="footer-page" v-if="total > 10">
<el-pagination
@@ -97,20 +92,16 @@
</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>
-import { PipelineTypeOptions } from '@/conf/LayerSewers'
+import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
@@ -159,7 +150,7 @@
}
})
},
- handleSearch () {
+ async handleSearch () {
const param = {
pipelineType: this.form.pipelineType,
dataType: this.form.dataType
@@ -169,17 +160,15 @@
wfsHelper.addTypeName(this.form.query.layerName)
wfsHelper.addLike(this.form.query.key, this.form.keyword)
// const _this = this
- AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {}, (res) => {
- console.log(res)
- this.list = res.features
- })
+ const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
+ if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
+ this.list = res.data.features
+ }
},
handleLocation (val) {
console.log(val)
const bound = this.L.geoJSON([val], {}).getBounds()
- console.log(bound)
var layer = window.serviceLayerHelper.getByLayerId(val.id)
- console.log(layer)
layer && layer.openPopup()
this.$store.state.map.map.flyToBounds(bound)
}
@@ -188,10 +177,9 @@
</script>
<style lang="less" scoped>
+
.sewers-search{
position: relative;
- width: 1.79167rem;
- height: 3.4375rem;
overflow: hidden;
.search-panel{
background-color: transparent;
@@ -218,7 +206,6 @@
//location-btn{
//
//}
-
.location-btn:hover,.el-input__icon:hover{
color: @color;
cursor: pointer;
--
Gitblit v1.8.0