From 4378ba833ffd5262c78a8c6c8b92d8c1c744d379 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 07 四月 2021 11:03:45 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 75 +++++++++++++++----------------------
1 files changed, 30 insertions(+), 45 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 9145c0b..eb42e35 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -1,9 +1,6 @@
<template>
- <div class="query-search" v-if="judgeVisible">
- <div class="search-title">
- <span>鍥哄簾</span>
- <!-- <span>{{ title }}</span>-->
- </div>
+ <div class="sewers-search" v-if="judgeVisible">
+ <div class="search-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,35 +15,31 @@
</el-option>
</el-select>
</el-form-item>
- <el-radio-group v-model="radio" class="levelOfRisk">
- <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index">
- <span class="levelOfRisk-type">{{ item.name }}</span>
- </el-radio>
+ <!-- <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>
+ </div> -->
+ <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>
</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>
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
+ <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
</div>
</el-form>
- <el-scrollbar style="height:300px">
- <div class="environmental-risk-list">
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :key="index">
- <i class="state"></i>
- <div>
- <h3>{{ item.StoragePlaceTypeName }}</h3>
- <p>鎵�灞為儴闂細<span>{{ item.CompanyName }}</span></p>
- <p>椋庨櫓绾у埆锛�<span>{{ item.StoragePlaceTypeName }}</span></p>
- </div>
- </div>
- </el-scrollbar>
</div>
+ <el-scrollbar style="height:286.22px">
+ <div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :key="index" ><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ </el-scrollbar>
</div>
</template>
@@ -60,18 +53,9 @@
data () {
return {
levelOfRisk: [
- {
- name: '鍏ㄩ儴',
- value: '1'
- },
- {
- name: '姝ｅ父',
- value: '2'
- },
- {
- name: '棰勮',
- value: '3'
- }
+ { name: '鍏ㄩ儴', value: '1' },
+ { name: '姝ｅ父', value: '2' },
+ { name: '棰勮', value: '3' }
],
judgeVisible: true,
solidWasteTypeOptions: [{
@@ -151,8 +135,13 @@
},
methods: {
handlePipelineType (val) {
+ // console.log(val)
this.solidWasteTypeOptions.forEach(item => {
+ // console.log(item.value)
if (val === item.value) {
+ // console.log('鏁版嵁閫夋嫨鐩稿悓')
+ // 鎺ユ敹鏁版嵁 鐢ㄤ簬涔嬪悗鎺ュ彛鏁版嵁鐨勮皟鐢�
+ // this.form.transferData = item.value
this.handleSearch(item.value)
}
})
@@ -169,9 +158,5 @@
</script>
<style lang="less" scoped>
-
-.el-scrollbar {
- margin: 15px auto;
-}
</style>
--
Gitblit v1.8.0