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_cuiweidong 2020-02-12 10:58:40 +08:00
parent 244b30d1c8
commit e04e7a2f32
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/theme/beijing_01/menus/menuSignal.vue
View File

@ -274,7 +274,7 @@ export default {
this.routeList.forEach(elem => { this.routeList.forEach(elem => {
if (elem.startSignalCode === this.selected.code) { if (elem.startSignalCode === this.selected.code) {
routes.push(elem); routes.push(elem);
} }
}); });
this.$refs.routeSelection.doShow(operate.operation, this.selected, routes); this.$refs.routeSelection.doShow(operate.operation, this.selected, routes);
} }
@ -388,7 +388,7 @@ export default {
this.routeList.forEach(elem => { this.routeList.forEach(elem => {
if (elem.startSignalCode === this.selected.code) { if (elem.startSignalCode === this.selected.code) {
routes.push(elem); routes.push(elem);
} }
}); });
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.routeHandControl.doShow(operate, this.selected, routes); this.$refs.routeHandControl.doShow(operate, this.selected, routes);

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

@ -33,33 +33,33 @@
> >
<el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;" width="150px"> <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'}"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ handleRouteName(scope.row.name) }} {{ handleRouteName(scope.row.name) }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :id="domIdChoose" prop="startSignalCode" label="方向" style="margin-left: 30px"> <el-table-column :id="domIdChoose" prop="startSignalCode" label="方向" style="margin-left: 30px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ handleDirection(scope.row.startSignalCode) }} {{ handleDirection(scope.row.startSignalCode) }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :id="domIdChoose" prop="turnBack" label="属性" style="margin-left:30px"> <el-table-column :id="domIdChoose" prop="turnBack" label="属性" style="margin-left:30px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ scope.row.turnBack ? '折返': '直通' }} {{ scope.row.turnBack ? '折返': '直通' }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px"> <el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ scope.row.controlType ? controlTypeMap[scope.row.controlType] : '自动' }} {{ scope.row.controlType ? controlTypeMap[scope.row.controlType] : '自动' }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-row justify="center" class="button-group"> <el-row justify="center" class="button-group">

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

@ -29,7 +29,7 @@
{{ handleRouteName(scope.row.name) }} {{ handleRouteName(scope.row.name) }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :id="domIdChoose" prop="startSignalCode" label="方向" style="margin-left: 30px"> <el-table-column :id="domIdChoose" prop="startSignalCode" label="方向" style="margin-left: 30px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
@ -43,7 +43,7 @@
{{ scope.row.turnBack ? '折返': '直通' }} {{ scope.row.turnBack ? '折返': '直通' }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px"> <el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">

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

@ -16,33 +16,33 @@
<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;" width="150px"> <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'}"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ handleRouteName(scope.row.name) }} {{ handleRouteName(scope.row.name) }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :id="domIdChoose" prop="startSignalCode" label="方向" style="margin-left: 30px"> <el-table-column :id="domIdChoose" prop="startSignalCode" label="方向" style="margin-left: 30px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ handleDirection(scope.row.startSignalCode) }} {{ handleDirection(scope.row.startSignalCode) }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :id="domIdChoose" prop="turnBack" label="属性" style="margin-left:30px"> <el-table-column :id="domIdChoose" prop="turnBack" label="属性" style="margin-left:30px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ scope.row.turnBack ? '折返': '直通' }} {{ scope.row.turnBack ? '折返': '直通' }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px"> <el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}"> <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ scope.row.controlType ? controlTypeMap[scope.row.controlType] : '自动' }} {{ scope.row.controlType ? controlTypeMap[scope.row.controlType] : '自动' }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-row justify="center" class="button-group"> <el-row justify="center" class="button-group">