From c56e506fd34c58209240e97fc29043639fae5d19 Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期四, 29 四月 2021 15:13:21 +0800
Subject: [PATCH] 统计表,指标,预报警表格弹框公共修改,管线分析功能
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 83 ++++++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 39 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 8649d6b..a57c29f 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -15,13 +15,11 @@
</el-option>
</el-select>
</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
- }}</span>
+ <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>
@@ -31,7 +29,8 @@
<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>
+ <!-- <i class="state"></i>-->
+ <img src="../../../../public/assets/images/map/solidwaste/gf_green2.png" alt="" class="state">
<div>
<h3>###鐐煎寲閮�</h3>
<p>鎵�灞為儴闂細<span>{{ item.Name }}</span></p>
@@ -45,28 +44,41 @@
<script>
import mapApi from '@/api/mapApi'
-import WfsHelper from '@components/helpers/WfsHelper'
+import WasteSolidIndex from '@/components/BaseNav/WasteSolid/WasteSolidIndex'
export default {
name: 'SolidWasteSearch',
props: ['title'],
data () {
return {
+ judgeVisible: true,
+ form: {
+ keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
+ // 鏁版嵁鐨勪紶閫�
+ transferData: 1
+ },
levelOfRisk: [
{
name: '鍏ㄩ儴',
- value: '1'
+ value: 1
},
{
name: '姝ｅ父',
- value: '2'
+ value: 2
},
{
name: '棰勮',
- value: '3'
+ value: 3
}
],
- judgeVisible: true,
+ // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
+ searchDataDisplay: [],
+ instance: null,
+ intervals: [],
+ layer: window.map,
+ L: window.L,
+ times: 5,
+ colors: ['#98FB98', '#ff0000'],
solidWasteTypeOptions: [{
value: '1',
label: '鍖哄煙',
@@ -131,25 +143,11 @@
label: '闀垮害(m)',
key: 'length'
}]
- }],
- radio: '1',
- form: {
- keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
- // 鏁版嵁鐨勪紶閫�
- transferData: ''
- },
- // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
- searchDataDisplay: []
+ }]
}
},
methods: {
- setBounced (val) {
- console.log(val)
- const bound = this.L.geoJSON([val], {}).getBounds()
- // var layer = window.layerFactory.flyByLayerId(val.id, bound)
- window.map.flyToBounds(bound)
- // layer && layer.openPopup()
- },
+ // select鐨刼ption鐨勬暟鎹�夋嫨
handlePipelineType (val) {
this.solidWasteTypeOptions.forEach(item => {
if (val === item.value) {
@@ -159,18 +157,25 @@
},
// 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
async handleSearch (data) {
- // // console.log(this.form.keyword)
- // const result = await mapApi.getSolidWaste(data)
- // console.log(result)
- // this.searchDataDisplay = result.Result.Result
- var wfsHelper = new WfsHelper()
- wfsHelper.addTypeName('鍥哄簾')
- wfsHelper.addLike('name', this.form.keyword)
- const res = await mapApi.getSolidWaste(wfsHelper.getUrl(), {})
- console.log(res)
- // if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
- this.searchDataDisplay = res.Result.Result
- // }
+ // console.log(this.form.keyword)
+ const result = await mapApi.getSolidWaste(data)
+ this.searchDataDisplay = result.Result.DataInfo
+ },
+ // 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
+ setBounced (val) {
+ console.log(val)
+ const pos = [val.Latitude, val.Longitude]
+ window.map.flyTo(pos, 15)
+ window.$layer.open({
+ content: {
+ content: WasteSolidIndex, // 缁勪欢
+ parent: this, // 鐖剁粍浠�
+ data: { // 浼犻�掔殑鍙傛暟
+ storagePlaceId: val.StoragePlaceId
+ }
+ },
+ title: val.Name
+ })
}
}
}
--
Gitblit v1.8.0