From 1da76d05ebba28eeebef8af3832680143d5699c5 Mon Sep 17 00:00:00 2001 From: seatonwan9 <seatonwan9@163.com> Date: 星期一, 31 五月 2021 17:12:37 +0800 Subject: [PATCH] 查询条件补充,治理设施优化 --- src/components/panel/topicSearch/EnvRiskSearch.vue | 87 +++++++++++++++++++++++++++++-------------- 1 files changed, 58 insertions(+), 29 deletions(-) diff --git a/src/components/panel/topicSearch/EnvRiskSearch.vue b/src/components/panel/topicSearch/EnvRiskSearch.vue index a452a64..fa3b96e 100644 --- a/src/components/panel/topicSearch/EnvRiskSearch.vue +++ b/src/components/panel/topicSearch/EnvRiskSearch.vue @@ -13,6 +13,16 @@ </el-option> </el-select> </el-form-item> + <el-form-item label="鏉垮潡锛�" size="mini" class="search-panel-item"> + <el-select style="width: 100%" v-model="form.plateVal" @change="plateType" :popper-class="'select-down'"> + <el-option + v-for="item in plateTypeOptions" + :key="item.value" + :label="item.label" + :value="item.value"> + </el-option> + </el-select> + </el-form-item> <el-form-item label="浼佷笟鍚嶇О锛�" size="mini"> <el-select style="width: 100%" v-model="form.enterpriseVal" @change="enterpriseType" :popper-class="'select-down'"> <el-option @@ -24,7 +34,8 @@ </el-select> </el-form-item> <el-form-item label="浜岀骇鍗曚綅锛�" size="mini"> - <el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType" :popper-class="'select-down'"> + <el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType" + :popper-class="'select-down'"> <el-option v-for="item in enterpriseSubunitsTypeOptions" :key="item.value" @@ -35,7 +46,9 @@ </el-form-item> <el-form-item label="椋庨櫓绾у埆锛�" size="mini"></el-form-item> <el-radio-group v-model="form.type" class="levelOfRisk"> - <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}<i :style="'background:'+item.color"></i></span></el-radio> + <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"> + <span class="levelOfRisk-type">{{item.name}}<i :style="'background:'+item.color"></i></span> + </el-radio> </el-radio-group> <div class="page_total"> <p>鍏辫 @@ -51,12 +64,12 @@ </el-form> </div> <el-scrollbar style="height:264px"> - <div class="environmental-risk-list" v-for="(item,index) in 5" :key="index" ><!-- v-for="(item,index) in list" :key="index" --> - <i class="state"></i> + <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" + @click="handleLocation(item)"> + <img :src='iconUrl[item.riskLevel]' alt="" class="state"/> <div> - <h3>###鐐煎寲閮�</h3> - <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p> - <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p> + <h3>{{ item.riskname }}</h3> + <p>浜岀骇鍗曚綅锛�<span>{{ item.unitname }}</span></p> </div> </div> </el-scrollbar> @@ -83,8 +96,11 @@ </template> <script> -import WfsHelper from '@components/helpers/WfsHelper' -import AjaxUtils from '@utils/AjaxUtils' + +import { pulseEffect, setPanTo } from '@utils/utils' +import RiskSourceIndex from '@components/base-page/RiskSource/RiskSourceIndex' +const mapApi = require('../../../api/mapApi').default + export default { name: 'EnvRiskSearch', data () { @@ -92,17 +108,19 @@ gdVisible: true, list: [], total: 0, - inareaTypeOptions: [], + areaTypeOptions: [], + plateTypeOptions: [], enterpriseTypeOptions: [], enterpriseSubunitsTypeOptions: [], form: { areaVal: '', + plateVal: '', enterpriseVal: '', enterpriseSubunitsVal: '', type: '' }, - // pageSize: 10, - // current: 1, + pageSize: 10, + current: 1, isWaybillHover: true, isRouteHover: false, levelOfRisk: [ @@ -111,7 +129,12 @@ { name: '浜岀骇椋庨櫓', value: '3', color: 'yellow' }, { name: '涓夌骇椋庨櫓', value: '4', color: 'green' } ], - areaTypeOptions: [] + iconUrl: ['', + require('../../../../public/assets/images/map/environmentRisk/risk_red.png'), + require('../../../../public/assets/images/map/environmentRisk/risk_sandybrown.png'), + require('../../../../public/assets/images/map/environmentRisk/risk_yellow.png'), + require('../../../../public/assets/images/map/environmentRisk/risk_green.png') + ] } }, props: ['title'], @@ -123,6 +146,10 @@ } }) + }, + // 鏉垮潡绛涢�� + plateType (val) { + }, // 浼佷笟绛涢�� enterpriseType (val) { @@ -136,27 +163,29 @@ enterpriseSubunitsType (val) { }, + async handleSearch () { const param = { - pipelineType: this.form.pipelineType, - dataType: this.form.dataType } - console.log(param) - var wfsHelper = new WfsHelper() - wfsHelper.addTypeName(this.form.query.layerName) - wfsHelper.addLike(this.form.query.key, this.form.keyword) - // const _this = this - const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {}) - if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) { - this.list = res.data.features - } + const res = await mapApi.getEnvironmentRiskPoint(param) + this.list = res[0].concat(res[1], res[2], res[3]) // 涓存椂鏁版嵁 }, + handleLocation (val) { - console.log(val) - const bound = this.L.geoJSON([val], {}).getBounds() - var layer = window.serviceLayerHelper.getByLayerId(val.id) - layer && layer.openPopup() - this.$store.state.map.map.flyToBounds(bound) + const pos = [val.Latitude, val.Longitude] + window.map.setView(pos, 15) + window.$layer.open({ + content: { + comp: RiskSourceIndex, // 缁勪欢 + parent: this, // 鐖剁粍浠� + data: { // 浼犻�掔殑鍙傛暟 + riskSourceId: val.no + } + }, + title: '澶╂触鐭冲寲' + val.riskname + }) + pulseEffect([val.Latitude, val.Longitude]) + setPanTo(pos, 250) } } } -- Gitblit v1.8.0