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/conf/Topic.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index 12e42da..8e4e0d7 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 = [{
@@ -62,7 +62,7 @@
   icon: 'iconguanxianxuncha',
   comp: ''
 }, {
-  name: '搴旀�ュ浘灞�',
+  name: '浼佷笟搴旀��',
   id: 8,
   checked: false,
   isShow: false,

--
Gitblit v1.8.0