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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
ival 2021-03-25 09:22:17 +08:00
commit 74b260782d
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/planMonitor/components/menus/gernaratePlanTrain.vue
View File

@ -48,12 +48,12 @@ export default {
{ value: 5, label: '等级五' } { value: 5, label: '等级五' }
], ],
formModel: { formModel: {
gernarateType:'01', gernarateType:'02',
serviceNumber:'', // 服务号 serviceNumber:'', // 服务号
beginTime: '', // 开始时间 beginTime: '06:00:00', // 开始时间
overTime: '', // 结束时间 overTime: '22:00:00', // 结束时间
runLevel:'', // 运行等级 runLevel:3, // 运行等级
departureInterval:180, // 发车间隔 departureInterval:300, // 发车间隔
// inboundRouting:'', // 回库交路code // inboundRouting:'', // 回库交路code
// outboundRouting:'', // 出库交路code // outboundRouting:'', // 出库交路code
outAndIn:false, // 自动生成出入库 outAndIn:false, // 自动生成出入库
@ -364,12 +364,12 @@ export default {
// this.$refs.dataform.clearValidate(); // this.$refs.dataform.clearValidate();
// blur // blur
this.formModel = { this.formModel = {
gernarateType:'01', gernarateType:'02',
serviceNumber:'', // 服务号 serviceNumber:'', // 服务号
beginTime: '', // 开始时间 beginTime: '06:00:00', // 开始时间
overTime: '', // 结束时间 overTime: '22:00:00', // 结束时间
runLevel:'', // 运行等级 runLevel:3, // 运行等级
departureInterval:180, // 发车间隔 departureInterval:300, // 发车间隔
outAndIn:false, // 自动生成出入库 outAndIn:false, // 自动生成出入库
// inboundRouting:'', // 回库交路code // inboundRouting:'', // 回库交路code
// outboundRouting:'', // 出库交路code // outboundRouting:'', // 出库交路code
@ -377,6 +377,7 @@ export default {
runningRouting2: '', // 环路code2 runningRouting2: '', // 环路code2
runningRouting:'' runningRouting:''
}; };
this.$emit('close');
// this.dialogShow = false; // this.dialogShow = false;
}, },
covertRouting(list, cb = e => true) { covertRouting(list, cb = e => true) {

5
src/views/planMonitor/components/routingoperate/routeMap.vue
View File

@ -2,7 +2,7 @@
<el-dialog :title="title" :visible.sync="dialogShow" custom-class="content-route" width="100%" :fullscreen="true" top="0px" :before-close="close" :z-index="2000" :append-to-body="true"> <el-dialog :title="title" :visible.sync="dialogShow" custom-class="content-route" width="100%" :fullscreen="true" top="0px" :before-close="close" :z-index="2000" :append-to-body="true">
<div class="content-box"> <div class="content-box">
<div v-if="type=='generateRouting'"> <div v-if="type=='generateRouting'">
<gernarate-plan ref="gernaratePlanTrain" /> <gernarate-plan ref="gernaratePlanTrain" @close="closeDialog" />
</div> </div>
<jlmap-visual ref="jlmapVisual" @onMenu="onContextmenu" @onSelect="clickEvent" /> <jlmap-visual ref="jlmapVisual" @onMenu="onContextmenu" @onSelect="clickEvent" />
<!-- :style="{height: $store.state.app.height-54+'px' }" --> <!-- :style="{height: $store.state.app.height-54+'px' }" -->
@ -144,6 +144,9 @@ export default {
if (this.type == 'routeMap') { this.$refs.routeConfig.createRouteEvent(); } if (this.type == 'routeMap') { this.$refs.routeConfig.createRouteEvent(); }
// if (this.type == 'runplanParams') { this.$refs.runPlanConfig.clear(); } // if (this.type == 'runplanParams') { this.$refs.runPlanConfig.clear(); }
if (this.type == 'generateRouting') { this.$refs.gernaratePlanTrain.doClose(); } if (this.type == 'generateRouting') { this.$refs.gernaratePlanTrain.doClose(); }
},
closeDialog() {
this.dialogShow = false;
} }
} }
}; };