From 5bd3c6fc05b2548195ebe78bc4cec04886b51ca2 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 02 四月 2021 14:22:03 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 70 +++++++++-------------------------
1 files changed, 19 insertions(+), 51 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 1b709f2..35cbab1 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -1,9 +1,12 @@
<template>
<div class="sewers-search" v-if="gdVisible">
+ <div class="search-title">
+ 姹￠洦姘�
+ </div>
<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"
@@ -13,7 +16,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"
@@ -23,12 +26,14 @@
</el-select>
</el-form-item>
<!-- <el-form-item >-->
- <el-input v-model="form.keyword" size="mini"
- placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
- <!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
- <!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
- <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i>
- </el-input>
+ <div class="rightButtonSearch">
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
+ <!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
+ <!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
+ <!-- <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i> -->
+ </el-input>
+ <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
+ </div>
<!-- </el-form-item>-->
<!-- <el-form-item>-->
<!-- <input type="button" class="btn-ok" @click="handleSearch" value="鏌ヨ">-->
@@ -37,7 +42,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">
@@ -79,7 +83,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
@@ -103,7 +106,7 @@
</template>
<script>
-import { PipelineTypeOptions } from '@/conf/LayerSewers'
+import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
@@ -152,7 +155,7 @@
}
})
},
- handleSearch () {
+ async handleSearch () {
const param = {
pipelineType: this.form.pipelineType,
dataType: this.form.dataType
@@ -162,17 +165,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)
}
@@ -181,38 +182,5 @@
</script>
<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