From 3054bbce49457c82df9ad32523f3a0186e268d6f Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 28 五月 2021 21:17:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/conf/Topic.js | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index 7029bec..ff80c53 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -9,7 +9,7 @@
envProtectSearch: () => import('@components/panel/topicSearch/EnvRiskSearch'),
soilGroundWaterSearch: () => import('@components/panel/topicSearch/SoilGroundWaterSearch'),
sewersSearch: () => import('@components/panel/topicSearch/SewersSearch.vue'),
- ReportSearchL: () => import('@components/panel/topicSearch/ReportSearch.vue')
+ EnterpriseEmergencySearch: () => import('@components/panel/topicSearch/EnterpriseEmergencySearch.vue')
}
export const TopicList = [{
@@ -47,14 +47,14 @@
isShow: false,
icon: 'iconditu',
comp: ''
-}, {
+}, /* {
name: '鍦熷￥鍙婂湴涓嬫按',
id: 6,
checked: false,
isShow: false,
icon: 'icondxs_green',
comp: ''
-}, {
+} */ {
name: '绠＄嚎',
id: 7,
checked: false,
@@ -62,13 +62,13 @@
icon: 'iconguanxianxuncha',
comp: ''
}, {
- name: '搴旀�ュ浘灞�',
+ name: '浼佷笟搴旀��',
id: 8,
checked: false,
isShow: false,
- icon: 'iconguanxianyanghu',
+ icon: 'iconqiye',
comp: ''
-}/* {
+} /* {
name: '绠￠亾鍙樻洿',
id: 8,
checked: false,
--
Gitblit v1.8.0