Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-05-14 f6e2c7d08bb4f29f38a77b9f789c6d7a47d5bebe

 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">