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:
sunzhenyu 2021-12-14 17:26:16 +08:00
commit 7fa204b700
22 changed files with 110 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/config/skinCode/xian_01.js
View File

@ -271,8 +271,8 @@ class SkinCode extends defaultStyle {
mergentR:4, // 站台折返策略边数
position: 0, // 折返方向
offset: {x: -16, y: -15}, // 折返偏移量
noHumanColor: '#0F16DA', // 站台无人折返
autoChangeEndsColor: '#0BF400' // 站台自动换端
noHumanColor: '#0BF400', // 站台无人折返
autoChangeEndsColor: '#0F16DA' // 站台自动换端
},
common: { // 通用属性

3
src/jmapNew/painter.js
View File

@ -154,8 +154,7 @@ class Painter {
trainDevice.overLapIndex = index;
trainDevice.instance && this.mapInstanceLevel[deviceType.Train].remove(trainDevice.instance);
trainDevice.instance = null;
trainDevice.zrOffsetX = this.$jmap.$options.offsetX;
trainDevice.zrOffsetY = this.$jmap.$options.offsetY;
trainDevice.zrOptions = this.$jmap.$options;
this.add(trainDevice);
});

24
src/jmapNew/shape/graph/Train/EMouse.js
View File

@ -88,6 +88,20 @@ class EMouse extends Group {
['STOP', '到达折返轨停稳'],
['EXIT', '开出折返轨']
]);
const highAtpModeMap = {
AM_C: 'AM',
SM_C: 'SM',
AM_I: 'AM',
SM_I: 'SM',
RM: 'RM'
};
const highSignalControlMap = {
AM_C: 'CTC',
SM_C: 'CTC',
AM_I: 'ITC',
SM_I: 'ITC',
RM: 'IL'
};
// \nNumber of people: ${this.device.model.num ? this.device.model.num : 0}
const path = window.location.href;
const stationNames = new Map(store.state.map.map.stationList.map(s=>[s.code, s.name]));
@ -96,7 +110,7 @@ class EMouse extends Group {
text = ` The planned train: ${trainType} \n Table No.: ${this.device.model.serviceNumber} \n Train Trip No.: ${this.device.model.tripNumber}\n Destination: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${direction ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${this.device.model.hold ? 'Detained' : 'Normal'}\n \n 跳停状态: ${this.device.model.jump ? 'Skip to continue moving' : 'Normal'}Stationary: ${!this.device.model.stop ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m`;
} else {
if (this.device.style.Train.moreTrainDetail) {
text = `列车类型: ${trainType}\n来\0\0\0\0源:人工标记\n车\0组\0号: ${this.device.model.groupNumber}\n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n早\0晚\0点: ${destinationText}${this.parseDt(this.device.model.dt)}\n运行方向: ${direction ? '上行' : '下行'}\nATP报告方向: ${direction ? '上行' : '下行'}\n起点站名: ${stationNames.get(this.device.model.startStation) || ''}\n终点站名: ${stationNames.get(this.device.model.endStation) || ''}\n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: ${stationNames.get(this.device.model.stationCode) || ''}\n车次通信: 通信车\n运行时间: ${this.device.model.runningTime}s\n停站时间: ${this.device.model.parkingRemainTime < 0 ? '无效' : `${this.device.model.parkingRemainTime}s`}\n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n车载扣车: 不执行\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'}\n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车状态: ${this.device.model.runLevel === 'CBTC' ? 'CTC' : this.device.model.runLevel}车\n最高信号系统控制: CTC\n驾驶模式: ${this.device.model.driveMode}模式\n最高ATP模式: AM\nATP1状态: 激活\nATP2状态: 备用\n速度: ${this.device.model.speed || 0} km/h\n车门状态: ${this.device.model.model.doorCloseLock ? '关闭' : closeDoorTip}\n制动状态: 无紧急制动\n停车保证: 可保证停车\n站台无法进入: 否\n前方站台停车点: 中间\n折返策略: ${turnBackStrategyMap.get(this.device.model.turnBackStrategy) || ''}\n折返状态: ${turnBackStatusMap.get(this.device.model.turnBackStatus)}\n屏蔽门开门许可: 是\n运营里程: 无效\n总重量: 196T\n车长: 11860cm\n列车编组: 1`;
text = `列车类型: ${trainType}\n来\0\0\0\0源:人工标记\n车\0组\0号: ${this.device.model.groupNumber}\n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n早\0晚\0点: ${destinationText}${this.parseDt(this.device.model.dt)}\n运行方向: ${direction ? '上行' : '下行'}\nATP报告方向: ${direction ? '上行' : '下行'}\n起点站名: ${stationNames.get(this.device.model.startStation) || ''}\n终点站名: ${stationNames.get(this.device.model.endStation) || ''}\n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: ${stationNames.get(this.device.model.stationCode) || ''}\n车次通信: 通信车\n运行时间: ${this.device.model.runningTime}s\n停站时间: ${this.device.model.parkingRemainTime < 0 ? '无效' : `${this.device.model.parkingRemainTime}s`}\n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n车载扣车: 不执行\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'}\n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车状态: ${this.device.model.runLevel === 'CBTC' ? 'CTC' : this.device.model.runLevel}车\n最高信号系统控制: ${highSignalControlMap[this.device.model.preselectionMode]}\n驾驶模式: ${this.device.model.driveMode}模式\n最高ATP模式: ${highAtpModeMap[this.device.model.preselectionMode]}\nATP1状态: 激活\nATP2状态: 备用\n速度: ${this.device.model.speed || 0} km/h\n车门状态: ${this.device.model.model.doorCloseLock ? '关闭' : closeDoorTip}\n制动状态: 无紧急制动\n停车保证: 可保证停车\n站台无法进入: 否\n前方站台停车点: 中间\n折返策略: ${turnBackStrategyMap.get(this.device.model.turnBackStrategy) || ''}\n折返状态: ${turnBackStatusMap.get(this.device.model.turnBackStatus)}\n屏蔽门开门许可: 是\n运营里程: 无效\n总重量: 196T\n车长: 11860cm\n列车编组: 1`;
} else {
text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\n乘务组号: \n起点站名: ${stationNames.get(this.device.model.startStation) || ''}\n终点站名: ${stationNames.get(this.device.model.endStation) || ''}\n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${this.device.model.hold ? '扣车' : '正常'}\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'} \n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m`;
}
@ -171,7 +185,13 @@ class EMouse extends Group {
}
mouseover() {
if (this.device.model.style.Train.common.trainTip) {
const zrRect = { x: this.device.model.model.zrOffsetX, y: this.device.model.model.zrOffsetY, width: store.state.config.width, height: store.state.config.height };
const scaleRate = parseFloat(this.device.model.model.zrOptions.scaleRate);
const zrRect = {
x: this.device.model.model.zrOptions.offsetX / scaleRate,
y: this.device.model.model.zrOptions.offsetY / scaleRate,
width: store.state.config.width / scaleRate,
height: store.state.config.height / scaleRate
};
this.device.deviceModel.__down = true;
const arrowTextRect = this.arrowText.getBoundingRect();
const zrRectX = zrRect.x + zrRect.width;

2
src/jmapNew/shape/graph/Train/index.js
View File

@ -44,7 +44,6 @@ export default class Train extends Group {
model.trainWindowModel.point = amendData.position;
model.trainWindowModel.reversal = amendData.reversal;
}
console.log(model.trainWindowModel, amendData);
this.point = {
x: model.trainWindowModel.point.x,
y: model.trainWindowModel.point.y
@ -99,6 +98,7 @@ export default class Train extends Group {
turnBackStatus: model.turnBackStatus,
stationCode: model.stationCode,
runLevel: model.runLevel,
preselectionMode: model.preselectionMode,
model: model
});
const rect = this.trainB.getBoundingRectOfFont().clone();

22
src/jmapNew/theme/xian_01/menus/menuStation.vue
View File

@ -46,7 +46,7 @@ export default {
menu: [],
menuNormal: {
Local: [
{
{
label: '上电解锁',
handler: this.powerUnLock,
cmdType: CMD.Station.CMD_STATION_POWER_ON_UNLOCK
@ -96,16 +96,16 @@ export default {
]
},
menuForce: [
{
label: '设置ZC故障',
handler: this.setStoppage,
cmdType: CMD.Station.CMD_STATION_ADD_FAULT
},
{
label: '取消ZC故障',
handler: this.cancelStoppage,
cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT
},
// {
// label: '设置ZC故障',
// handler: this.setStoppage,
// cmdType: CMD.Station.CMD_STATION_ADD_FAULT
// },
// {
// label: '取消ZC故障',
// handler: this.cancelStoppage,
// cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT
// },
{
label: '重启联锁机',
handler: this.restartInterlock,

58
src/utils/screen.js
View File

@ -1,6 +1,6 @@
// 判断全屏模式是否是可用
export function isFullscreenEnabled() {
return document.fullscreenEnabled ||
return document.fullscreenEnabled ||
document.mozFullScreenEnabled ||
document.webkitFullscreenEnabled ||
document.msFullscreenEnabled || false;
@ -8,7 +8,7 @@ export function isFullscreenEnabled() {
// 判断浏览器是否全屏
export function isFullscreen() {
return document.fullscreenElement ||
return document.fullscreenElement ||
document.msFullscreenElement ||
document.mozFullScreenElement ||
document.webkitFullscreenElement || false;
@ -16,36 +16,36 @@ export function isFullscreen() {
// 启动全屏
export function launchFullscreen() {
if (isFullscreenEnabled()) {
const element = document.documentElement;
if (element.requestFullScreen) {
element.requestFullScreen();
} else if (element.mozRequestFullScreen) {
element.mozRequestFullScreen();
} else if (element.msRequestFullscreen) {
element.msRequestFullscreen();
} else if (element.oRequestFullscreen) {
element.oRequestFullscreen();
} else if (element.webkitRequestFullScreen) {
element.webkitRequestFullScreen();
}
}
if (isFullscreenEnabled()) {
const element = document.documentElement;
if (element.requestFullScreen) {
element.requestFullScreen();
} else if (element.mozRequestFullScreen) {
element.mozRequestFullScreen();
} else if (element.msRequestFullscreen) {
element.msRequestFullscreen();
} else if (element.oRequestFullscreen) {
element.oRequestFullscreen();
} else if (element.webkitRequestFullScreen) {
element.webkitRequestFullScreen();
}
}
}
// 退出全屏
export function exitFullscreen() {
if (isFullscreen()) {
if (document.exitFullscreen) {
document.exitFullscreen();
} else if (document.msExitFullscreen) {
document.msExitFullscreen();
} else if (document.mozCancelFullScreen) {
document.mozCancelFullScreen();
} else if (document.mozExitFullScreen) {
document.mozExitFullScreen();
} else if (document.webkitExitFullscreen) {
document.webkitExitFullscreen();
}
}
if (isFullscreen()) {
if (document.exitFullscreen) {
document.exitFullscreen();
} else if (document.msExitFullscreen) {
document.msExitFullscreen();
} else if (document.mozCancelFullScreen) {
document.mozCancelFullScreen();
} else if (document.mozExitFullScreen) {
document.mozExitFullScreen();
} else if (document.webkitExitFullscreen) {
document.webkitExitFullscreen();
}
}
}

2
src/views/designPlatform/index.vue
View File

@ -13,7 +13,6 @@
<script>
import demonList from './demonList';
import drapLeft from '@/views/components/drapLeft/index';
import { launchFullscreen } from '@/utils/screen';
import localStore from 'storejs';
import { getSessionStorage, setSessionStorage } from '@/utils/auth';
@ -44,7 +43,6 @@ export default {
mounted() {
const againEnter = getSessionStorage('againEnter') || null;
if (!againEnter) {
launchFullscreen();
setSessionStorage('againEnter', true);
}
this.resize();

3
src/views/login/index.vue
View File

@ -155,7 +155,6 @@ import FloatPart from './floatPart';
import { getSimulationInfoNew } from '@/api/simulation';
import { getSimulationInfoByGroup } from '@/api/rtSimulation';
import { getSessionStorage } from '@/utils/auth';
import { launchFullscreen } from '@/utils/screen';
import Register from './register';
export default {
@ -563,7 +562,6 @@ export default {
project:this.project
}});
this.loading = false;
launchFullscreen();
});
} else {
getSimulationInfoNew(res.data.group).then(resp => {
@ -588,7 +586,6 @@ export default {
}});
}
this.loading = false;
launchFullscreen();
});
}
});

2
src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
View File

@ -202,7 +202,7 @@ export default {
this.tipInfoList = [];
const models = [];
this.sectionList.forEach(section => {
if (section.transferTrack || section.reentryTrack || section.standTrack) {
if (section.transferTrack || section.reentryTrack || section.standTrack || section.parkingTrack) {
const trainModel = this.trainModelList[0];
if (section.lengthFact < trainModel.length ) {
this.tipInfoList.push(`${section.name}[${section.code}]${this.$t('map.failedToSetParkingPointOffset')}`);

8
src/views/planMonitor/components/menus/addTask.vue
View File

@ -178,14 +178,6 @@ export default {
name: 'AddTask',
components: {
},
// props: {
// loadRunPlanId: {
// type: String,
// default() {
// return '';
// }
// }
// },
data() {
return {
tableLoading:false,

8
src/views/planMonitor/components/menus/deleteTask.vue
View File

@ -20,14 +20,6 @@ export default {
name: 'DeleteTask',
components: {
},
// props: {
// loadRunPlanId: {
// type: String,
// default() {
// return '';
// }
// }
// },
data() {
return {
isPlan: false,

3
src/views/planMonitor/components/menus/editPlanningTrain.vue
View File

@ -224,8 +224,9 @@ export default {
handleEditTask() {
if (this.currentRow.id) {
this.$emit('dispatchDialog', {
name: 'modifyingTask', params: {
name: 'showDialog', params: {
isPlan: true,
dialogType:'modifyingTask',
serviceNumber: this.model.serviceNumber,
tripNumber: this.currentRow.tripNumber,
rowData:this.currentRow

43
src/views/planMonitor/components/menus/modifyingTask.vue
View File

@ -1,16 +1,5 @@
<template>
<el-dialog
v-dialogDrag
class="planEdit__tool add-task"
:title="title"
:visible.sync="dialogShow"
width="1000px"
:before-close="doClose"
:z-index="2000"
top="50px"
:modal="false"
:close-on-click-modal="false"
>
<div>
<el-row>
<el-col :span="6">
<el-row>
@ -119,11 +108,11 @@
</el-table-column>
</el-table>
</el-row>
<span slot="footer" class="dialog-footer">
<div style="text-align:center;margin-top:15px;">
<el-button size="medium" @click="doClose">{{ $t('global.cancel') }}</el-button>
<el-button type="primary" size="medium" @click="handleCommit">{{ $t('global.confirm') }}</el-button>
</span>
</el-dialog>
</div>
</div>
</template>
<script>
import { updatePlanTrip, getMapStationRunUser, getStationStopTime } from '@/api/runplan';
@ -134,19 +123,10 @@ export default {
name: 'ModifyingTask',
components: {
},
props: {
loadRunPlanId: {
type: String,
default() {
return '';
}
}
},
data() {
return {
dialogShow: false,
loading: false,
isPlan: false,
loadRunPlanId:'',
PlanParser: {},
parkSectionCodeList:[],
stopStationMap: {},
@ -184,11 +164,6 @@ export default {
}
};
},
computed: {
title() {
return this.$t('planMonitor.modifying.modifyTask');
}
},
watch: {
'editModel.startTime': function () {
this.computedDetailList();
@ -290,6 +265,7 @@ export default {
this.tripNumber = params.tripNumber;
this.serviceNumber = params.serviceNumber;
this.planId = this.$route.query.planId;
this.loadRunPlanId = params.loadRunPlanId;
this.PlanParser = this.$theme.loadPlanParser(lineCode);
if (mapId) {
@ -309,7 +285,7 @@ export default {
this.stopTimeMap[element.stationCode] = {parkingTime:element.parkingTime};
});
this.initTaskData(params);
this.dialogShow = true;
// this.dialogShow = true;
});
});
}
@ -411,7 +387,7 @@ export default {
}
this.initRunlevel(this.editModel);
this.dialogShow = true;
// this.dialogShow = true;
this.computedDetailList();
}
}
@ -451,8 +427,7 @@ export default {
this.loadInitData(params);
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$emit('doClose');
},
buildModel() {
return {

11
src/views/planMonitor/components/menus/taskDialog.vue
View File

@ -13,17 +13,21 @@
>
<add-task v-if="dialogType =='addTask'" ref="addTask" @dispatchOperate="dispatchOperate" @refresh="refresh" @doClose="doClose" />
<delete-task v-if="dialogType =='deleteTask'" ref="deleteTask" @dispatchOperate="dispatchOperate" @refresh="refresh" @doClose="doClose" />
<modifying-task v-if="dialogType =='modifyingTask'" ref="modifyingTask" @dispatchOperate="dispatchOperate" @refresh="refresh" @doClose="doClose" />
</el-dialog>
</template>
<script>
import AddTask from './addTask';
import DeleteTask from './deleteTask';
import ModifyingTask from './modifyingTask';
export default {
name: 'TaskDialog',
components: {
AddTask,
DeleteTask
DeleteTask,
ModifyingTask
},
props: {
loadRunPlanId: {
@ -51,6 +55,10 @@ export default {
'deleteTask':{
title:this.$t('planMonitor.deleteTask'),
width:'400px'
},
'modifyingTask':{
title:this.$t('planMonitor.modifying.modifyTask'),
width:'1000px'
}
};
const dialog = dialogMap[params.dialogType];
@ -65,6 +73,7 @@ export default {
},
doClose() {
this.dialogShow = false;
this.dialogType = '';
},
dispatchOperate(data) {
this.$emit('dispatchOperate', data);

8
src/views/planMonitor/editTool/index.vue
View File

@ -41,13 +41,9 @@
<systerm-out ref="systermOut" />
<!-- <add-task ref="addTask" @dispatchOperate="dispatchOperate" @refresh="refresh" /> -->
<!-- <delete-task ref="deleteTask" @dispatchOperate="dispatchOperate" @refresh="refresh" /> -->
<!-- <modifying-task ref="modifyingTask" :load-run-plan-id="loadRunPlanId" @dispatchOperate="dispatchOperate" @refresh="refresh" /> -->
<task-dialog ref="showDialog" @dispatchOperate="dispatchOperate" @refresh="refresh" />
<modifying-task ref="modifyingTask" :load-run-plan-id="loadRunPlanId" @dispatchOperate="dispatchOperate" @refresh="refresh" />
<modifying-station-interval-time ref="modifyingStationIntervalTime" />
<modifying-station-stop-time ref="modifyingStationStopTime" />
<edit-plan-name ref="editPlan" @renewal="refreshRunPlanName" />
</div>
</template>
@ -64,7 +60,6 @@ import EditPlanName from '../components/menus/editPlanName';
import DuplicateTrain from '../components/menus/duplicateTrain';
import SystermOut from '../components/menus/systermOut';
import TaskDialog from '../components/menus/taskDialog';
import ModifyingTask from '../components/menus/modifyingTask';
import MovePlaningTrain from '../components/menus/movePlaningTrain';
import ModifyingStationIntervalTime from '../components/menus/modifyingStationIntervalTime';
import ModifyingStationStopTime from '../components/menus/modifyingStationStopTime';
@ -84,7 +79,6 @@ export default {
DuplicateTrain,
SystermOut,
TaskDialog,
ModifyingTask,
// AddSmoothRunTime,
// EditSmoothRunTime,
ModifyingStationIntervalTime,

4
src/views/planMonitor/editTool/menuBar.vue
View File

@ -593,7 +593,9 @@ export default {
handleModifyingTask() {
const params = this.$store.state.runPlan.selected;
if (params.serviceNumber && params.tripNumber) {
this.$emit('dispatchDialog', { name: 'modifyingTask', params });
// this.$emit('dispatchDialog', { name: 'modifyingTask', params });
params.dialogType = 'modifyingTask';
this.$emit('dispatchDialog', { name: 'showDialog', params });
} else {
this.$messageBox(this.$t('tip.selectATrain'));
}

4
src/views/planMonitor/editTool/statusBar.vue
View File

@ -125,7 +125,9 @@ export default {
handleModifyingTask() {
const params = this.$store.state.runPlan.selected;
if (params.serviceNumber && params.tripNumber) {
this.$emit('dispatchDialog', { name: 'modifyingTask', params });
// this.$emit('dispatchDialog', { name: 'modifyingTask', params });
params.dialogType = 'modifyingTask';
this.$emit('dispatchDialog', { name: 'showDialog', params });
} else {
this.$messageBox(this.$t('tip.selectATrain'));
}

4
src/views/planMonitor/newEditTool/index.vue
View File

@ -40,8 +40,6 @@
<task-dialog ref="showDialog" :load-run-plan-id="loadRunPlanId" @dispatchOperate="dispatchOperate" @refresh="refresh" />
<modifying-task ref="modifyingTask" :load-run-plan-id="loadRunPlanId" @dispatchOperate="dispatchOperate" @refresh="refresh" />
<modifying-station-interval-time ref="modifyingStationIntervalTime" />
<modifying-station-stop-time ref="modifyingStationStopTime" />
<edit-plan-name ref="editPlan" @renewal="refreshRunPlanName" />
@ -62,7 +60,6 @@ import EditPlanName from '../components/menus/editPlanName';
import DuplicateTrain from '../components/menus/duplicateTrain';
import SystermOut from '../components/menus/systermOut';
import TaskDialog from '../components/menus/taskDialog';
import ModifyingTask from '../components/menus/modifyingTask';
import MovePlaningTrain from '../components/menus/movePlaningTrain';
import ModifyingStationIntervalTime from '../components/menus/modifyingStationIntervalTime';
import ModifyingStationStopTime from '../components/menus/modifyingStationStopTime';
@ -84,7 +81,6 @@ export default {
DuplicateTrain,
SystermOut,
TaskDialog,
ModifyingTask,
// AddSmoothRunTime,
// EditSmoothRunTime,
ModifyingStationIntervalTime,

4
src/views/planMonitor/newEditTool/menuBar.vue
View File

@ -662,7 +662,9 @@ export default {
handleModifyingTask() {
const params = this.$store.state.runPlan.draftSelected;
if (params.serviceNumber && params.tripNumber) {
this.$emit('dispatchDialog', { name: 'modifyingTask', params });
// this.$emit('dispatchDialog', { name: 'modifyingTask', params });
params.dialogType = 'modifyingTask';
this.$emit('dispatchDialog', { name: 'showDialog', params });
} else {
this.$messageBox(this.$t('tip.selectATrain'));
}

4
src/views/planMonitor/newEditTool/statusBar.vue
View File

@ -132,7 +132,9 @@ export default {
handleModifyingTask() {
const params = this.$store.state.runPlan.draftSelected;
if (params.serviceNumber && params.tripNumber) {
this.$emit('dispatchDialog', { name: 'modifyingTask', params });
// this.$emit('dispatchDialog', { name: 'modifyingTask', params });
params.dialogType = 'modifyingTask';
this.$emit('dispatchDialog', { name: 'showDialog', params });
} else {
this.$messageBox(this.$t('tip.selectATrain'));
}

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

@ -113,7 +113,9 @@ export default {
'transferRouteCanOnlyFaultUnlock',
'setManualWhenHeadTrainArriveTarget',
'routeDefaultCheckConflict',
'tripNumberIsUnique'
'tripNumberIsUnique',
'standTbStrategyIsInvalid',
'updateTripPlanByServiceNumber'
],
selectList: ['runMode', 'singleApproachLockCancelRoute'],
generalConfig: [
@ -160,7 +162,9 @@ export default {
'transferRouteCanOnlyFaultUnlock',
'setManualWhenHeadTrainArriveTarget',
'routeDefaultCheckConflict',
'tripNumberIsUnique'
'tripNumberIsUnique',
'standTbStrategyIsInvalid',
'updateTripPlanByServiceNumber'
],
rangeList: ['noParkingSM', 'parkingSM'],
speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@ -213,7 +217,9 @@ export default {
transferRouteCanOnlyFaultUnlock: '转换轨进路只能通过故障解锁来取消',
setManualWhenHeadTrainArriveTarget: '头码车抵达目的地后变为人工车',
routeDefaultCheckConflict: '进路默认开启冲突检测',
tripNumberIsUnique: '运行图中车次号是否唯一'
tripNumberIsUnique: '运行图中车次号是否唯一',
standTbStrategyIsInvalid: '站台折返策略不生效',
updateTripPlanByServiceNumber: '根据服务号更新车次计划'
}
};
},

2
src/views/trainingPlatform/index.vue
View File

@ -13,7 +13,6 @@
<script>
import demonList from './demonList';
import drapLeft from '@/views/components/drapLeft/index';
import { launchFullscreen } from '@/utils/screen';
import localStore from 'storejs';
import { getSessionStorage, setSessionStorage } from '@/utils/auth';
@ -43,7 +42,6 @@ export default {
goRoutePath(data) {
const againEnter = getSessionStorage('againEnter') || null;
if (!againEnter) {
launchFullscreen();
const project = getSessionStorage('project');
const userId = this.$store.state.user.id;
const path = localStore.get('trainingPlatformRoute' + userId + project);