From 4adfa4774e09f3b388335bb8dee5dea518856e5b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期日, 30 五月 2021 19:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/conf/Topic.js | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index f0d22ff..7f566af 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -9,13 +9,13 @@
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 = [{
+export const topicList = [{
name: '姹℃煋婧�',
id: 1,
- check: false,
+ checked: false,
isShow: false,
icon: 'iconwuranyuan',
comp: ''
@@ -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,
@@ -66,9 +66,9 @@
id: 8,
checked: false,
isShow: false,
- icon: 'iconguanxianyanghu',
+ icon: 'iconqiye',
comp: ''
-}/* {
+} /* {
name: '绠￠亾鍙樻洿',
id: 8,
checked: false,
--
Gitblit v1.8.0