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

大铁线路调整4

Browse Source
This commit is contained in:
fan 2022-04-19 17:55:27 +08:00
parent e07e06a3bf
commit c0bbf35455
3 changed files with 56 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/theme/datie_02/menus/index.vue
View File

@ -115,7 +115,7 @@ export default {
const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`)); const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
this.initDate(date); this.initDate(date);
} }
},// 1668 },// 138
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.$store.dispatch('config/updateMenuBar'); this.$store.dispatch('config/updateMenuBar');

78
src/views/newMap/displayCity/lineBoard.vue
View File

@ -2,12 +2,14 @@
<el-dialog <el-dialog
title="车站股道图" title="车站股道图"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="90%" width="96%"
top="5vh"
center
:before-close="handleClose"> :before-close="handleClose">
<div style="height: 550px; overflow-y: auto;"> <div style="height: 550px; overflow-y: auto;background: #DFE3E6;padding: 7px;">
<div :key="item.id" v-for="item in infoList" style="display: flex; justify-content: space-between;"> <div :key="item.id" v-for="item in infoList" style="display: flex; justify-content: space-between;border-top: 1px solid #fff;padding: 3px">
<div> <div>
<el-select v-model="item.sectionCode" filterable placeholder="请选择" size="small"> <el-select v-model="item.sectionCode" filterable placeholder="请选择" size="mini" style="width: 120px;">
<el-option <el-option
v-for="elem in sectionList" v-for="elem in sectionList"
:key="elem.code" :key="elem.code"
@ -20,7 +22,7 @@
<div>客</div> <div>客</div>
<div>列车未接近</div> <div>列车未接近</div>
<div> <div>
<el-select v-model="item.sectionStatus" filterable placeholder="请选择" size="small"> <el-select v-model="item.sectionStatus" filterable placeholder="请选择" size="mini" style="width: 120px;">
<el-option <el-option
v-for="elem in sectionStatusList" v-for="elem in sectionStatusList"
:key="elem.value" :key="elem.value"
@ -42,16 +44,16 @@
<div>{{ item.sectionName }}</div> <div>{{ item.sectionName }}</div>
</div> </div>
</div> </div>
<div style="display: flex;"> <div style="display: flex;margin-top: 10px;justify-content: space-around;background: #DEE2E5;">
<div style="width: 50%"> <div style="width: 49%;margin-top: 10px;">
<div style="display: flex;"> <div style="display: flex;align-items: center;">
<div>进路序列模式：/<可修改/></div> <div style="background: #0f0;">{{ '进路序列模式：&lt;可修改&gt;' }}</div>
<el-button size="small">修改申请</el-button> <el-button size="mini">修改申请</el-button>
<el-button size="small">只读申请</el-button> <el-button size="mini">只读申请</el-button>
<el-button size="small">查找列车</el-button> <el-button size="mini">查找列车</el-button>
<el-input style="width: 70px;" size="small" v-model="searchTrain" /> <el-input style="width: 70px;" size="mini" v-model="searchTrain" />
<div>上下行</div> <div>上下行</div>
<el-select size="small" v-model="andDown"> <el-select size="mini" v-model="andDown" style="width: 70px;">
<el-option <el-option
v-for="item in andDownList" v-for="item in andDownList"
:key="item.value" :key="item.value"
@ -60,7 +62,7 @@
/> />
</el-select> </el-select>
<div>接车口</div> <div>接车口</div>
<el-select size="small" v-model="andDown"> <el-select size="mini" v-model="andDown" style="width: 100px;">
<el-option <el-option
v-for="item in andDownList" v-for="item in andDownList"
:key="item.value" :key="item.value"
@ -69,7 +71,7 @@
/> />
</el-select> </el-select>
<div>发车口</div> <div>发车口</div>
<el-select size="small" v-model="andDown"> <el-select size="mini" v-model="andDown" style="width: 100px;">
<el-option <el-option
v-for="item in andDownList" v-for="item in andDownList"
:key="item.value" :key="item.value"
@ -80,8 +82,9 @@
</div> </div>
<el-table <el-table
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%;margin-top: 10px;"
highlight-current-row highlight-current-row
:row-style="{ background: '#ff0' }"
border border
> >
<el-table-column type="index" width="50" label="序号" /> <el-table-column type="index" width="50" label="序号" />
@ -97,9 +100,9 @@
<el-table-column property="description" label="序列描述" /> <el-table-column property="description" label="序列描述" />
</el-table> </el-table>
</div> </div>
<div style="width: 50%"> <div style="width: 49%;margin-top: 10px;">
<div style="display: flex;"> <div style="display: flex;align-items: center;">
<el-select size="small" v-model="unknow"> <el-select size="mini" v-model="unknow">
<el-option <el-option
v-for="item in unknowList" v-for="item in unknowList"
:key="item.value" :key="item.value"
@ -108,8 +111,8 @@
/> />
</el-select> </el-select>
<div>调机-J101</div> <div>调机-J101</div>
<el-button size="small">进路预览</el-button> <el-button size="mini">进路预览</el-button>
<el-select size="small" v-model="unknow1"> <el-select size="mini" v-model="unknow1">
<el-option <el-option
v-for="item in unknowList1" v-for="item in unknowList1"
:key="item.value" :key="item.value"
@ -117,12 +120,12 @@
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
<el-button size="small">办理进路</el-button> <el-button size="mini">办理进路</el-button>
<el-button size="small">发送机车</el-button> <el-button size="mini">发送机车</el-button>
</div> </div>
<el-table <el-table
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%;margin-top: 10px;"
highlight-current-row highlight-current-row
border border
> >
@ -135,7 +138,7 @@
<el-table-column property="status" label="状态"/> <el-table-column property="status" label="状态"/>
<el-table-column property="leadRoute" label="牵出进路"/> <el-table-column property="leadRoute" label="牵出进路"/>
<el-table-column property="pushRoute" label="推入进路"/> <el-table-column property="pushRoute" label="推入进路"/>
<el-table-column property="note" label="note"/> <el-table-column property="note" label="记事"/>
</el-table> </el-table>
</div> </div>
</div> </div>
@ -153,14 +156,25 @@
andDown: 'all', andDown: 'all',
unknow: '', unknow: '',
unknow1: '', unknow1: '',
tableData: [], tableData: [{},{}],
unknowList1: [{label: '全部机车', value: 'all'}], unknowList1: [{label: '全部机车', value: 'all'}],
unknowList: [{label: 'J101-执行中', value: 'J101'}], unknowList: [{label: 'J101-执行中', value: 'J101'}],
andDownList: [{ label: '全部', value: 'all' }, { label: '上行', value: 'up' }, { label: '下行', value: 'down' }], andDownList: [{ label: '全部', value: 'all' }, { label: '上行', value: 'up' }, { label: '下行', value: 'down' }],
sectionStatusList: [ sectionStatusList: [
{label: '办理发车进路', value: ''} {label: '办理发车进路', value: ''}
], ],
infoList : [{ id: 1 }] infoList : [
{ id: 1 },
{ id: 2 },
{ id: 3 },
{ id: 4 },
{ id: 5 },
{ id: 6 },
{ id: 7 },
{ id: 8 },
{ id: 9 },
{ id: 10 }
]
} }
}, },
computed: { computed: {
@ -180,5 +194,11 @@
</script> </script>
<style scoped> <style scoped>
/deep/ .el-dialog__header{
background: #B4B6B9;
}
/deep/ .el-dialog__body{
background: #8D939D;
padding: 10px;
}
</style> </style>

9
src/views/system/configLine/config.vue
View File

@ -115,7 +115,8 @@ export default {
'routeDefaultCheckConflict', 'routeDefaultCheckConflict',
'tripNumberIsUnique', 'tripNumberIsUnique',
'standTbStrategyIsInvalid', 'standTbStrategyIsInvalid',
'updateTripPlanByServiceNumber' 'updateTripPlanByServiceNumber',
'hasCTC'
], ],
selectList: ['runMode', 'singleApproachLockCancelRoute'], selectList: ['runMode', 'singleApproachLockCancelRoute'],
generalConfig: [ generalConfig: [
@ -164,7 +165,8 @@ export default {
'routeDefaultCheckConflict', 'routeDefaultCheckConflict',
'tripNumberIsUnique', 'tripNumberIsUnique',
'standTbStrategyIsInvalid', 'standTbStrategyIsInvalid',
'updateTripPlanByServiceNumber' 'updateTripPlanByServiceNumber',
'hasCTC'
], ],
rangeList: ['noParkingSM', 'parkingSM'], rangeList: ['noParkingSM', 'parkingSM'],
speedList: ['rmAtpSpeed', 'urmAtpSpeed'], speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@ -219,7 +221,8 @@ export default {
routeDefaultCheckConflict: '进路默认开启冲突检测', routeDefaultCheckConflict: '进路默认开启冲突检测',
tripNumberIsUnique: '运行图中车次号是否唯一', tripNumberIsUnique: '运行图中车次号是否唯一',
standTbStrategyIsInvalid: '站台折返策略不生效', standTbStrategyIsInvalid: '站台折返策略不生效',
updateTripPlanByServiceNumber: '根据服务号更新车次计划' updateTripPlanByServiceNumber: '根据服务号更新车次计划',
hasCTC: '有CTC系统（大铁）'
} }
}; };
}, },