运行图编制 修改任务 代码调整
This commit is contained in:
parent
bc89210894
commit
cc431582e7
@ -224,8 +224,9 @@ export default {
|
||||
handleEditTask() {
|
||||
if (this.currentRow.id) {
|
||||
this.$emit('dispatchDialog', {
|
||||
name: 'modifyingTask', params: {
|
||||
name: 'showDialog', params: {
|
||||
isPlan: true,
|
||||
dialogType:'modifyingTask',
|
||||
serviceNumber: this.model.serviceNumber,
|
||||
tripNumber: this.currentRow.tripNumber,
|
||||
rowData:this.currentRow
|
||||
|
@ -1,16 +1,5 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
v-dialogDrag
|
||||
class="planEdit__tool add-task"
|
||||
:title="title"
|
||||
:visible.sync="dialogShow"
|
||||
width="1000px"
|
||||
:before-close="doClose"
|
||||
:z-index="2000"
|
||||
top="50px"
|
||||
:modal="false"
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<div>
|
||||
<el-row>
|
||||
<el-col :span="6">
|
||||
<el-row>
|
||||
@ -119,11 +108,11 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-row>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<div style="text-align:center;margin-top:15px;">
|
||||
<el-button size="medium" @click="doClose">{{ $t('global.cancel') }}</el-button>
|
||||
<el-button type="primary" size="medium" @click="handleCommit">{{ $t('global.confirm') }}</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { updatePlanTrip, getMapStationRunUser, getStationStopTime } from '@/api/runplan';
|
||||
@ -144,8 +133,6 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogShow: false,
|
||||
loading: false,
|
||||
isPlan: false,
|
||||
PlanParser: {},
|
||||
parkSectionCodeList:[],
|
||||
@ -184,11 +171,6 @@ export default {
|
||||
}
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
title() {
|
||||
return this.$t('planMonitor.modifying.modifyTask');
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
'editModel.startTime': function () {
|
||||
this.computedDetailList();
|
||||
@ -309,7 +291,7 @@ export default {
|
||||
this.stopTimeMap[element.stationCode] = {parkingTime:element.parkingTime};
|
||||
});
|
||||
this.initTaskData(params);
|
||||
this.dialogShow = true;
|
||||
// this.dialogShow = true;
|
||||
});
|
||||
});
|
||||
}
|
||||
@ -411,7 +393,7 @@ export default {
|
||||
}
|
||||
|
||||
this.initRunlevel(this.editModel);
|
||||
this.dialogShow = true;
|
||||
// this.dialogShow = true;
|
||||
this.computedDetailList();
|
||||
}
|
||||
}
|
||||
@ -451,8 +433,7 @@ export default {
|
||||
this.loadInitData(params);
|
||||
},
|
||||
doClose() {
|
||||
this.loading = false;
|
||||
this.dialogShow = false;
|
||||
this.$emit('doClose');
|
||||
},
|
||||
buildModel() {
|
||||
return {
|
||||
|
@ -13,17 +13,21 @@
|
||||
>
|
||||
<add-task v-if="dialogType =='addTask'" ref="addTask" @dispatchOperate="dispatchOperate" @refresh="refresh" @doClose="doClose" />
|
||||
<delete-task v-if="dialogType =='deleteTask'" ref="deleteTask" @dispatchOperate="dispatchOperate" @refresh="refresh" @doClose="doClose" />
|
||||
<modifying-task v-if="dialogType =='modifyingTask'" ref="modifyingTask" @dispatchOperate="dispatchOperate" @refresh="refresh" @doClose="doClose" />
|
||||
|
||||
</el-dialog>
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import AddTask from './addTask';
|
||||
import DeleteTask from './deleteTask';
|
||||
import ModifyingTask from './modifyingTask';
|
||||
export default {
|
||||
name: 'TaskDialog',
|
||||
components: {
|
||||
AddTask,
|
||||
DeleteTask
|
||||
DeleteTask,
|
||||
ModifyingTask
|
||||
},
|
||||
props: {
|
||||
loadRunPlanId: {
|
||||
@ -51,6 +55,10 @@ export default {
|
||||
'deleteTask':{
|
||||
title:this.$t('planMonitor.deleteTask'),
|
||||
width:'400px'
|
||||
},
|
||||
'modifyingTask':{
|
||||
title:this.$t('planMonitor.modifying.modifyTask'),
|
||||
width:'1000px'
|
||||
}
|
||||
};
|
||||
const dialog = dialogMap[params.dialogType];
|
||||
@ -65,6 +73,7 @@ export default {
|
||||
},
|
||||
doClose() {
|
||||
this.dialogShow = false;
|
||||
this.dialogType = '';
|
||||
},
|
||||
dispatchOperate(data) {
|
||||
this.$emit('dispatchOperate', data);
|
||||
|
@ -41,13 +41,9 @@
|
||||
<systerm-out ref="systermOut" />
|
||||
<!-- <add-task ref="addTask" @dispatchOperate="dispatchOperate" @refresh="refresh" /> -->
|
||||
<!-- <delete-task ref="deleteTask" @dispatchOperate="dispatchOperate" @refresh="refresh" /> -->
|
||||
<!-- <modifying-task ref="modifyingTask" :load-run-plan-id="loadRunPlanId" @dispatchOperate="dispatchOperate" @refresh="refresh" /> -->
|
||||
|
||||
<task-dialog ref="showDialog" @dispatchOperate="dispatchOperate" @refresh="refresh" />
|
||||
|
||||
<modifying-task ref="modifyingTask" :load-run-plan-id="loadRunPlanId" @dispatchOperate="dispatchOperate" @refresh="refresh" />
|
||||
|
||||
<modifying-station-interval-time ref="modifyingStationIntervalTime" />
|
||||
<modifying-station-stop-time ref="modifyingStationStopTime" />
|
||||
<edit-plan-name ref="editPlan" @renewal="refreshRunPlanName" />
|
||||
</div>
|
||||
</template>
|
||||
@ -64,7 +60,6 @@ import EditPlanName from '../components/menus/editPlanName';
|
||||
import DuplicateTrain from '../components/menus/duplicateTrain';
|
||||
import SystermOut from '../components/menus/systermOut';
|
||||
import TaskDialog from '../components/menus/taskDialog';
|
||||
import ModifyingTask from '../components/menus/modifyingTask';
|
||||
import MovePlaningTrain from '../components/menus/movePlaningTrain';
|
||||
import ModifyingStationIntervalTime from '../components/menus/modifyingStationIntervalTime';
|
||||
import ModifyingStationStopTime from '../components/menus/modifyingStationStopTime';
|
||||
@ -84,7 +79,6 @@ export default {
|
||||
DuplicateTrain,
|
||||
SystermOut,
|
||||
TaskDialog,
|
||||
ModifyingTask,
|
||||
// AddSmoothRunTime,
|
||||
// EditSmoothRunTime,
|
||||
ModifyingStationIntervalTime,
|
||||
|
@ -593,7 +593,9 @@ export default {
|
||||
handleModifyingTask() {
|
||||
const params = this.$store.state.runPlan.selected;
|
||||
if (params.serviceNumber && params.tripNumber) {
|
||||
this.$emit('dispatchDialog', { name: 'modifyingTask', params });
|
||||
// this.$emit('dispatchDialog', { name: 'modifyingTask', params });
|
||||
params.dialogType = 'modifyingTask';
|
||||
this.$emit('dispatchDialog', { name: 'showDialog', params });
|
||||
} else {
|
||||
this.$messageBox(this.$t('tip.selectATrain'));
|
||||
}
|
||||
|
@ -125,7 +125,9 @@ export default {
|
||||
handleModifyingTask() {
|
||||
const params = this.$store.state.runPlan.selected;
|
||||
if (params.serviceNumber && params.tripNumber) {
|
||||
this.$emit('dispatchDialog', { name: 'modifyingTask', params });
|
||||
// this.$emit('dispatchDialog', { name: 'modifyingTask', params });
|
||||
params.dialogType = 'modifyingTask';
|
||||
this.$emit('dispatchDialog', { name: 'showDialog', params });
|
||||
} else {
|
||||
this.$messageBox(this.$t('tip.selectATrain'));
|
||||
}
|
||||
|
@ -40,8 +40,6 @@
|
||||
|
||||
<task-dialog ref="showDialog" :load-run-plan-id="loadRunPlanId" @dispatchOperate="dispatchOperate" @refresh="refresh" />
|
||||
|
||||
<modifying-task ref="modifyingTask" :load-run-plan-id="loadRunPlanId" @dispatchOperate="dispatchOperate" @refresh="refresh" />
|
||||
|
||||
<modifying-station-interval-time ref="modifyingStationIntervalTime" />
|
||||
<modifying-station-stop-time ref="modifyingStationStopTime" />
|
||||
<edit-plan-name ref="editPlan" @renewal="refreshRunPlanName" />
|
||||
@ -62,7 +60,6 @@ import EditPlanName from '../components/menus/editPlanName';
|
||||
import DuplicateTrain from '../components/menus/duplicateTrain';
|
||||
import SystermOut from '../components/menus/systermOut';
|
||||
import TaskDialog from '../components/menus/taskDialog';
|
||||
import ModifyingTask from '../components/menus/modifyingTask';
|
||||
import MovePlaningTrain from '../components/menus/movePlaningTrain';
|
||||
import ModifyingStationIntervalTime from '../components/menus/modifyingStationIntervalTime';
|
||||
import ModifyingStationStopTime from '../components/menus/modifyingStationStopTime';
|
||||
@ -84,7 +81,6 @@ export default {
|
||||
DuplicateTrain,
|
||||
SystermOut,
|
||||
TaskDialog,
|
||||
ModifyingTask,
|
||||
// AddSmoothRunTime,
|
||||
// EditSmoothRunTime,
|
||||
ModifyingStationIntervalTime,
|
||||
|
@ -662,7 +662,9 @@ export default {
|
||||
handleModifyingTask() {
|
||||
const params = this.$store.state.runPlan.draftSelected;
|
||||
if (params.serviceNumber && params.tripNumber) {
|
||||
this.$emit('dispatchDialog', { name: 'modifyingTask', params });
|
||||
// this.$emit('dispatchDialog', { name: 'modifyingTask', params });
|
||||
params.dialogType = 'modifyingTask';
|
||||
this.$emit('dispatchDialog', { name: 'showDialog', params });
|
||||
} else {
|
||||
this.$messageBox(this.$t('tip.selectATrain'));
|
||||
}
|
||||
|
@ -132,7 +132,9 @@ export default {
|
||||
handleModifyingTask() {
|
||||
const params = this.$store.state.runPlan.draftSelected;
|
||||
if (params.serviceNumber && params.tripNumber) {
|
||||
this.$emit('dispatchDialog', { name: 'modifyingTask', params });
|
||||
// this.$emit('dispatchDialog', { name: 'modifyingTask', params });
|
||||
params.dialogType = 'modifyingTask';
|
||||
this.$emit('dispatchDialog', { name: 'showDialog', params });
|
||||
} else {
|
||||
this.$messageBox(this.$t('tip.selectATrain'));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user