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/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 @@
 
 <template>
-    <div class="avatar-container" style="margin-left:40px;">
-        <img class="logo" :src="logoImg"  @click="goToMain"/>
-        <div class="titleInner" style="margin-left:60px;" @click="goToMain">{{systemTitle}}</div>
-    </div>
+  <div class="avatar-container" style="margin-left:40px;">
+    <img class="logo" :src="logoImg" @click="goToMain">
+    <div class="titleInner" style="margin-left:60px;" @click="goToMain">{{ systemTitle }}</div>
+  </div>
 </template>
 <script>
 import logoImg from '@/assets/logo_changan.png';
 import { getSessionStorage } from '@/utils/auth';
-import { UrlConfig } from '@/router/index';
 import { loginTitle } from '@/scripts/ConstDic';
 
 export default {
-    data() {
+	data() {
 		return {
-            logoImg: logoImg,
-            systemTitle:"城市轨道交通实训平台"
+			logoImg: logoImg,
+			systemTitle: '城市轨道交通实训平台'
 		};
-  },
-  mounted(){
-        if (getSessionStorage('design')) {
-            this.systemTitle="城市轨道交通设计平台";
-        }
-        else{
-            this.systemTitle=loginTitle[getSessionStorage('project')||'default'];
-        }
-  },
-  methods:{
-      goToMain(){
-        //   if (getSessionStorage('design')) {
-        //       this.$router.push({ path: `${UrlConfig.design.prefix}/home`});
-        //   }
-      }
-  }
-}
+	},
+	mounted() {
+		this.systemTitle=loginTitle[getSessionStorage('project')];
+	},
+	methods: {
+		goToMain() {
+		}
+	}
+};
 </script>
 <style lang="scss" scoped>
 .main-container .navbar .avatar-container {
diff --git a/src/permission.js b/src/permission.js
index 3a903bc62..3ea041d76 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -32,8 +32,7 @@ function getRouteInfo(to) {
 		getTokenInfo = getDesignToken;
 		clientId = LoginParams.Design.clientId;
 	} else if (/^\/plan/.test(toRoutePath) || /^\/display\/plan/.test(toRoutePath)) {
-		const flag = getSessionStorage('design');
-		if (flag == 'true') {
+		if (getSessionStorage('project')==='design') {
 			loginPath = loginDesignPage;
 			getTokenInfo = getDesignToken;
 			clientId = LoginParams.Design.clientId;
@@ -56,9 +55,8 @@ function handleRoute(to, from, next, routeInfo) {
 		// 拉取用户信息
 		store.dispatch('GetInfo', routeInfo.getTokenInfo).then(res => {
 			// 根据roles权限生成可访问的路由表
-			// debugger;
 			const roles = res.roles;
-			if (getSessionStorage('design')) {
+			if (getSessionStorage('project')==='design') {
 				roles.push(userDesign);
 			}
 			store.dispatch('GenerateRoutes', { roles, clientId: routeInfo.clientId }).then(() => {
@@ -82,7 +80,7 @@ function handleRoute(to, from, next, routeInfo) {
 		// 除没有动态改变权限的需求可直接next() 删下方权限判断
 		if (hasPermission(store.getters.roles, to.meta.roles)) {
 			if (to.path==='/404' && to.redirectedFrom==='/') {
-				if (getSessionStorage('design') === 'true') {
+				if (getSessionStorage('project') === 'design') {
 					next('/design/home');
 				} else {
 					next(localStore.get('trainingPlatformRoute'+store.getters.id) ||'/trainingPlatform');
diff --git a/src/router/index.js b/src/router/index.js
index 9015b4fbb..1c5bdd649 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1065,7 +1065,7 @@ const router = createRouter();
 
 router.beforeEach((to, from, next) => {
 	const project = getSessionStorage('project');
-	document.title = loginTitle[project];
+	document.title = loginTitle[project||'login'];
 	next();
 });
 
diff --git a/src/settings.js b/src/settings.js
index 6ade17d44..a7ee1e069 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-	title: '城市轨道交通实训平台',
+	title: '',
 
 	/**
    * @type {boolean} true | false
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 9dac93ba1..b9d1900d3 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -48,7 +48,7 @@ function hasPermission(roles, route, parentsRoles) {
 		// 	}
 		// }
 		// return roles.some(role => route.meta.roles.indexOf(role) >= 0);
-		if (getSessionStorage('design')) {
+		if (getSessionStorage('project')==='design') {
 			roles= roles.filter(function (role) {
 				return route.meta.roles.indexOf(role) >= 0;
 			});
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index d265b4ef0..4aa97f68e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,4 +1,4 @@
-import { setSessionStorage, removeSessionStorage } from '@/utils/auth';
+import { setSessionStorage } from '@/utils/auth';
 import { login, logout, getInfo } from '@/api/login';
 import { getToken, setToken, removeToken, getDesignToken, setDesignToken, removeDesignToken, handleToken, handleRemoveToken } from '@/utils/auth';
 import { getUserConfigInfo } from '@/api/management/user';
@@ -88,12 +88,6 @@ const user = {
 
 				// 登录系统
 				login(params).then(resp => {
-					if (userInfo.type == 'design') {
-						removeSessionStorage('design');
-						setSessionStorage('design', true);
-					} else {
-						removeSessionStorage('design');
-					}
 					execFc(resp.data);
 					resolve();
 				}).catch(error => { reject(error); });
@@ -104,7 +98,6 @@ const user = {
 		QrLoginSetting({ dispatch, commit }, token) {
 			return new Promise((resolve, reject) => {
 				// 设置user域token值
-				removeSessionStorage('design');
 				commit(token.key, token.value);
 				const header = { group: '', 'X-Token': token.value };
 				creatSubscribe(perpetualTopic, header);
@@ -173,7 +166,6 @@ const user = {
 					commit('SET_TOKEN', '');
 					commit('SET_ROLES', []);
 					commit('SET_ID', '');
-					removeSessionStorage('design');
 					Cookies.remove('UserDesignName');
 					Cookies.remove('UserDesignToken');
 					Cookies.remove('UserName');
diff --git a/src/views/demonstration/deomonList/index.vue b/src/views/demonstration/deomonList/index.vue
index a3b6d72ed..089fa8041 100644
--- a/src/views/demonstration/deomonList/index.vue
+++ b/src/views/demonstration/deomonList/index.vue
@@ -105,7 +105,7 @@ export default {
 					launchFullscreen();
 					await putJointTrainingSimulationEntrance(this.group);
 					const rest = await getPublishMapInfo(this.mapId);
-					const query = { skinCode: rest.data.skinCode, mapId: this.mapId, group: this.group };
+					const query = { skinCode: rest.data.skinCode, mapId: this.mapId, group: this.group, subSystem: this.$route.query.subSystem };
 					this.$router.push({ path: `/jointTraining`, query: query });
 				} else if (this.state == '01') {
 					const query = { group: this.group };
diff --git a/src/views/jointTraining/menuDemon.vue b/src/views/jointTraining/menuDemon.vue
index a0847e377..67c8a7a6c 100644
--- a/src/views/jointTraining/menuDemon.vue
+++ b/src/views/jointTraining/menuDemon.vue
@@ -298,7 +298,7 @@ export default {
 		back() {
 			this.$store.dispatch('training/over').then(() => {
 				putJointTrainingSimulationUser(this.group).then(() => {
-					this.$router.push({ path: `/trainroom`, query: { skinCode: this.$route.query.skinCode, group: this.group, subSystem: this.$route.query.subSystem } });
+					this.$router.replace({ path: `/trainroom`, query: { skinCode: this.$route.query.skinCode, group: this.group, subSystem: this.$route.query.subSystem } });
 					exitFullscreen();
 				});
 			});
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index dd67eca3e..2e2b84954 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -173,7 +173,6 @@ export default {
 			model.type = this.modelType;
 			this.$store.dispatch('Login', model).then(() => {
 				this.$store.dispatch('SetAccount', model.username);
-				this.setProjectSession();
 				this.handleLoginSucessRoute();
 			}).catch(error => {
 				if (error.code==='30001') {
@@ -204,12 +203,6 @@ export default {
 			removeDesignToken();
 			setSessionStorage('project', this.project);
 		},
-		setProjectSession() {
-			if (this.project === 'design') {
-				removeSessionStorage('design');
-				setSessionStorage('design', true);
-			}
-		},
 		clearTimer(timer) {
 			if (timer) {
 				clearTimeout(timer);
@@ -289,7 +282,6 @@ export default {
 					}
 					this.$store.dispatch('Login', model).then(() => {
 						this.$store.dispatch('SetAccount', model.username);
-						this.setProjectSession();
 						this.handleLoginSucessRoute();
 					}).catch(error => {
 						if (error.code==='30001') {
diff --git a/src/views/map/mapdraft/mapmanage/operateMenu.vue b/src/views/map/mapdraft/mapmanage/operateMenu.vue
index c6f3a511f..6c4d7ff4a 100644
--- a/src/views/map/mapdraft/mapmanage/operateMenu.vue
+++ b/src/views/map/mapdraft/mapmanage/operateMenu.vue
@@ -3,7 +3,7 @@
     <pop-menu ref="popMenu" :menu="menu" />
     <map-edit ref="edit" :basic-info="true" :map="editModel" :skin-code="skinCode" @refresh="refresh" />
     <!-- <map-edit ref="axisEdit" :basic-info="false" :map="editModel" :skin-code="skinCode" @refresh="refresh" /> -->
-    <!-- <map-save-as ref="saveAs" :map="editModel" @refresh="refresh" /> -->
+    <map-save-as ref="saveAs" :map="editModel" @refresh="refresh" />
     <map-publish ref="publish" :map="editModel" />
   </div>
 </template>
@@ -14,7 +14,7 @@ import { DeviceMenu } from '@/scripts/ConstDic';
 import { UrlConfig } from '@/router/index';
 import PopMenu from '@/components/PopMenu';
 import MapEdit from './edit';
-// import MapSaveAs from './saveAs';
+import MapSaveAs from './saveAs';
 import MapPublish from './publish';
 import { mapGetters } from 'vuex';
 
@@ -23,7 +23,7 @@ export default {
 	components: {
 		PopMenu,
 		MapEdit,
-		// MapSaveAs,
+		MapSaveAs,
 		MapPublish
 	},
 	props: {
@@ -51,10 +51,10 @@ export default {
 				// 	label: this.$t('map.updateObjAxis'),
 				// 	handler: this.updateObjAxis
 				// },
-				// {
-				// 	label: this.$t('map.saveAs'),
-				// 	handler: this.saveAs
-				// },
+				{
+					label: this.$t('map.saveAs'),
+					handler: this.saveAs
+				},
 				{
 					label: this.$t('map.deleteObj'),
 					handler: this.deleteObj
diff --git a/src/views/trainRoom/index.vue b/src/views/trainRoom/index.vue
index 6b33f5c9b..01c76b229 100644
--- a/src/views/trainRoom/index.vue
+++ b/src/views/trainRoom/index.vue
@@ -462,7 +462,8 @@ export default {
 			};
 
 			if (data.state == '03') { // 房间销毁
-				this.$router.push({ path: `/trainingPlatform/detail/${this.$route.query.subSystem}`, query: {mapId: this.mapId}});
+				// this.$router.push({ path: `/trainingPlatform/detail/${this.$route.query.subSystem}`, query: {mapId: this.mapId}});
+				this.$router.go(-1);
 			} else if (data.state == '01') { // 进入准备中
 				this.starting = false;
 			} else if (data.state == '02') {
@@ -470,7 +471,7 @@ export default {
 				await putJointTrainingSimulationEntrance(param.group);
 				const rest = await getPublishMapInfo(param.mapId);
 				const query = { skinCode: rest.data.skinCode, mapId: param.mapId, group: param.group, subSystem: this.$route.query.subSystem };
-				this.$router.push({ path: `/jointTraining`, query: query });
+				this.$router.replace({ path: `/jointTraining`, query: query });
 				launchFullscreen();
 			}
 			this.$store.dispatch('socket/setJointRoomInfo'); // 清空房间信息
@@ -492,7 +493,7 @@ export default {
 			await putJointTrainingSimulationEntrance(this.$route.query.group);
 			const rest = await getPublishMapInfo(this.mapId);
 			const query = { skinCode: rest.data.skinCode, mapId: this.mapId, group: this.$route.query.group, subSystem: this.$route.query.subSystem };
-			this.$router.push({ path: `/jointTraining`, query: query });
+			this.$router.replace({ path: `/jointTraining`, query: query });
 			launchFullscreen();
 		},
 		// 判断观众席在线/不在线