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 | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index fabcccc..eb42e35 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -29,16 +29,17 @@
<el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
</div>
</el-form>
- <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>
@@ -128,6 +129,7 @@
// 鏁版嵁鐨勪紶閫�
transferData: ''
},
+ // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
searchDataDisplay: []
}
},
--
Gitblit v1.8.0