From f6e2c7d08bb4f29f38a77b9f789c6d7a47d5bebe Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期五, 14 五月 2021 11:20:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/panel/topicSearch/SolidWasteSearch.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 5814b50..da9c045 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -8,7 +8,7 @@
           <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
                      :popper-class="'select-down'">
             <el-option
-                v-for="item in solidWasteTypeOptions"
+                v-for="item in solidWasteTypeOptions.labelList"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value">

--
Gitblit v1.8.0