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

成都三调整

Browse Source
This commit is contained in:
joylink_fanyuhong 2020-02-12 10:29:48 +08:00
parent a95e0176ac
commit 244b30d1c8
6 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jmapNew/theme/chengdu_03/menus/dialog/routeControl.vue
View File

@ -180,14 +180,13 @@ export default {
// 总人解 // 总人解
humanTrainRoute() { humanTrainRoute() {
const operate = { const operate = {
operation: OperationEvent.Signal.humanTrainRoute.menu.operation, over: true,
operateNext: OperationEvent.Signal.humanTrainRoute.confirm.operation operation: OperationEvent.Signal.humanTrainRoute.confirm.operation,
cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
}; };
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.close();
operate.cmdType = CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE;
this.$refs.password.doShow(operate);
} }
}).catch(() => { }).catch(() => {
this.doClose(); this.doClose();
@ -223,10 +222,11 @@ export default {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.doClose(); this.doClose();
} }
}).catch(() => { }).catch(() => {
this.doClose();
this.$refs.noticeInfo.doShow(operate);
}); });
}, },
// 信号解封 // 信号解封

4
src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue
View File

@ -32,9 +32,9 @@
:height="140" :height="140"
> >
<el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;"> <el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}" style="width: 120px"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ handleRouteName(scope.row.name) }} {{ handleRouteName(scope.row.name) }}
</div> </div>
</template> </template>

6
src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue
View File

@ -23,9 +23,9 @@
<div class="route-table-box"> <div class="route-table-box">
<span class="route-table-tip">进路列表</span> <span class="route-table-tip">进路列表</span>
<el-table ref="table" :data="tempData" border :cell-style="tableStyle" style="width: 99%;" size="mini" height="90" highlight-current-row @row-click="clickEvent"> <el-table ref="table" :data="tempData" border :cell-style="tableStyle" style="width: 99%;" size="mini" height="90" highlight-current-row @row-click="clickEvent">
<el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;"> <el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}" style="width: 120px"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ handleRouteName(scope.row.name) }} {{ handleRouteName(scope.row.name) }}
</div> </div>
</template> </template>
@ -209,7 +209,6 @@ export default {
const operate = { const operate = {
operation: OperationEvent.Signal.guide.choose.operation operation: OperationEvent.Signal.guide.choose.operation
}; };
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@ -249,7 +248,6 @@ export default {
}, },
cancel() { cancel() {
const operate = { const operate = {
operation: OperationEvent.Command.cancel.menu.operation operation: OperationEvent.Command.cancel.menu.operation
}; };

4
src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue
View File

@ -15,9 +15,9 @@
</el-row> </el-row>
<div class="table"> <div class="table">
<el-table ref="tempTable" :data="tempData" border style="width: 100%" size="mini" :highlight-current-row="highlight" :height="140" @row-click="clickEvent"> <el-table ref="tempTable" :data="tempData" border style="width: 100%" size="mini" :highlight-current-row="highlight" :height="140" @row-click="clickEvent">
<el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;"> <el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}" style="width: 120px"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ handleRouteName(scope.row.name) }} {{ handleRouteName(scope.row.name) }}
</div> </div>
</template> </template>

4
src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
View File

@ -33,9 +33,9 @@
highlight-current-row highlight-current-row
@row-click="clickEvent" @row-click="clickEvent"
> >
<el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;"> <el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}" style="width: 120px"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ handleRouteName(scope.row.name) }} {{ handleRouteName(scope.row.name) }}
</div> </div>
</template> </template>

2
src/jmapNew/theme/chengdu_03/menus/menuSignal.vue
View File

@ -306,6 +306,7 @@ export default {
start: true, start: true,
code: `${this.selected.code}`, code: `${this.selected.code}`,
operation: OperationEvent.Signal.guide.menu.operation, operation: OperationEvent.Signal.guide.menu.operation,
operateNext: OperationEvent.Signal.guide.confirm.operation,
param: { param: {
signalCode: `${this.selected.code}` signalCode: `${this.selected.code}`
} }
@ -384,7 +385,6 @@ export default {
signalCode: `${this.selected.code}` signalCode: `${this.selected.code}`
} }
}; };
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });