From 0cbf795f21d787db7d6b29a59d81579a7a736ab8 Mon Sep 17 00:00:00 2001 From: chenzeping <ChenZeping02609@163.com> Date: 星期五, 16 四月 2021 14:40:09 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/conf/Topic.js | 70 ++++++++++++++++++---------------- 1 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/conf/Topic.js b/src/conf/Topic.js index a8e25e4..bf99dfd 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') } @@ -14,60 +15,63 @@ name: '姹℃煋婧�', id: 1, check: false, - icon: '/assets/images/menu/special.png', - comp: 'dischargeSearch' + isShow: true, + icon: 'iconwuranyuan', + comp: '' }, { - name: '搴熸按鐩戞祴', + name: '搴熸按', id: 2, checked: false, - icon: '/assets/images/menu/special.png', - comp: 'envProtectSearch' + isShow: true, + icon: 'iconfs', + comp: '' }, { - name: '搴熸皵鐩戞祴', + name: '搴熸皵', id: 3, checked: false, - icon: '/assets/images/menu/special.png', - comp: 'dischargeSearch' + isShow: true, + icon: 'iconfq', + comp: '' }, { - name: '鍥哄簾绠$悊', + name: '鍥哄簾', id: 4, checked: false, - icon: '/assets/images/menu/special.png', - comp: 'envProtectSearch' + isShow: true, + icon: 'icongf_green2', + comp: '' }, { name: '鐜椋庨櫓', id: 5, checked: false, - icon: '/assets/images/menu/special.png', - comp: 'dischargeSearch' + isShow: true, + icon: 'iconditu1', + comp: '' }, { name: '鍦熷¥鍙婂湴涓嬫按', id: 6, checked: false, - icon: '/assets/images/menu/special.png', - comp: 'dischargeSearch' + isShow: true, + icon: 'icondxs_green', + comp: '' }, { - name: '姹¢洦姘寸缃�', + name: '绠$嚎', id: 7, checked: false, - icon: '/assets/images/menu/special.png', - comp: 'envProtectSearch' -}, { - name: '棰勮鎶ヨ', + isShow: true, + icon: 'iconguanxianxuncha', + comp: '' +}/*, { + name: '绠¢亾鍙樻洿', id: 8, checked: false, - icon: '/assets/images/menu/special.png', - comp: 'sewersSearch' + isShow: true, + icon: 'iconguanxianyanghu', + comp: '' }, { - name: '鎸囨爣缁熻', + 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' -}] + isShow: true, + icon: 'iconguanxianbiaozhu', + comp: '' +} */] -- Gitblit v1.8.0