joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

问题调整

Browse Source
This commit is contained in:
fan 2019-10-22 18:18:21 +08:00
parent 6760cdc7e3
commit 9134be8c19
7 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/router/index.js
View File

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

4
src/utils/baseUrl.js
View File

@ -3,8 +3,8 @@ export function getBaseUrl() {
let BASE_API; let BASE_API;
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud'; // 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.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 王兴杰 // BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
} else { } else {

5
src/views/exam/index.vue
View File

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

2
src/views/lesson/home.vue
View File

@ -314,7 +314,7 @@ export default {
}); });
}, },
treeSort(index, row) { 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() { taskManage() {
this.$router.push({path: `${UrlConfig.design.taskManage}`, query: {mapId: this.$route.params.mapId, skinCode: this.$route.params.skinCode}}); this.$router.push({path: `${UrlConfig.design.taskManage}`, query: {mapId: this.$route.params.mapId, skinCode: this.$route.params.skinCode}});

2
src/views/teach/detail/index.vue
View File

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

1
src/views/teach/index.vue
View File

@ -68,6 +68,7 @@ export default {
} }
}, },
goLesson(row) { 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}}); this.$router.push({ path: `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.params.subSystem}`, query: {lessonId: row.id, mapId: row.mapId, prdCode: row.prdCode}});
} }
} }

42
src/views/trainingPlatform/demonList.vue
View File

@ -3,9 +3,9 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>{{ $t('global.mapList') }}</span> <span>{{ $t('global.mapList') }}</span>
</div> </div>
<!-- v-if="project!=='xty' " --> <!-- v-if="project!=='xty' " -->
<filter-city ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" /> <filter-city ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
<!-- v-if="project!=='xty' " --> <!-- v-if="project!=='xty' " -->
<el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable /> <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
<el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-(project?50:125)) +'px' }"> <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-(project?50:125)) +'px' }">
<el-tree <el-tree
@ -34,7 +34,7 @@
</template> </template>
<script> <script>
import { getPublishMapTree } from '@/api/management/mapprd'; 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 { UrlConfig } from '@/router/index';
import FilterCity from '@/views/components/filterCity'; import FilterCity from '@/views/components/filterCity';
import localStore from 'storejs'; import localStore from 'storejs';
@ -87,9 +87,6 @@ export default {
beforeDestroy () { beforeDestroy () {
}, },
mounted() { mounted() {
// if (this.project === 'xty') {
// this.projectInitData('18');
// }
}, },
methods: { methods: {
filterNode(value, data) { filterNode(value, data) {
@ -116,6 +113,7 @@ export default {
this.$router.push({ path: `${UrlConfig.trainingPlatform.permission}/${this.mapId}`}); this.$router.push({ path: `${UrlConfig.trainingPlatform.permission}/${this.mapId}`});
} else if ( obj.type === 'MapSystem') { } else if ( obj.type === 'MapSystem') {
getSubSystemInfo(obj.id).then(resp => { getSubSystemInfo(obj.id).then(resp => {
// let router = '';
switch (resp.data.type) { switch (resp.data.type) {
case 'Exam': case 'Exam':
this.setLocalRoute(`${UrlConfig.trainingPlatform.examHome}/${obj.id}`); this.setLocalRoute(`${UrlConfig.trainingPlatform.examHome}/${obj.id}`);
@ -123,8 +121,15 @@ export default {
this.$router.push({ path: `${UrlConfig.trainingPlatform.examHome}/${obj.id}`}); this.$router.push({ path: `${UrlConfig.trainingPlatform.examHome}/${obj.id}`});
break; break;
case 'Lesson': case 'Lesson':
this.setLocalRoute(`${UrlConfig.trainingPlatform.teachHome}/${obj.id}`); this.setLocalRoute(`${UrlConfig.trainingPlatform.teachHome}/${obj.id}`);
// this.$router.push({ path: `${UrlConfig.trainingPlatform.teachDetail}/${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}`}); this.$router.push({ path: `${UrlConfig.trainingPlatform.teachHome}/${obj.id}`});
break; break;
case 'Simulation': case 'Simulation':
@ -149,10 +154,10 @@ export default {
this.filterSelect = filterSelect; this.filterSelect = filterSelect;
try { try {
let params={}; 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 =>{ res.data.forEach(item =>{
item.key = item.id + item.type; item.key = item.id + item.type;
item.children && item.children.forEach(childrenItem => { item.children && item.children.forEach(childrenItem => {
@ -172,25 +177,6 @@ export default {
this.$messageBox(this.$t('error.refreshFailed')); 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) { nodeExpand(obj, node, ele) {
const key = obj.id; const key = obj.id;
this.expandList = this.expandList.filter(item => item!==key); this.expandList = this.expandList.filter(item => item!==key);