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 | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index f9a0dce..7f566af 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -8,59 +8,67 @@
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'),
+ EnterpriseEmergencySearch: () => import('@components/panel/topicSearch/EnterpriseEmergencySearch.vue')
}
-export const TopicList = [{
+export const topicList = [{
name: '姹℃煋婧�',
id: 1,
- check: false,
- isShow: true,
+ checked: false,
+ isShow: false,
icon: 'iconwuranyuan',
comp: ''
}, {
name: '搴熸按',
id: 2,
checked: false,
- isShow: true,
+ isShow: false,
icon: 'iconfs',
comp: ''
}, {
name: '搴熸皵',
id: 3,
checked: false,
- isShow: true,
+ isShow: false,
icon: 'iconfq',
comp: ''
}, {
name: '鍥哄簾',
id: 4,
checked: false,
- isShow: true,
+ isShow: false,
icon: 'icongf_green2',
comp: ''
}, {
name: '鐜椋庨櫓',
id: 5,
checked: false,
- isShow: true,
- icon: 'iconditu1',
+ isShow: false,
+ icon: 'iconditu',
comp: ''
-}, {
+}, /* {
name: '鍦熷￥鍙婂湴涓嬫按',
id: 6,
checked: false,
- isShow: true,
+ isShow: false,
icon: 'icondxs_green',
comp: ''
-}, {
+} */ {
name: '绠＄嚎',
id: 7,
checked: false,
- isShow: true,
+ isShow: false,
icon: 'iconguanxianxuncha',
comp: ''
}, {
+ name: '浼佷笟搴旀��',
+ id: 8,
+ checked: false,
+ isShow: false,
+ icon: 'iconqiye',
+ comp: ''
+} /* {
name: '绠￠亾鍙樻洿',
id: 8,
checked: false,
@@ -74,4 +82,4 @@
isShow: true,
icon: 'iconguanxianbiaozhu',
comp: ''
-}]
+} */]
--
Gitblit v1.8.0