From 3c93d885a3bc6a84079cc347bb30888d5fb98f11 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 13 四月 2021 15:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/conf/Topic.js |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index da2e42f..bcf296e 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -7,6 +7,7 @@
 export const TopicComp = {
   dischargeSearch: () => import('@components/panel/topicSearch/DischargeSearch'),
   envProtectSearch: () => import('@components/panel/topicSearch/EnvRiskSearch'),
+  soilGroundWaterSearch: () => import('@components/panel/topicSearch/SoilGroundWaterSearch'),
   sewersSearch: () => import('@components/panel/topicSearch/SewersSearch.vue')
 }
 
@@ -14,42 +15,49 @@
   name: '姹℃煋婧�',
   id: 1,
   check: false,
+  isShow: true,
   icon: '/assets/images/menu/special.png',
-  comp: 'dischargeSearch'
+  comp: ''
 }, {
-  name: '搴熸按鐩戞祴',
+  name: '搴熸按',
   id: 2,
   checked: false,
+  isShow: true,
   icon: '/assets/images/menu/special.png',
-  comp: 'envProtectSearch'
+  comp: ''
 }, {
-  name: '搴熸皵鐩戞祴',
+  name: '搴熸皵',
   id: 3,
   checked: false,
+  isShow: true,
   icon: '/assets/images/menu/special.png',
-  comp: 'dischargeSearch'
+  comp: ''
 }, {
-  name: '鍥哄簾绠$悊',
+  name: '鍥哄簾',
   id: 4,
   checked: false,
+  isShow: true,
   icon: '/assets/images/menu/special.png',
-  comp: 'envProtectSearch'
+  comp: ''
 }, {
   name: '鐜椋庨櫓',
   id: 5,
   checked: false,
+  isShow: true,
   icon: '/assets/images/menu/special.png',
-  comp: 'dischargeSearch'
+  comp: ''
 }, {
   name: '鍦熷¥鍙婂湴涓嬫按',
   id: 6,
   checked: false,
+  isShow: true,
   icon: '/assets/images/menu/special.png',
-  comp: 'dischargeSearch'
+  comp: ''
 }, {
-  name: '姹¢洦姘寸缃�',
+  name: '绠$嚎',
   id: 7,
   checked: false,
+  isShow: true,
   icon: '/assets/images/menu/special.png',
-  comp: 'envProtectSearch'
+  comp: ''
 }]

--
Gitblit v1.8.0