From e723b7220b3fcda8c1633557f44f0afc1f0d2301 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 18:40:29 +0800
Subject: [PATCH] 修改默认显示图表
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 232 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 113 insertions(+), 119 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index c672fb9..d98e78a 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -1,9 +1,6 @@
<template>
- <div class="solidwaste-search" v-if="judgeVisible">
- <div class="search-title">
- <span>鍥哄簾</span>
- <!-- <span>{{ title }}</span>-->
- </div>
+ <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"
@@ -18,58 +15,35 @@
</el-option>
</el-select>
</el-form-item>
- <div class="search-radio">
- <el-radio v-model="radio" label="1">鍏ㄩ儴</el-radio>
- <el-radio v-model="radio" label="2">姝ｅ父</el-radio>
- <el-radio v-model="radio" label="3">棰勮</el-radio>
+ <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>
- <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
- <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i>
- </el-input>
</el-form>
- <div>
- <el-card class="box-card" v-for="(item,index) in searchDataDisplay" :key="index">
- <div v-if="total > 3">
- {{ item.CompanyName }}
- </div>
- </el-card>
- <el-pagination
- small
- layout="prev, pager, next"
- :total=total
- :current-page=1
- class="warnPagination"
- >
- </el-pagination>
- </div>
- <!-- <el-scrollbar style="height:100%">-->
- <!-- <el-card class="footer-page">-->
- <!-- <ul>-->
- <!-- {{ searchDataDisplay }}-->
- <!-- <li v-for="(item,index) in searchDataDisplay" :key="index">-->
- <!-- {{ item.CompanyName }}-->
- <!-- </li>-->
- <!-- </ul>-->
- <!-- </el-card>-->
- <!-- <el-pagination-->
- <!-- small-->
- <!-- @current-change="handlePage"-->
- <!-- :page-size=pageSize-->
- <!-- layout="prev, pager, next"-->
- <!-- :total=total-->
- <!-- :current-page=current-->
- <!-- class="warnPagination"-->
- <!-- >-->
- <!-- </el-pagination>-->
- <!-- </el-card>-->
- <!-- </el-scrollbar>-->
</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'
export default {
name: 'SolidWasteSearch',
@@ -142,40 +116,106 @@
key: 'length'
}]
}],
- radio: '1',
form: {
- keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ'
+ keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
+ // 鏁版嵁鐨勪紶閫�
+ transferData: 1
},
+ levelOfRisk: [
+ {
+ name: '鍏ㄩ儴',
+ value: 1
+ },
+ {
+ name: '姝ｅ父',
+ value: 2
+ },
+ {
+ name: '棰勮',
+ value: 3
+ }
+ ],
+ // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
searchDataDisplay: [],
- total: 0
+ instance: null,
+ intervals: [],
+ layer: window.map,
+ L: window.L,
+ times: 5,
+ colors: ['#98FB98', '#ff0000']
}
},
methods: {
+ // 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
+ async handleSearch (data) {
+ // console.log(this.form.keyword)
+ const result = await mapApi.getSolidWaste(data)
+ this.searchDataDisplay = result.Result.DataInfo
+ },
+ // 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
+ async setBounced (val) {
+ const pos = [val.Latitude, val.Longitude]
+ window.map.flyTo(pos, 11)
+ const t1 = setTimeout(async () => {
+ const dataValue = {
+ StoragePlaceId: val.StoragePlaceId
+ }
+ // 寮规鏍囬
+ const title = val.Name
+ // 鍩烘湰淇℃伅 tabs
+ const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
+ // 璇︾粏淇℃伅灞曠ず table
+ const resultDetailed = await mapApi.getSolidWasteDetail(dataValue)
+
+ // 缁戝畾寮规瀹炰緥
+ this.instance && this.instance.closePopup()
+ const PublicBounced = window.Vue.extend(publicBounced)
+ this.instance = new PublicBounced().$mount()
+ document.body.appendChild(this.instance.$el)
+ // document.body.removeChild(instance.$el)
+ // 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
+ this.instance.setData(title, resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
+ this.setPanTo(pos, 250)
+ }, 1000)
+ console.log(t1)
+ // clearTimeout(t1)
+ this.pulseEffect(pos)
+ },
+
+ // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢
+ setPanTo (pos, value) {
+ var position = pos
+ position = window.map.latLngToLayerPoint(position)
+ position.y += value
+ position = window.map.layerPointToLatLng(position)
+ window.map.flyTo(position)
+ },
+ pulseEffect (xy) {
+ // 鎻掍欢 鏁堟灉瀹炵幇
+ var pulsingIcon = this.L.icon.pulse({
+ iconSize: [20, 20],
+ color: this.colors[0],
+ fillColor: ''
+ })
+ var picGroupMarker = this.L.marker(xy, { icon: pulsingIcon }).addTo(this.layer)
+ var times = this.times
+ // 瀹氭椂
+ var timeInterval = setInterval(() => {
+ if (times > 0) {
+ times--
+ } else {
+ clearInterval(timeInterval)
+ picGroupMarker.remove()
+ }
+ }, 1000)
+ },
+ // select鐨刼ption鐨勬暟鎹�夋嫨
handlePipelineType (val) {
- this.solidWasteTypeOptions.forEach((itm) => {
- if (val === itm.value) {
- this.dataTypeOptions = itm.options
- this.form.pipelineType = itm.label
- this.form.labelList = itm.labelList
+ this.solidWasteTypeOptions.forEach(item => {
+ if (val === item.value) {
+ this.handleSearch(item.value)
}
})
- this.form.dataType = this.dataTypeOptions[0].label
- this.form.key = this.dataTypeOptions[0].key
- },
- // 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
- async handleSearch () {
- // console.log(this.form.keyword)
- const result = await mapApi.getSolidWasteSurveyDetail()
- console.log(result)
- this.searchDataDisplay = result.Result.DataInfo
- this.total = result.Result.DataInfo.length
- },
- 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)
}
}
}
@@ -183,50 +223,4 @@
<style lang="less" scoped>
-.solidwaste-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 {
-
- }
-
- .search-radio {
- margin: 15px auto;
- display: flex;
- align-items: center;
- justify-content: space-around;
- }
-
- .location-btn:hover, .el-input__icon:hover {
- color: @color;
- cursor: pointer;
- }
-
- .box-card {
- margin: 15px auto;
- }
-}
</style>
--
Gitblit v1.8.0