From 3072da92f3c3f08b2ee0ca03ee4e74b12f545b0e Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 26 五月 2021 21:31:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/panel/topicSearch/pipeInformationSearch.vue |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/components/panel/topicSearch/pipeInformationSearch.vue b/src/components/panel/topicSearch/pipeInformationSearch.vue
index 19b638f..b594913 100644
--- a/src/components/panel/topicSearch/pipeInformationSearch.vue
+++ b/src/components/panel/topicSearch/pipeInformationSearch.vue
@@ -15,6 +15,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>

--
Gitblit v1.8.0