From 5bd3c6fc05b2548195ebe78bc4cec04886b51ca2 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 02 四月 2021 14:22:03 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/conf/Topic.js | 25 ++++---------------------
1 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index a8e25e4..cf856cf 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -6,7 +6,8 @@
export const TopicComp = {
dischargeSearch: () => import('@components/panel/topicSearch/DischargeSearch'),
- envProtectSearch: () => import('@components/panel/topicSearch/EnvProtectSearch'),
+ envProtectSearch: () => import('@components/panel/topicSearch/EnvRiskSearch'),
+ soilGroundWaterSearch: () => import('@components/panel/topicSearch/SoilGroundWaterSearch'),
sewersSearch: () => import('@components/panel/topicSearch/SewersSearch.vue')
}
@@ -39,35 +40,17 @@
id: 5,
checked: false,
icon: '/assets/images/menu/special.png',
- comp: 'dischargeSearch'
+ comp: 'envProtectSearch'
}, {
name: '鍦熷￥鍙婂湴涓嬫按',
id: 6,
checked: false,
icon: '/assets/images/menu/special.png',
- comp: 'dischargeSearch'
+ comp: 'soilGroundWaterSearch'
}, {
name: '姹￠洦姘寸缃�',
id: 7,
checked: false,
icon: '/assets/images/menu/special.png',
comp: 'envProtectSearch'
-}, {
- name: '棰勮鎶ヨ',
- id: 8,
- checked: false,
- icon: '/assets/images/menu/special.png',
- comp: 'sewersSearch'
-}, {
- name: '鎸囨爣缁熻',
- id: 9,
- checked: false,
- icon: '/assets/images/menu/special.png',
- comp: 'envProtectSearch'
-}, {
- name: '搴旀�ュ湴鍥�',
- id: 10,
- checked: false,
- icon: '/assets/images/menu/special.png',
- comp: 'sewersSearch'
}]
--
Gitblit v1.8.0