问题调整

src/router/index.js

@@ -358,11 +358,11 @@ export const asyncRouter = [
 						component: Mapedit,
 						hidden: true
 					},
-					// {
+					{
-					// 	path: 'lesson/edit/:type',
+						path: 'lesson/edit/:type',
-					// 	component: LessonEdit,
+						component: LessonEdit,
-					// 	hidden: true
+						hidden: true
-					// },
+					},
 					{
 						path: 'runPlan/detail/:mapId',
 						component: PlanMonitorDetail,

src/utils/baseUrl.js

@@ -3,8 +3,8 @@ export function getBaseUrl() {
 	let BASE_API;
 	if (process.env.NODE_ENV === 'development') {
 		// BASE_API = 'https://joylink.club/jlcloud';
-		BASE_API = 'https://test.joylink.club/jlcloud';
+		// BASE_API = 'https://test.joylink.club/jlcloud';
-		// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
+		BASE_API = 'http://192.168.3.5:9000'; // 袁琪
 		// BASE_API = 'http://192.168.3.6:9000'; // 旭强
 		// BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
 	} else {

src/views/exam/index.vue

@@ -46,6 +46,11 @@ export default {
 			loading: false
 		};
 	},
+	watch: {
+		$route(newVal) {
+			this.loadInitPage();
+		}
+	},
 	mounted() {
 		this.loadInitPage();
 	},

src/views/lesson/home.vue

@@ -314,7 +314,7 @@ export default {
 			});
 		},
 		treeSort(index, row) {
-			this.$router.push({path: `${UrlConfig.design.lessonEdit}/treeSort`, query: row});
+			this.$router.push({path: `${UrlConfig.design.lessonEdit}/treeSort`, query: {id: row.id}});
 		},
 		taskManage() {
 			this.$router.push({path: `${UrlConfig.design.taskManage}`, query: {mapId: this.$route.params.mapId, skinCode: this.$route.params.skinCode}});

src/views/teach/detail/index.vue

@@ -57,6 +57,7 @@ import LimitList from '@/views/components/limits/index';
 import { getSessionStorage, setSessionStorage } from '@/utils/auth';
 import { trainingNotify } from '@/api/simulation';
 import { launchFullscreen } from '@/utils/screen';
+import localStore from 'storejs';
 
 export default {
 	name: 'LessonDetail',
@@ -205,6 +206,7 @@ export default {
 			}
 		},
 		backLessonList() {
+			localStore.remove('teachDetail'+this.$route.query.mapId);
 			this.$router.push({ path: `${UrlConfig.trainingPlatform.teachHome}/${this.$route.params.subSystem}`});
 		}
 	}

src/views/teach/index.vue

@@ -68,6 +68,7 @@ export default {
 			}
 		},
 		goLesson(row) {
+			localStore.set('teachDetail'+row.mapId, `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.params.subSystem}?lessonId=${row.id}&mapId=${row.mapId}&prdCode=${row.prdCode}`);
 			this.$router.push({ path: `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.params.subSystem}`, query: {lessonId: row.id, mapId: row.mapId, prdCode: row.prdCode}});
 		}
 	}

src/views/trainingPlatform/demonList.vue

@@ -34,7 +34,7 @@
 </template>
 <script>
 import { getPublishMapTree } from '@/api/management/mapprd';
-import { getTrainingSystemList, getTrainingSystemListByMapId, getSubSystemInfo } from '@/api/trainingPlatform';
+import { getTrainingSystemList, getSubSystemInfo } from '@/api/trainingPlatform';
 import { UrlConfig } from '@/router/index';
 import FilterCity from '@/views/components/filterCity';
 import localStore from 'storejs';
@@ -87,9 +87,6 @@ export default {
 	beforeDestroy () {
 	},
 	mounted() {
-		// if (this.project === 'xty') {
-		// 	this.projectInitData('18');
-		// }
 	},
 	methods: {
 		filterNode(value, data) {
@@ -116,6 +113,7 @@ export default {
 				this.$router.push({ path: `${UrlConfig.trainingPlatform.permission}/${this.mapId}`});
 			} else if ( obj.type === 'MapSystem') {
 				getSubSystemInfo(obj.id).then(resp => {
+					// let router = '';
 					switch (resp.data.type) {
 					case 'Exam':
 						this.setLocalRoute(`${UrlConfig.trainingPlatform.examHome}/${obj.id}`);
@@ -123,8 +121,15 @@ export default {
 						this.$router.push({ path: `${UrlConfig.trainingPlatform.examHome}/${obj.id}`});
 						break;
 					case 'Lesson':
+
 						this.setLocalRoute(`${UrlConfig.trainingPlatform.teachHome}/${obj.id}`);
 						// this.$router.push({ path: `${UrlConfig.trainingPlatform.teachDetail}/${obj.id}`});
+						/* router = localStore.get('teachDetail' + this.mapId);
+						if (teachDetail) {
+							this.$router.push(teachDetail);
+						} else {
+							this.$router.push({ path: `${UrlConfig.trainingPlatform.teachHome}/${obj.id}`});
+						}*/
 						this.$router.push({ path: `${UrlConfig.trainingPlatform.teachHome}/${obj.id}`});
 						break;
 					case 'Simulation':
@@ -149,10 +154,10 @@ export default {
 			this.filterSelect = filterSelect;
 			try {
 				let params={};
-				if(this.project === 'xty'){
+				if (this.project === 'xty') {
-					params={'customized':'xty'};
+					params={'customized': 'xty'};
 				}
-				const res = await getTrainingSystemList(filterSelect,params);
+				const res = await getTrainingSystemList(filterSelect, params);
 				res.data.forEach(item =>{
 					item.key = item.id + item.type;
 					item.children && item.children.forEach(childrenItem => {
@@ -172,25 +177,6 @@ export default {
 				this.$messageBox(this.$t('error.refreshFailed'));
 			}
 		},
-		// async projectInitData(mapId) {
-		// 	this.loading = true;
-		// 	this.treeList = [];
-		// 	try {
-		// 		debugger;
-		// 		const resp = await getTrainingSystemListByMapId(mapId);
-		// 		this.treeList = resp.data;
-		// 		this.loading = false;
-		// 		this.getExpandList(this.filterSelect);
-		// 		this.$nextTick(() => {
-		// 			const checkId = localStore.get('trainingPlatformCheckId'+this.filterSelect+this.account) || null;
-		// 			this.$refs.tree && this.$refs.tree.setCurrentKey(checkId);
-		// 			this.loading = false;
-		// 		});
-		// 	} catch (e) {
-		// 		this.loading = false;
-		// 		this.$messageBox(this.$t('error.failedToGetSystemData'));
-		// 	}
-		// },
 		nodeExpand(obj, node, ele) {
 			const key = obj.id;
 			this.expandList = this.expandList.filter(item => item!==key);