diff --git a/src/i18n/langs/en/menu.js b/src/i18n/langs/en/menu.js index f6ec6b85f..644032f61 100644 --- a/src/i18n/langs/en/menu.js +++ b/src/i18n/langs/en/menu.js @@ -492,5 +492,6 @@ export default { sourceTrainWindow: 'Source train window', trainWindow: 'Train window', targetTrainWindow: 'Target train window', - category: 'category' + category: 'category', + lineCode:'Line Type' }; diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js index b00cde6b8..0722faf2f 100644 --- a/src/i18n/langs/zh/menu.js +++ b/src/i18n/langs/zh/menu.js @@ -488,6 +488,7 @@ export default { sourceTrainWindow: '源车次窗', trainWindow: '车次窗', targetTrainWindow: '目的车次窗', - category: '类别' + category: '类别', + lineCode:'线路类型' }; diff --git a/src/views/planMonitor/detail.vue b/src/views/planMonitor/detail.vue index a7671cec6..a98e3fc1e 100644 --- a/src/views/planMonitor/detail.vue +++ b/src/views/planMonitor/detail.vue @@ -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(); diff --git a/src/views/publish/runPlanEveryDay/index.vue b/src/views/publish/runPlanEveryDay/index.vue index 3d41df95f..d40cbf6a2 100644 --- a/src/views/publish/runPlanEveryDay/index.vue +++ b/src/views/publish/runPlanEveryDay/index.vue @@ -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(); diff --git a/src/views/publish/runPlanEveryDay/runPlanView.vue b/src/views/publish/runPlanEveryDay/runPlanView.vue index 7579cceb3..06302ee0a 100644 --- a/src/views/publish/runPlanEveryDay/runPlanView.vue +++ b/src/views/publish/runPlanEveryDay/runPlanView.vue @@ -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) { diff --git a/src/views/publish/runPlanTemplate/index.vue b/src/views/publish/runPlanTemplate/index.vue index 5c7b7cf2e..58d24ef3c 100644 --- a/src/views/publish/runPlanTemplate/index.vue +++ b/src/views/publish/runPlanTemplate/index.vue @@ -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(); diff --git a/src/views/scriptManage/home.vue b/src/views/scriptManage/home.vue index ad349c727..8d72ce0b5 100644 --- a/src/views/scriptManage/home.vue +++ b/src/views/scriptManage/home.vue @@ -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 => { diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue index 3fddd298e..af2e2bd81 100644 --- a/src/views/trainingPlatform/demonList.vue +++ b/src/views/trainingPlatform/demonList.vue @@ -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) => {