diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 65bd89553..b95b34e99 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -113,9 +113,7 @@ export default { }, mounted() { this.routes = this.$router.options.routes; - if (this.$route.fullPath.indexOf('design/userlist') >= 0) { - this.activePath = '/design/userlist/home'; - } else if (this.$route.fullPath.indexOf('design/usermap') >= 0) { + if (this.$route.fullPath.indexOf('design/usermap') >= 0) { this.activePath = '/design/usermap/home'; } else if (this.$route.fullPath.includes('design/lesson') || this.$route.fullPath.includes('design/script') || this.$route.fullPath.includes('design/runPlan') || this.$route.fullPath.includes('design/mapPreview')) { this.activePath = '/design/home'; diff --git a/src/views/components/filterCity/index.vue b/src/views/components/filterCity/index.vue index 5ebbb92dd..d783c8b92 100644 --- a/src/views/components/filterCity/index.vue +++ b/src/views/components/filterCity/index.vue @@ -46,9 +46,8 @@ export default { async loadInitData() { // 获取城市列表 this.filterOptions = []; - - let resp = this.$route.fullPath.includes('design/userlist') ? await this.$Dictionary.cityType() : await publisMapCityList('city_type'); - resp = this.$route.fullPath.includes('design/userlist') ? resp : resp.data; + let resp = await publisMapCityList('city_type'); + resp = resp.data; // const cityList = resp.sort((a, b) => { // return a.code.localeCompare(b.code); // }); diff --git a/src/views/demonstration/deomonList/index.vue b/src/views/demonstration/deomonList/index.vue index b3b1b9815..5acbc62e9 100644 --- a/src/views/demonstration/deomonList/index.vue +++ b/src/views/demonstration/deomonList/index.vue @@ -21,7 +21,7 @@ :filter-node-method="filterNode" :style="{height: height+'px'}" > -
+
{{ '['+data.map.name+']'+($t('global.trainingHasStart').replace('{name}', data.creator.nickname)) }} -
{{ roomName }}{{ $t('global.inviteJoinRoom') }}
+
{{ roomName }}{{ $t('global.inviteJoinRoom') }}
{{ $t('global.confirm') }} {{ $t('global.cancel') }} @@ -19,7 +19,6 @@