From 204b8af237555feb1af83250dfdc28a5dc0a467c Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期一, 10 五月 2021 17:22:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/conf/Topic.js | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index f9a0dce..b343be2 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -8,7 +8,8 @@
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')
+ sewersSearch: () => import('@components/panel/topicSearch/SewersSearch.vue'),
+ ReportSearchL: () => import('@components/panel/topicSearch/ReportSearch.vue')
}
export const TopicList = [{
@@ -44,7 +45,7 @@
id: 5,
checked: false,
isShow: true,
- icon: 'iconditu1',
+ icon: 'iconditu',
comp: ''
}, {
name: '鍦熷￥鍙婂湴涓嬫按',
@@ -61,6 +62,13 @@
icon: 'iconguanxianxuncha',
comp: ''
}, {
+ name: '浼佷笟搴旀��',
+ id: 8,
+ checked: false,
+ isShow: true,
+ icon: 'iconguanxianxuncha',
+ comp: ''
+}/* {
name: '绠￠亾鍙樻洿',
id: 8,
checked: false,
@@ -74,4 +82,4 @@
isShow: true,
icon: 'iconguanxianbiaozhu',
comp: ''
-}]
+} */]
--
Gitblit v1.8.0