Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-05-10 204b8af237555feb1af83250dfdc28a5dc0a467c

 src/conf/Topic.js

@@ -8,7 +8,8 @@
  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'),
  ReportSearchL: () => import('@components/panel/topicSearch/ReportSearch.vue')
}

export const TopicList = [{
@@ -61,6 +62,13 @@
  icon: 'iconguanxianxuncha',
  comp: ''
}, {
  name: '企业应急',
  id: 8,
  checked: false,
  isShow: true,
  icon: 'iconguanxianxuncha',
  comp: ''
}/* {
  name: '管道变更',
  id: 8,
  checked: false,
@@ -74,4 +82,4 @@
  isShow: true,
  icon: 'iconguanxianbiaozhu',
  comp: ''
}]
} */]