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:
zyy 2020-08-24 16:00:00 +08:00
parent 7942f339ac
commit 6afae4e1bc
5 changed files with 73 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
View File

@ -11,35 +11,42 @@
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<el-row> <el-row>
<el-col :span="12">车体号:</el-col> <el-col :span="3" :offset="9">车体号:</el-col>
<el-col :span="12">追踪号:</el-col> <el-col :span="10" :offset="2">追踪号:</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="3" :offset="9">
<el-input :id="domIdInput" v-model="addModel.groupNumber" style="width: 100px;" @change="inputGroupNumber" /> <el-input :id="domIdInput" v-model="addModel.groupNumber" style="width: 80px;" @change="inputGroupNumber" />
</el-col> </el-col>
<el-col :span="10" :offset="2">
<el-input :id="domIdInput" v-model="addModel.groupNumber" style="width: 80px;" @change="inputGroupNumber" />
</el-col>
</el-row>
<el-row style="border-top: 1px solid #3C6C68; border-bottom: 1px solid #3C6C68">
<el-row>
<el-col :span="12" style="text-align: right;padding-right: 20px;">实际的DID</el-col>
<el-col :span="12">
<el-input :id="domIdInput" v-model="addModel.groupNumber" style="width: 100px;" @change="inputGroupNumber" />
</el-col>
</el-row>
<el-row>
<el-col :span="12" style="text-align: right;padding-right: 20px;">被请求的DID</el-col>
<el-col :span="12">
<el-input :id="domIdInput" v-model="addModel.groupNumber" style="width: 100px;" @change="inputGroupNumber" />
</el-col>
</el-row>
</el-row>
<el-row>
<el-col :span="12" style="text-align: right;padding-right: 20px;">DID浏览选项</el-col>
<el-col :span="12"> <el-col :span="12">
<el-input :id="domIdInput" v-model="addModel.groupNumber" style="width: 100px;" @change="inputGroupNumber" /> <el-input :id="domIdInput" v-model="addModel.groupNumber" style="width: 100px;" @change="inputGroupNumber" />
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row class="option_box">
<el-col :span="12">实际的DID</el-col> <div v-for="(item, index) in optionList" :key="index">{{ item.name }}</div>
<el-col :span="12"> </el-row>
<el-input :id="domIdInput" v-model="addModel.groupNumber" @change="inputGroupNumber" /> <el-row class="option_result_box">
</el-col> </el-row>
</el-row>
<el-row>
<el-col :span="12">被请求的DID</el-col>
<el-col :span="12">
<el-input :id="domIdInput" v-model="addModel.groupNumber" @change="inputGroupNumber" />
</el-col>
</el-row>
<el-row>
<el-col :span="12">DID浏览选项</el-col>
<el-col :span="12">
<el-input :id="domIdInput" v-model="addModel.groupNumber" @change="inputGroupNumber" />
</el-col>
</el-row>
<el-row justify="center" class="button-group"> <el-row justify="center" class="button-group">
<el-col :span="10"> <el-col :span="10">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button> <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
@ -65,7 +72,15 @@ export default {
data() { data() {
return { return {
trainNoList: [], trainNoList: [],
selected: null, selected: null,
optionList: [
{ name: '0001 北客站一韦曲南站 往返运营', id: 1 },
{ name: '0002 北客站一韦曲南站 北客站站前折返 往返运营', id: 2 },
{ name: '0003 北客站一韦曲南站 韦曲南站站前折返 往返运营', id: 3 },
{ name: '0004 北客站一韦曲南站 北客站和韦曲南站均站前折返 往返运营', id: 4 },
{ name: '0005 北客站一会展中心 往返运营', id: 5 },
{ name: '0006 北客站一会展中心 北客站站前折返 往返运营', id: 6 }
],
addModel: { addModel: {
stationName: '', stationName: '',
trainWindowCode: '', trainWindowCode: '',
@ -174,9 +189,14 @@ export default {
}; };
</script> </script>
<style rel="stylesheet/scss" lang="scss" scoped> <style rel="stylesheet/scss" lang="scss" scoped>
/deep/ .el-row { /deep/ {
margin: 10px .el-dialog .el-dialog__body{
} padding: 0!important;
}
.el-row {
margin: 10px
}
}
.xian-02__system .el-dialog .base-label { .xian-02__system .el-dialog .base-label {
background: rgba(0, 0, 0, 0.3); background: rgba(0, 0, 0, 0.3);
@ -186,4 +206,19 @@ export default {
padding: 0 5px; padding: 0 5px;
background-color: #F0F0F0; background-color: #F0F0F0;
} }
.option_box{
box-shadow: 1px 1px 3px #3a3a3a inset;
padding: 4px;
color: #191919;
height: 155px;
overflow: auto;
margin-bottom: 20px;
}
.option_result_box{
box-shadow: 1px 1px 3px #3a3a3a inset;
padding: 4px;
color: #191919;
height: 90px;
overflow: hidden;
}
</style> </style>

16
src/jmapNew/theme/xian_02/menus/menuSignal.vue
View File

@ -286,11 +286,11 @@ export default {
// 排列进路 // 排列进路
arrangementRoute() { arrangementRoute() {
let step = ''; let step = '';
let routeCode = ''; let routeCode = '';
if (this.selected.isTerminalSignal) { if (this.selected.isTerminalSignal) {
const endSignalRouteList = this.$store.state.menuOperation.endSignalRouteList; const endSignalRouteList = this.$store.state.menuOperation.endSignalRouteList;
endSignalRouteList.forEach(item => { endSignalRouteList.forEach(item => {
if (item.endSignalCode === this.selected.code) { if (item.endButtonSignalCode === this.selected.code) {
routeCode = item.routeCode; routeCode = item.routeCode;
} }
}); });
@ -313,14 +313,14 @@ export default {
this.resetRouteSignal(); this.resetRouteSignal();
const updateDeviceList = []; const updateDeviceList = [];
updateDeviceList.push({code: this.selected.code, _type: 'Signal', isStartSignal: 1}); updateDeviceList.push({code: this.selected.code, _type: 'Signal', isStartSignal: 1});
const endSignalRouteList = []; const endSignalRouteList = [];
this.routeList.forEach(item => { this.routeList.forEach(item => {
if (item.startSignalCode === this.selected.code) { if (item.startSignalCode === this.selected.code) {
endSignalRouteList.push({endSignalCode: item.endSignalCode, routeCode: item.code}); endSignalRouteList.push({endButtonSignalCode: item.endButtonSignalCode, routeCode: item.code});
updateDeviceList.push({code: item.endSignalCode, _type: 'Signal', isTerminalSignal: 1}); updateDeviceList.push({code: item.endButtonSignalCode, _type: 'Signal', isTerminalSignal: 1});
} }
}); });
this.$store.dispatch('menuOperation/setRouteSelectStartSignal', {startSignalCode: this.selected.code, endSignalRouteList: endSignalRouteList}); this.$store.dispatch('menuOperation/setRouteSelectStartSignal', {startSignalCode: this.selected.code, endSignalRouteList: endSignalRouteList});
this.$store.dispatch('training/updateMapState', updateDeviceList); this.$store.dispatch('training/updateMapState', updateDeviceList);
} }
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
@ -525,9 +525,9 @@ export default {
updateDeviceList.push({code: startSignalCode, _type: 'Signal', isStartSignal: 0}); updateDeviceList.push({code: startSignalCode, _type: 'Signal', isStartSignal: 0});
} }
endSignalRouteList.forEach(item => { endSignalRouteList.forEach(item => {
updateDeviceList.push({code: item.endSignalCode, _type: 'Signal', isTerminalSignal: 0}); updateDeviceList.push({code: item.endButtonSignalCode, _type: 'Signal', isTerminalSignal: 0});
}); });
this.$store.dispatch('menuOperation/setRouteSelectStartSignal', { startSignalCode: '', endSignalRouteList: [] }); this.$store.dispatch('menuOperation/setRouteSelectStartSignal', { startSignalCode: '', endSignalRouteList: [] });
this.$store.dispatch('training/updateMapState', updateDeviceList); this.$store.dispatch('training/updateMapState', updateDeviceList);
}, },
enabledConfirm() { enabledConfirm() {

4
src/jmapNew/theme/xian_02/menus/menuTrain.vue
View File

@ -71,8 +71,8 @@ export default {
children: [ children: [
{ {
label: '目的地ID', label: '目的地ID',
// handler: this.updateDestination, handler: this.updateDestination,
handler: this.undeveloped, // handler: this.undeveloped,
cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
}, },
{ {

2
src/store/modules/map.js
View File

@ -787,7 +787,7 @@ const map = {
state.map.automaticRouteButtonList && state.map.automaticRouteButtonList.forEach(item => { state.map.automaticRouteButtonList && state.map.automaticRouteButtonList.forEach(item => {
state.routeData[item.automaticRouteCode].automaticRouteCode = item.code; state.routeData[item.automaticRouteCode].automaticRouteCode = item.code;
}); });
state.routeList = routeDataList; state.routeList = routeDataList;
}, },
setOverlapData: (state, overlapList) => { setOverlapData: (state, overlapList) => {
state.overlapData = {}; state.overlapData = {};

2
src/utils/loaddata.js
View File

@ -66,7 +66,7 @@ export function covertData(resp, resolve) {
resolve(); resolve();
}); });
}); });
const routeData = resp.data.logicDataNew.routeList; // 设置进路数据 const routeData = resp.data.logicDataNew.routeList; // 设置进路数据
const overlapData = resp.data.logicDataNew.overlapList; const overlapData = resp.data.logicDataNew.overlapList;
const autoReentryData = resp.data.logicDataNew.autoReentryList; // 自动折返数据 const autoReentryData = resp.data.logicDataNew.autoReentryList; // 自动折返数据
const signalApproachSectionData = resp.data.logicDataNew.signalApproachSectionList; // 信号机接近区段数据 const signalApproachSectionData = resp.data.logicDataNew.signalApproachSectionList; // 信号机接近区段数据