From f3f693a10d00b75f1eafe7f029cbd99bd3c9825b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 07 四月 2021 10:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 118 ++++++----------------------------------------------------
1 files changed, 13 insertions(+), 105 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index b283cb1..eb42e35 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="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"
@@ -31,70 +28,18 @@
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
<el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
</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>
- <el-scrollbar style="height:500px">
- <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 list" :key="index" -->
- <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 list" :key="index" -->
- <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 list" :key="index" -->
- <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 list" :key="index" -->
- <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 list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- </el-scrollbar>
- <!-- <el-card class="box-card"-->
- <!-- v-for="(item,index) in searchDataDisplay"-->
- <!-- :key="index">-->
- <!-- <div>-->
- <!-- {{ item.CompanyName }}-->
- <!-- </div>-->
- <!-- </el-card>-->
</div>
- <!-- <el-scrollbar style="height:100%">-->
- <!-- </el-scrollbar>-->
+ <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>
@@ -184,6 +129,7 @@
// 鏁版嵁鐨勪紶閫�
transferData: ''
},
+ // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
searchDataDisplay: []
}
},
@@ -212,43 +158,5 @@
</script>
<style lang="less" scoped>
-.el-radio.is-checked .levelOfRisk-type {
- color: #409EFF
-}
-
-.levelOfRisk {
- padding-left: 20px
-}
-
-.levelOfRisk .el-radio {
- padding-bottom: 6px
-}
-
-.environmental-risk-list {
- border: 1px solid @color;
- margin-right: 10px;
- margin-bottom: 15px;
- position: relative;
- padding-left: 50px;
- padding-top: 3px;
- padding-bottom: 3px;
- color: #f5f5f5;
-
- .state {
- width: 30px;
- height: 30px;
- position: absolute;
- top: 50%;
- left: 10px;
- margin-top: -15px;
- border-radius: 50%;
- box-shadow: 0 0 3px #000;
- background: #0B3B6D;
- }
-}
-
-.el-input {
- margin: 15px auto;
-}
</style>
--
Gitblit v1.8.0