From 03c94a9079454f7d894b66bc4855e880aeee4e49 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 15 四月 2021 18:19:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/WaterWasteSearch.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/components/panel/topicSearch/WaterWasteSearch.vue b/src/components/panel/topicSearch/WaterWasteSearch.vue
index 246cd39..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">
@@ -33,8 +32,8 @@
<!-- <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>
@@ -142,7 +141,8 @@
}],
radio: '1',
form: {
- keyword: '杈撳叆鍏抽敭瀛�'
+ keyword: '杈撳叆鍏抽敭瀛�',
+ type: '1'
},
searchDataDisplay: [],
total: 0
--
Gitblit v1.8.0