From d4fca49a4b70fe60c730d7e32e2035153a91fcc5 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期一, 31 五月 2021 17:13:14 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 264 ++++++++++++++++++++++------------------------------
1 files changed, 110 insertions(+), 154 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index a974f81..d1b639c 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -1,49 +1,78 @@
<template>
- <div class="sewers-search" v-if="judgeVisible">
- <div class="panel-title">{{ title }}</div>
- <div class="search-panel ">
- <el-form ref="form" :model="form" label-width="90px" class="search-form">
- <el-form-item v-for="(item,index) in solidWasteTypeOptions" :key="index" :label="item.label+'锛�'" size="mini"
- class="search-panel-item">
- <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
- :popper-class="'select-down'">
- <el-option
- v-for="item in solidWasteTypeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <el-radio-group v-model="form.transferData" class="levelOfRisk">
- <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index">
- <span class="levelOfRisk-type">{{ item.name }}</span>
- </el-radio>
- </el-radio-group>
- <div class="rightButtonSearch">
- <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
- <el-button class="el-icon-search" @click="handleSearch"></el-button>
+ <div class="sewers-search" v-if="judgeVisible">
+ <div class="panel-title">{{ 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%" v-model="form.pipelineType" @change="handlePipelineType"
+ :popper-class="'select-down'">
+ <el-option
+ v-for="item in items"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item :label="form.pipelineType+'锛�'" size="mini">
+ <el-select style="width: 100%" v-model="form.dataType" value-key="code"
+ :popper-class="'select-down'" @change="handleDataType">
+ <el-option
+ v-for="item in subItems"
+ :key="item.code"
+ :label="item.name"
+ :value="item">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-radio-group v-model="form.transferData" class="levelOfRisk">
+ <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index">
+ <span class="levelOfRisk-type">{{ item.name }}</span>
+ </el-radio>
+ </el-radio-group>
+ <div class="page_total">
+ <p>鍏辫
+ <span>{{total}}</span>
+ 鏉¤褰�
+ </p>
+ </div>
+ <div class="rightButtonSearch">
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
+ </div>
+ </el-form>
</div>
- </el-form>
+ <el-scrollbar style="height:286.22px">
+ <div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
+ @click="setBounced(item, index)">
+ <img src="../../../../public/assets/images/map/solidwaste/gf_green2.png" alt="" class="state">
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>{{ item.Name }}</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ </el-scrollbar>
+ <el-card class="footer-page" v-if="total > 10">
+ <el-pagination
+ small
+ @current-change="handlePage"
+ :page-size=pageSize
+ layout="prev, pager, next"
+ :total=total
+ class="warnPagination"
+ >
+ </el-pagination>
+ </el-card>
</div>
- <el-scrollbar style="height:286.22px">
- <div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :key="index"
- @click="setBounced(item)">
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>{{ item.Name }}</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- </el-scrollbar>
- </div>
</template>
<script>
import mapApi from '@/api/mapApi'
-import publicBounced from '@/components/BaseNav/PublicBounced/PublicBounced'
+import WasteSolidIndex from '@/components/base-page/WasteSolid/WasteSolidIndex'
+import { pulseEffect, setPanTo } from '../../../utils/utils'
+import { LayerWasteSolid } from '../../../conf/layers/LayerWasteSolid'
export default {
name: 'SolidWasteSearch',
@@ -51,73 +80,10 @@
data () {
return {
judgeVisible: true,
- solidWasteTypeOptions: [{
- value: '1',
- label: '鍖哄煙',
- options: [{
- value: '1',
- layerName: '鍥哄簾',
- key: 'pipename',
- label: '鍏ㄩ儴鍥哄簾'
- }],
- labelList: [{
- label: '杈撻�佷粙璐�',
- key: 'mediumtype'
- }, {
- label: '闀垮害(m)',
- key: 'length'
- }]
- }, {
- value: '2',
- label: '浼佷笟鍚嶇О',
- options: [{
- value: '1',
- layerName: '鍥哄簾',
- key: 'pipename',
- label: '鍏ㄩ儴鍥哄簾'
- }],
- labelList: [{
- label: '杈撻�佷粙璐�',
- key: 'mediumtype'
- }, {
- label: '闀垮害(m)',
- key: 'length'
- }]
- }, {
- value: '3',
- label: '浜岀骇鍗曚綅',
- options: [{
- value: '1',
- layerName: '鍥哄簾',
- key: 'pipename',
- label: '鍏ㄩ儴鍥哄簾'
- }],
- labelList: [{
- label: '杈撻�佷粙璐�',
- key: 'mediumtype'
- }, {
- label: '闀垮害(m)',
- key: 'length'
- }]
- }, {
- value: '4',
- label: '浼佷笟鍚嶇О',
- options: [{
- value: '1',
- layerName: '鍥哄簾',
- key: 'pipename',
- label: '鍏ㄩ儴鍥哄簾'
- }],
- labelList: [{
- label: '杈撻�佷粙璐�',
- key: 'mediumtype'
- }, {
- label: '闀垮害(m)',
- key: 'length'
- }]
- }],
form: {
- keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
+ pipelineType: '鍥哄簾',
+ dataType: '',
+ keyword: '',
// 鏁版嵁鐨勪紶閫�
transferData: 1
},
@@ -136,66 +102,56 @@
}
],
// 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
- searchDataDisplay: [],
- searchDataDisplayName: '',
- searchDataDisplayId: ''
+ items: [LayerWasteSolid],
+ subItems: LayerWasteSolid.layers,
+ list: [],
+ total: 0,
+ // 鍒嗛〉
+ pageSize: 10
}
},
methods: {
+ // 椤甸潰鍒囨崲 鍒嗛〉鍔熻兘
+ handlePage (page) {
+ // this.wfsHelper.setPage(page)
+ this.handleSearch()
+ },
+ // select鐨刼ption鐨勬暟鎹�夋嫨
+ handlePipelineType (val) {
+ this.list = []
+ for (let i = 0; i < this.items.length; i++) {
+ const item = this.items[i]
+ if (val === item.name) {
+ this.subItems = item.layers
+ return
+ }
+ }
+ },
+ handleDataType () {
+ this.list = []
+ },
// 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
async handleSearch (data) {
// console.log(this.form.keyword)
const result = await mapApi.getSolidWaste(data)
- console.log(result)
- this.searchDataDisplay = result.Result.DataInfo
- this.searchDataDisplayName = result.Result.DataInfo[0].Name
- this.searchDataDisplayId = result.Result.DataInfo[0].StoragePlaceId
- console.log(this.searchDataDisplayName)
+ this.list = result.Result.DataInfo
},
// 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
- setBounced (val) {
+ setBounced (val, index) {
const pos = [val.Latitude, val.Longitude]
- window.map.flyTo(pos, 11)
- const t1 = setTimeout(async () => {
- const dataValue = {
- StoragePlaceId: this.searchDataDisplayId
- }
- // console.log(e.layer.options.totransferData.Name)
- // 寮规鏍囬
- const title = this.searchDataDisplayName
- console.log(title)
- // 鍩烘湰淇℃伅 tabs
- const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
- // 璇︾粏淇℃伅灞曠ず table
- const resultDetailed = await mapApi.getSolidWasteDetail(dataValue)
-
- // 缁戝畾寮规瀹炰緥
- const PublicBounced = window.Vue.extend(publicBounced)
- const instance = new PublicBounced().$mount()
- document.body.appendChild(instance.$el)
- // document.body.removeChild(instance.$el)
- // 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
- instance.setData(title, resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
- // this.setPanTo(e.latlng, 300)
- }, 3000)
- console.log(t1)
- // clearTimeout(t1)
- },
-
- // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢
- setPanTo (pos, value) {
- var position = pos
- position = window.map.latLngToLayerPoint(position)
- position.y += value
- position = window.map.layerPointToLatLng(position)
- window.map.flyTo(position)
- },
- // select鐨刼ption鐨勬暟鎹�夋嫨
- handlePipelineType (val) {
- this.solidWasteTypeOptions.forEach(item => {
- if (val === item.value) {
- this.handleSearch(item.value)
- }
+ window.map.setView(pos, 15)
+ this.activeNum = index
+ pulseEffect([val.Latitude, val.Longitude])
+ setPanTo(pos, 200)
+ window.$layer.open({
+ content: {
+ comp: WasteSolidIndex, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ storagePlaceId: val.StoragePlaceId
+ }
+ },
+ title: val.Name
})
}
}
--
Gitblit v1.8.0