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

yangdelong

2021-05-26 3072da92f3c3f08b2ee0ca03ee4e74b12f545b0e

 src/components/panel/topicSearch/pipeChangesSearch.vue

@@ -21,6 +21,12 @@
                        </el-option>
                    </el-select>
                </el-form-item>
                <div class="page_total">
                    <p>共计
                        <span>{{total}}</span>
                        条记录
                    </p>
                </div>
                <div class="rightButtonSearch">
                    <el-input  v-model="form.keyword" size="mini"  placeholder="在此输入关键字搜索"></el-input>
                    <el-button class="el-icon-search" @click="handleSearch"></el-button>