From ca6c15a55e1aca6afc26885366eb7b23249b6968 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 14 四月 2021 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/SewersSearch.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 146a06e..8d0b517 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -61,7 +61,9 @@
<el-tab-pane label="鍒嗘瀽" name="second">
<SewersAnalysis></SewersAnalysis>
</el-tab-pane>
- <el-tab-pane label="鍘嗗彶" name="third">鍘嗗彶</el-tab-pane>
+ <el-tab-pane label="鍘嗗彶" name="third">
+ <SewersHistory></SewersHistory>
+ </el-tab-pane>
</el-tabs>
</div>
</template>
@@ -78,11 +80,13 @@
// 寮曞叆鍒嗘瀽缁勪欢鍐呭
import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
+import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
export default {
name: 'SewersSearch',
components: {
- SewersAnalysis
+ SewersAnalysis,
+ SewersHistory
},
data () {
return {
--
Gitblit v1.8.0