From c169ee517f0620f86689ea08db5e3e24f01446bc Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 15 四月 2021 17:58:28 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/panel/topicSearch/WaterWasteSearch.vue |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/panel/topicSearch/WaterWasteSearch.vue b/src/components/panel/topicSearch/WaterWasteSearch.vue
index edad7fb..a594241 100644
--- a/src/components/panel/topicSearch/WaterWasteSearch.vue
+++ b/src/components/panel/topicSearch/WaterWasteSearch.vue
@@ -16,9 +16,8 @@
           </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 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">
@@ -30,10 +29,11 @@
     <el-scrollbar style="height:264px">
       <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" @click="handleLocation(item)">
         <!-- v-for="(item,index) in list" :key="index" -->
-        <i class="state"></i>
+<!--        <i class="state"></i>-->
+        <img src="../../../../public/assets/images/map/wastewater/fs_bright_green.png" alt="" class="state">
         <div>
-          <h3>###鐐煎寲閮�</h3>
-          <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+          <h3>{{ item.Name }}</h3>
+          <p>鎵�灞為儴闂細<span>{{ item.portName }}</span></p>
           <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
         </div>
       </div>
@@ -141,7 +141,8 @@
       }],
       radio: '1',
       form: {
-        keyword: '杈撳叆鍏抽敭瀛�'
+        keyword: '杈撳叆鍏抽敭瀛�',
+        type: '1'
       },
       searchDataDisplay: [],
       total: 0

--
Gitblit v1.8.0