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

skinCode调整

Browse Source
This commit is contained in:
joylink_cuiweidong 2019-11-08 18:19:35 +08:00
parent 46effe5ca8
commit ee600f8915
8 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/i18n/langs/en/menu.js
View File

@ -492,5 +492,6 @@ export default {
sourceTrainWindow: 'Source train window',
trainWindow: 'Train window',
targetTrainWindow: 'Target train window',
category: 'category'
category: 'category',
lineCode:'Line Type'
};

3
src/i18n/langs/zh/menu.js
View File

@ -488,6 +488,7 @@ export default {
sourceTrainWindow: '源车次窗',
trainWindow: '车次窗',
targetTrainWindow: '目的车次窗',
category: '类别'
category: '类别',
lineCode:'线路类型'
};

8
src/views/planMonitor/detail.vue
View File

@ -135,7 +135,7 @@ export default {
handleConfirm(row) {
this.loadRunPlanData({
planId: row.id,
skinCode: this.$route.query.skinCode,
lineCode: this.$route.query.lineCode,
planName: row.name
});
},
@ -147,11 +147,11 @@ export default {
this.$message.info(this.$t('planMonitor.openRunPlan.pleaseSelectRunplan'));
}
},
loadRunPlanData({ refresh, planId, skinCode, planName }) {
loadRunPlanData({ refresh, planId, lineCode, planName }) {
if (refresh) {
this.$store.dispatch('runPlan/refresh');
} else {
const query = { skinCode: skinCode, mapId: this.$route.params.mapId, planId: planId, planName: planName };
const query = { lineCode: lineCode, mapId: this.$route.params.mapId, planId: planId, planName: planName };
if (/^\/design\/userlist/.test(this.$route.fullPath)) {
this.$router.push({ path: `/plan/usertool`, query: query });
} else {
@ -243,7 +243,7 @@ export default {
handlePreview(row) {
previewRunPlan(row.id).then(resp => {
const query = {
skinCode: row.skinCode, prdType: '01', group: resp.data, mapId: row.mapId, planId: row.id, from:''
prdType: '01', group: resp.data, mapId: row.mapId, planId: row.id, from:''
};
this.$router.push({ path: `${UrlConfig.display}/plan`, query: query });
launchFullscreen();

13
src/views/publish/runPlanEveryDay/index.vue
View File

@ -72,12 +72,12 @@ export default {
name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger'
},
{
name: this.$t('global.preview'),
handleClick: this.handleView,
type: ''
}
// {
// name: this.$t('global.preview'),
// handleClick: this.handleView,
// type: ''
// }
// 无skincode
]
}
@ -117,7 +117,8 @@ export default {
},
// 预览
handleView(index, row) {
this.$router.push({ path: `${UrlConfig.publish.runPlanView}/everyDay`, query: { skinCode: row.skinCode, planId: row.id } });
const data = this.mapList.filter(elem=>{ return elem.id == row.mapId; })[0];
this.$router.push({ path: `${UrlConfig.publish.runPlanView}/everyDay`, query: { lineCode: data.lineCode, planId: row.id, mapId: row.mapId } });
},
reloadTable() {
this.queryList.reload();

2
src/views/publish/runPlanEveryDay/runPlanView.vue
View File

@ -176,7 +176,7 @@ export default {
},
methods: {
loadChartPage(opt) {
this.PlanConvert = this.$theme.loadPlanConvert(opt.skinCode);
this.PlanConvert = this.$theme.loadPlanConvert(opt.lineCode);
this.$store.dispatch('runPlan/clear').then(resp => {
this.loadInitChart().then(() => {
if (opt.mapId && opt.planId) {

3
src/views/publish/runPlanTemplate/index.vue
View File

@ -172,7 +172,8 @@ export default {
},
// 预览
handleView(index, row) {
this.$router.push({ path: `${UrlConfig.publish.runPlanView}/template`, query: { skinCode: row.skinCode, planId: row.id, mapId: row.mapId } });
const data = this.mapIdList.filter(elem=>{ return elem.id == row.mapId; })[0];
this.$router.push({ path: `${UrlConfig.publish.runPlanView}/template`, query: { lineCode: data.lineCode, planId: row.id, mapId: row.mapId } });
},
reloadTable() {
this.queryList.reload();

1
src/views/scriptManage/home.vue
View File

@ -256,7 +256,6 @@ export default {
previewScript(index, row) {
scriptDraftRecordNotify(row.id).then(resp => {
const query = { mapId: row.mapId, group: resp.data, scriptId: row.id, try:0};
// skinCode:this.$route.query.skinCode,
this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });
launchFullscreen();
}).catch(error => {

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

@ -146,7 +146,7 @@ export default {
this.$router.push({ path: `${UrlConfig.trainingPlatform.prodDetail}/${obj.id}`, query: { mapId: this.mapId}});
break;
case 'Plan':
this.$router.push({ path: `${UrlConfig.trainingPlatform.runPlan}/${this.mapId}`, query: {skinCode: '02'} });
this.$router.push({ path: `${UrlConfig.trainingPlatform.runPlan}/${this.mapId}`, query: {lineCode: '02'} });
break;
}
}).catch((error) => {