From 5208bc41f03abb828987d9193be6a809a64e52ac Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 15 四月 2021 09:41:24 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 60 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 3457c1d..5da507e 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -29,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>
@@ -52,6 +53,33 @@
data () {
return {
judgeVisible: true,
+ form: {
+ keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
+ // 鏁版嵁鐨勪紶閫�
+ transferData: 1
+ },
+ levelOfRisk: [
+ {
+ name: '鍏ㄩ儴',
+ value: 1
+ },
+ {
+ name: '姝ｅ父',
+ value: 2
+ },
+ {
+ name: '棰勮',
+ value: 3
+ }
+ ],
+ // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
+ searchDataDisplay: [],
+ instance: null,
+ intervals: [],
+ layer: window.map,
+ L: window.L,
+ times: 5,
+ colors: ['#98FB98', '#ff0000'],
solidWasteTypeOptions: [{
value: '1',
label: '鍖哄煙',
@@ -116,34 +144,7 @@
label: '闀垮害(m)',
key: 'length'
}]
- }],
- form: {
- keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
- // 鏁版嵁鐨勪紶閫�
- transferData: 1
- },
- levelOfRisk: [
- {
- name: '鍏ㄩ儴',
- value: 1
- },
- {
- name: '姝ｅ父',
- value: 2
- },
- {
- name: '棰勮',
- value: 3
- }
- ],
- // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
- searchDataDisplay: [],
- instance: null,
- intervals: [],
- layer: window.map,
- L: window.L,
- times: 5,
- colors: ['#98FB98', '#ff0000']
+ }]
}
},
methods: {
@@ -152,6 +153,7 @@
// console.log(this.form.keyword)
const result = await mapApi.getSolidWaste(data)
this.searchDataDisplay = result.Result.DataInfo
+ console.log(this.searchDataDisplay)
},
// 涓嶅悓绫诲瀷鍥剧墖灏佽
differentTypes (judgeValue) {
--
Gitblit v1.8.0