From 3072da92f3c3f08b2ee0ca03ee4e74b12f545b0e Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 26 五月 2021 21:31:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 154 ++++++++++++++++++++++-----------------------------
1 files changed, 67 insertions(+), 87 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index cc8a508..d1b639c 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -3,16 +3,25 @@
<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-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 solidWasteTypeOptions.labelList"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ 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>
@@ -21,6 +30,12 @@
<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>
@@ -28,8 +43,8 @@
</el-form>
</div>
<el-scrollbar style="height:286.22px">
- <div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :key="index"
- @click="setBounced(item)">
+ <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>
@@ -38,14 +53,26 @@
</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>
</template>
<script>
import mapApi from '@/api/mapApi'
-import WasteSolidIndex from '@/components/BaseNav/WasteSolid/WasteSolidIndex'
+import WasteSolidIndex from '@/components/base-page/WasteSolid/WasteSolidIndex'
import { pulseEffect, setPanTo } from '../../../utils/utils'
+import { LayerWasteSolid } from '../../../conf/layers/LayerWasteSolid'
export default {
name: 'SolidWasteSearch',
@@ -54,7 +81,9 @@
return {
judgeVisible: true,
form: {
- keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
+ pipelineType: '鍥哄簾',
+ dataType: '',
+ keyword: '',
// 鏁版嵁鐨勪紶閫�
transferData: 1
},
@@ -73,97 +102,50 @@
}
],
// 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
- searchDataDisplay: [],
- 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'
- }]
- }]
+ items: [LayerWasteSolid],
+ subItems: LayerWasteSolid.layers,
+ list: [],
+ total: 0,
+ // 鍒嗛〉
+ pageSize: 10
}
},
methods: {
+ // 椤甸潰鍒囨崲 鍒嗛〉鍔熻兘
+ handlePage (page) {
+ // this.wfsHelper.setPage(page)
+ this.handleSearch()
+ },
// select鐨刼ption鐨勬暟鎹�夋嫨
handlePipelineType (val) {
- this.solidWasteTypeOptions.forEach(item => {
- if (val === item.value) {
- this.handleSearch(item.value)
+ 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)
- this.searchDataDisplay = result.Result.DataInfo
+ this.list = result.Result.DataInfo
},
// 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
- setBounced (val) {
- console.log(val)
+ setBounced (val, index) {
const pos = [val.Latitude, val.Longitude]
window.map.setView(pos, 15)
+ this.activeNum = index
+ pulseEffect([val.Latitude, val.Longitude])
+ setPanTo(pos, 200)
window.$layer.open({
content: {
- content: WasteSolidIndex, // 缁勪欢
+ comp: WasteSolidIndex, // 缁勪欢
parent: this, // 鐖剁粍浠�
data: { // 浼犻�掔殑鍙傛暟
storagePlaceId: val.StoragePlaceId
@@ -171,8 +153,6 @@
},
title: val.Name
})
- pulseEffect([val.Latitude, val.Longitude])
- setPanTo(pos, 200)
}
}
}
--
Gitblit v1.8.0