运行图页面调整

This commit is contained in:
joylink_cuiweidong 2019-10-14 17:03:54 +08:00
parent bca95d4ca1
commit aba4efe129
6 changed files with 29 additions and 19 deletions

View File

@ -204,5 +204,6 @@ export default {
cancellationOfCoursePublicationApplicationFailed: 'Cancellation of course publication application failed!', cancellationOfCoursePublicationApplicationFailed: 'Cancellation of course publication application failed!',
publishTheCourseHint: 'This operation will publish the course. Are you sure?', publishTheCourseHint: 'This operation will publish the course. Are you sure?',
rejectedCourseReleaseApplicationSuccessful: 'Rejected course release application successful!', rejectedCourseReleaseApplicationSuccessful: 'Rejected course release application successful!',
rejectedCourseReleaseApplicationFailed: 'Rejected course release application failed!' rejectedCourseReleaseApplicationFailed: 'Rejected course release application failed!',
duplicatePlanFailedTips: 'The interval needs to be more than 30 seconds or the times is more than 1'
}; };

View File

@ -204,5 +204,6 @@ export default {
cancellationOfCoursePublicationApplicationFailed: '撤销课程发布申请失败!', cancellationOfCoursePublicationApplicationFailed: '撤销课程发布申请失败!',
publishTheCourseHint: '此操作将发布课程,是否确定?', publishTheCourseHint: '此操作将发布课程,是否确定?',
rejectedCourseReleaseApplicationSuccessful: '驳回课程发布申请成功!', rejectedCourseReleaseApplicationSuccessful: '驳回课程发布申请成功!',
rejectedCourseReleaseApplicationFailed: '驳回课程发布申请失败!' rejectedCourseReleaseApplicationFailed: '驳回课程发布申请失败!',
duplicatePlanFailedTips: '间隔时间需要大于30秒或次数大于1'
}; };

View File

@ -23,13 +23,13 @@
/> />
<edit-smooth-run-time ref="editSmoothRunTime" @dispatchDialog="dispatchDialog" /> <edit-smooth-run-time ref="editSmoothRunTime" @dispatchDialog="dispatchDialog" />
<add-smooth-run-time ref="addSmoothRunTime" @dispatchDialog="dispatchDialog" /> <add-smooth-run-time ref="addSmoothRunTime" @dispatchDialog="dispatchDialog" />
<duplicate-train ref="duplicateTrain" @dispatchDialog="dispatchDialog" @dispatchOperate="dispatchOperate" /> <duplicate-train ref="duplicateTrain" @dispatchDialog="dispatchDialog" @dispatchOperate="dispatchOperate" @refresh="refresh"/>
<modifying-routing ref="modifyingRouting" @dispatchDialog="dispatchDialog" /> <modifying-routing ref="modifyingRouting" @dispatchDialog="dispatchDialog" />
<modifying-begin-time ref="modifyingBeginTime" /> <modifying-begin-time ref="modifyingBeginTime" />
<systerm-out ref="systermOut" /> <systerm-out ref="systermOut" />
<add-task ref="addTask" @dispatchOperate="dispatchOperate" /> <add-task ref="addTask" @dispatchOperate="dispatchOperate" @refresh="refresh"/>
<delete-task ref="deleteTask" @dispatchOperate="dispatchOperate" /> <delete-task ref="deleteTask" @dispatchOperate="dispatchOperate" @refresh="refresh"/>
<modifying-task ref="modifyingTask" @dispatchOperate="dispatchOperate" /> <modifying-task ref="modifyingTask" @dispatchOperate="dispatchOperate" />
<edit-station-between-time ref="editStationBetweenTime" /> <edit-station-between-time ref="editStationBetweenTime" />

View File

@ -291,9 +291,10 @@ export default {
} else { } else {
// //
addPlanTrip(this.addModel).then(resp => { addPlanTrip(this.addModel).then(resp => {
this.$emit('dispatchOperate', { // this.$emit('dispatchOperate', {
dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query) // dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
}); // });
this.$emit('refresh');
this.$message.success(this.$t('tip.addTaskSuccessfully')); this.$message.success(this.$t('tip.addTaskSuccessfully'));
}).catch(() => { }).catch(() => {
this.$messageBox(this.$t('tip.addTaskFailed')); this.$messageBox(this.$t('tip.addTaskFailed'));

View File

@ -76,9 +76,10 @@ export default {
deletePlanTrip(model).then(resp => { deletePlanTrip(model).then(resp => {
this.$store.dispatch('runPlan/setSelected', {}); this.$store.dispatch('runPlan/setSelected', {});
this.$emit('dispatchOperate', { this.$emit('refresh');
dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query) // this.$emit('dispatchOperate', {
}); // dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
// });
this.$message.success(this.$t('tip.deleteTaskSuccessfully')); this.$message.success(this.$t('tip.deleteTaskSuccessfully'));
}).catch(() => { }).catch(() => {
this.$messageBox(this.$t('tip.deleteTaskFailed')); this.$messageBox(this.$t('tip.deleteTaskFailed'));

View File

@ -19,13 +19,13 @@
<el-row style="margin-top: 20px"> <el-row style="margin-top: 20px">
<el-col :span="5" :offset="4">{{$t('planMonitor.frequency')}}</el-col> <el-col :span="5" :offset="4">{{$t('planMonitor.frequency')}}</el-col>
<el-col :span="10"> <el-col :span="10">
<el-input-number v-model="model.times" size="mini" controls-position="right" /> <el-input-number v-model="model.times" size="mini" :min="1" controls-position="right" />
</el-col> </el-col>
</el-row> </el-row>
<el-row style="margin: 10px 0px"> <el-row style="margin: 10px 0px">
<el-col :span="5" :offset="4">{{$t('planMonitor.intervals')}}</el-col> <el-col :span="5" :offset="4">{{$t('planMonitor.intervals')}}</el-col>
<el-col :span="10"> <el-col :span="10">
<el-input-number v-model="model.intervals" size="mini" controls-position="right" /> <el-input-number v-model="model.intervals" size="mini" :min="30" controls-position="right" />
<span>{{$t('global.second')}}</span> <span>{{$t('global.second')}}</span>
</el-col> </el-col>
</el-row> </el-row>
@ -76,12 +76,18 @@ export default {
this.model['serviceNumber'] = this.model.serviceNumber; this.model['serviceNumber'] = this.model.serviceNumber;
this.doClose(); this.doClose();
duplicateService(this.model).then(resp => { duplicateService(this.model).then(resp => {
this.$emit('dispatchOperate', { // this.$emit('dispatchOperate', {
dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query) // dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
}); // });
this.$message.success(this.$t('tip.duplicatePlanSuccessful')); this.$emit('refresh');
}).catch(() => { this.$message.success(this.$t('tip.duplicatePlanSuccessful'));
this.$messageBox(this.$t('tip.duplicatePlanFailed')); }).catch((error) => {
if(error.code===500001){
this.$messageBox(this.$t('tip.duplicatePlanFailed')+this.$t('tip.duplicatePlanFailedTips'));
}else{
this.$messageBox(this.$t('tip.duplicatePlanFailed'));
}
}); });
} }
} }