diff --git a/public/favicon.png b/public/favicon.png
index 79b86d820..0af73dedc 100644
Binary files a/public/favicon.png and b/public/favicon.png differ
diff --git a/src/layout/components/Entry.vue b/src/layout/components/Entry.vue
index f9483f21c..cbc0506dc 100644
--- a/src/layout/components/Entry.vue
+++ b/src/layout/components/Entry.vue
@@ -31,22 +31,22 @@ export default {
{
name: 'global.designPlatformEntrance',
handle: this.goToDesign,
- hidden: getSessionStorage('design')
+ hidden: getSessionStorage('project') === 'design'
},
{
name: 'global.trainingPlatformEntrance',
handle: this.goToTraining,
- hidden: !getSessionStorage('design')
+ hidden: getSessionStorage('project') !== 'design'
},
{
name: 'global.scan',
handle: this.qcodeEntry,
- hidden: process.env.NODE_ENV != 'development' || getSessionStorage('design')
+ hidden: process.env.NODE_ENV != 'development' || getSessionStorage('project') === 'design'
},
{
name: 'global.quickEntry',
handle: this.quickEntry,
- hidden: getSessionStorage('design')
+ hidden: getSessionStorage('project') === 'design'
},
{
name: LangStorage.getLang('zh')==='zh'?'English':'中文',
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 933002e60..ab89cc52a 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -101,10 +101,10 @@ export default {
])
},
mounted() {
- this.routes = this.$router.options.routes;
+ 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/lesson')>=0 || this.$route.fullPath.indexOf('design/script')>=0 || this.$route.fullPath.indexOf('design/runPlan')>=0) {
+ this.activePath='/design/userlist/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';
} else {
this.activePath=this.$route.path;
diff --git a/src/layout/components/Title.vue b/src/layout/components/Title.vue
index 2e34d0ad5..c9b33a6bd 100644
--- a/src/layout/components/Title.vue
+++ b/src/layout/components/Title.vue
@@ -1,39 +1,30 @@
-