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-02-04 11:03:57 +08:00
commit 8cb4ef4bdc
493 changed files with 3304 additions and 7025 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/competition.js
View File

@ -155,3 +155,10 @@ export function queryCompetitionPracticalPermissions(params) {
params
});
}
/** 国赛获取支付二维码 */
export function getPayQrCode(mapId, monthAmount) {
return request( {
url: `/api/v1/competitionPractical/purchasePermission?mapId=${mapId}&monthAmount=${monthAmount}`,
method: 'post'
});
}

5
src/jmapNew/config/skinCode/bejing_01.js
View File

@ -6,7 +6,8 @@ class SkinCode extends defaultStyle {
super();
this.fontFamily = '宋体';
this[deviceType.Section] = {
elemnetType:['name', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'destinationText', 'line', 'separator', 'speedLimit'],
elemnetType:['name', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'destinationText', 'line', 'separator', 'speedLimit'],
preAxleIgnoreFault: true,
active: {
routeColor: false // 进路触发颜色
},
@ -124,7 +125,7 @@ class SkinCode extends defaultStyle {
},
trainPosition:{
display: false // 列车实时位置显示
}
}
};
this[deviceType.Signal] = {

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

@ -84,14 +84,14 @@ class SkinCode extends defaultStyle {
invadeColor: '#FFFFFF', // 区段侵入颜色
spareColor: '#5578B6', // 区段空闲颜色
communicationOccupiedColor: 'red', // 区段通信车占用颜色 // 调整 未确定
unCommunicationOccupiedColor: '#EF72A7', // 区段非通讯车占用颜色
unCommunicationOccupiedColor: '#EF72A7', // 区段非通讯车占用颜色
routeLockColor: '#00ff00', // 区段进路锁定颜色
faultLockColor: 'white', // 区段故障锁定颜色
undefinedColor: '#0071C1', // 区段未定义颜色
blockColor: '#d659d6', // 区段封锁颜色(淡紫色)
atcExcisionColor: '#A0522D', // 区段atc切除颜色
atsExcisionColor: '#A0522D', // 区段ats切除颜色
invalidColor: '#AC8F40', // 计轴故障颜色
invalidColor: '#AC8F40', // 计轴故障颜色
timeReleaseColor: '#3F3F3F', // 区段延时释放颜色
protectiveLockColor: '#03C85C', // 区段保护锁闭 延续保护
protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁

2
src/jmapNew/config/skinCode/ningbo_03.js
View File

@ -180,6 +180,7 @@ class SkinCode extends defaultStyle {
},
lamp: {
bgShow: false, // 是否被选中
logicDisplayNone: true,
guidName: 'half', // 默认引导类型
borderVariable: false, // 信号灯边框可变
stopWidth: 2, // 禁止线宽度
@ -261,6 +262,7 @@ class SkinCode extends defaultStyle {
lampSpace: 60 // 灯间距
},
StationControl: {
disPlayNone: true, // 不显示
text: {
distance: 12, // 灯和文字之间的距离
fontSize: 12, // 字体大小

8
src/jmapNew/constant/deviceState.js
View File

@ -34,6 +34,7 @@ deviceState[deviceType.Switch] = {
overlapLock: 0, // 是否进路延续保护锁闭
normalPosition: 1, // 是否定位
reversePosition: 0, // 是否反位
isCiConfirm: 0, // 是否进行联锁确认
/** 定位状态*/
// locateType: {
// Default: '01', /** 道岔位置类型 - 定位（缺省值）*/
@ -76,7 +77,12 @@ deviceState[deviceType.Signal] = {
redOpen: 1, // 红灯开放(默认状态)
delayTime: 0, // 信号机延迟解锁倒计时
atsControl: 1, // 0是人工，1是自动
fault: 0 // 是否故障
fault: 0, // 是否故障
isStartSignal: 0, // 是否进路排列选中始端信号机
isTerminalSignal: 0, // 是否进路排列待选终端信号机
isCiConfirm: 0, // 是否联锁确认（并未进行联锁确认，前端根据流程给的值）
isRequestLock: 0, // 是否请求封锁或请求解封
isRequestGuide: 0 // 是否请求引导
};
deviceState[deviceType.Station] = {

127
src/jmapNew/map.js
View File

@ -248,8 +248,8 @@ class Jlmap {
this.$painter.setLevelVisible(list);
}
render(list) {
(list || []).forEach(elem => {
render(list = []) {
list.forEach(elem => {
const code = elem.code;
const type = elem._type;
// const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
@ -302,48 +302,11 @@ class Jlmap {
}
return false;
}
}
// 后处理
postHandle(list) {
list.forEach(elem => {
const code = elem.code;
const type = elem._type;
if (type == deviceType.Switch) {
const item = this.mapDevice[code];
if (item) {
const sectionA = this.mapDevice[item.sectionACode];
const sectionB = this.mapDevice[item.sectionBCode];
const sectionC = this.mapDevice[item.sectionCCode];
if (sectionA && sectionB && sectionC) {
item['cutOff'] = sectionA.cutOff;
}
}
this.$painter.update(item);
}
if (type == deviceType.Section) {
const item = this.mapDevice[code];
if (item) {
const swch = this.mapDevice[item.relSwitchCode];
if (swch) {
const sectionA = this.mapDevice[swch.sectionACode];
const sectionB = this.mapDevice[swch.sectionBCode];
const sectionC = this.mapDevice[swch.sectionCCode];
if (sectionA && sectionB && sectionC) {
swch['cutOff'] = sectionA.cutOff;
}
this.$painter.update(swch);
}
}
}
});
}
setUpdateMapDevice(list) {
setUpdateMapDevice(list = []) {
store.commit('map/updateMapDevice', list);
(list || []).forEach(elem => {
list.forEach(elem => {
const code = elem.code;
const type = elem._type;
const oDevice = this.mapDevice[code] || deviceFactory(type, elem);
@ -351,9 +314,9 @@ class Jlmap {
});
}
// 模式选择 -> 更新
updateShowMode(list, showMode) {
updateShowMode(list=[], showMode=false) {
this.showConfig.showMode = showMode;
(list || []).forEach(elem => {
list.forEach(elem => {
const code = elem.code;
const type = elem._type;
const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
@ -365,9 +328,9 @@ class Jlmap {
getShowConfig() {
return this.showConfig;
}
updateShowStation(list, stationCode) {
updateShowStation(list=[], stationCode=false) {
this.stationCode = stationCode;
(list || []).forEach(elem => {
list.forEach(elem => {
const code = elem.code;
const type = elem._type;
const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
@ -418,10 +381,10 @@ class Jlmap {
});
}
}
updatePrdType(list, val, showMode) {
updatePrdType(list = [], val = '', showMode = false) {
this.showConfig.prdType = val;
this.showConfig.showMode = showMode;
(list || []).forEach(item => {
list.forEach(item => {
const code = item.code;
const type = item._type;
const oDevice = this.mapDevice[code] || deviceFactory(type, item, this.showConfig);
@ -430,13 +393,17 @@ class Jlmap {
this.$painter.updateShowMode(oDevice);
});
}
update(list) {
this.setUpdateMapDevice(list || []); // 增加一个 前数据 处理 为了在区段中 获取全部的 道岔信息
update(list=[]) {
this.setUpdateMapDevice(list); // 增加一个 前数据 处理 为了在区段中 获取全部的 道岔信息
const codeList = [];
const controlTransferList = [];
const signalDeviceList = [];
(list || []).forEach((elem, index) => {
const signalDeviceList = [];
const selected = store.state.menuOperation.selected;
list.forEach((elem, index) => {
const code = elem.code;
const type = elem._type;
const type = elem._type;
if (elem.deviceType === 'ROUTE' && this.logicData.routeData) { // 处理进路数据状态
store.dispatch('map/updateRouteState', elem);
const route = this.logicData.routeData[code];
@ -491,7 +458,7 @@ class Jlmap {
}
store.commit('map/mapStationStateUpdate');
} else {
if (elem.deviceType === 'TRAIN') {
if (elem.deviceType === 'TRAIN') {
this.isUpdateShowTrainList = true;
store.commit('map/updateActiveTrainList', elem);
} else if (elem.deviceType === 'STAND') {
@ -501,7 +468,35 @@ class Jlmap {
psdDevice.fault = elem.fault;
this.$painter.update(psdDevice);
}
} else if (elem.deviceType === 'DIRECTION_ROD' && elem.uniqueCode) {
} else if (elem.deviceType == 'SWITCH') {
const oDevice = this.mapDevice[code]
if (oDevice) {
const sectionA = this.mapDevice[oDevice.sectionACode];
const sectionB = this.mapDevice[oDevice.sectionBCode];
const sectionC = this.mapDevice[oDevice.sectionCCode];
if (sectionA && sectionB && sectionC) {
oDevice['cutOff'] = sectionA.cutOff;
}
}
this.$painter.update(oDevice);
} else if (elem.deviceType == 'SECTION') {
const oDevice = this.mapDevice[code]
if (oDevice) {
const sDevice = this.mapDevice[oDevice.relSwitchCode];
if (sDevice) {
const sectionA = this.mapDevice[sDevice.sectionACode];
const sectionB = this.mapDevice[sDevice.sectionBCode];
const sectionC = this.mapDevice[sDevice.sectionCCode];
if (sectionA && sectionB && sectionC) {
sDevice['cutOff'] = sectionA.cutOff;
}
this.$painter.update(sDevice);
codeList.push(sDevice.code);
}
}
} else if (elem.deviceType === 'DIRECTION_ROD' && elem.uniqueCode) {
store.state.map.map.directionRodList.forEach(item => {
if (elem.uniqueCode === item.uniqueCode) {
const updateRod = this.mapDevice[item.code];
@ -509,14 +504,17 @@ class Jlmap {
this.$painter.update(updateRod);
}
});
}
const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
}
const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
if (elem.dispose) {
this.$painter.delete(oDevice);
} else {
this.$painter.update(oDevice);
}
}
}
}
codeList.push(code);
});
if (controlTransferList.length > 0) {
@ -526,10 +524,13 @@ class Jlmap {
if (this.isUpdateShowTrainList) {
store.dispatch('map/setActiveTrainList');
this.isUpdateShowTrainList = false;
}
}
if (selected && codeList.includes(selected.code)) {
store.commit('menuOperation/setSelected', {device: {...selected}});
}
this.handleRouteSignalStatus(signalDeviceList);
// 状态后处理
this.postHandle(list || []);
if (this.methods.stateUpdate instanceof Function) { this.methods.stateUpdate(list); }
}
@ -543,10 +544,12 @@ class Jlmap {
status.atsControl = status.atsControl && elem.atsControl;
status.fleetMode = status.fleetMode || elem.fleetMode;
status.ciControl = status.ciControl || elem.ciControl;
status.lock = status.lock || elem.lock;
} else {
status.atsControl = elem.atsControl;
status.fleetMode = elem.fleetMode;
status.ciControl = elem.ciControl;
status.lock = elem.lock;
}
status.canSetCi = status.arc || elem.arc;
});

14
src/jmapNew/shape/Section/index.js
View File

@ -154,6 +154,10 @@ export default class Section extends Group {
/** 非通信车占用状态 03*/
unCommunicationOccupied() {
if (this.style.Section.preAxleIgnoreFault && this.model.preReset) {
return ;
}
if (this.line) {
this.line.setStyle({
stroke: this.style.Section.line.unCommunicationOccupiedColor,
@ -170,6 +174,10 @@ export default class Section extends Group {
}
/** ARB故障 */
invalid() {
if (this.style.Section.preAxleIgnoreFault && this.model.preReset) {
return ;
}
this.line && this.line.setStyle({
stroke: this.style.Section.line.invalidColor,
lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
@ -292,7 +300,7 @@ export default class Section extends Group {
if (this.style.Section.sectionMiddle && this.style.Section.sectionMiddle.preResetColor && !blockade) { // 南京二号线
this.sectionMiddle.setStyle({stroke: this.style.Section.sectionMiddle.preResetColor});
this.sectionMiddle.show();
}
}
}
// 延时解锁
delayUnlock() {
@ -356,13 +364,13 @@ export default class Section extends Group {
setState(model, flag = false) {
if (!this.isShowShape) return;
this.recover();
this.handleSwitchSection(model, flag);
this.handleSwitchSection(model, flag);
// 顺序代表优先级
/** 道岔保护区段锁闭 */
model.overlapLock && this.protectiveLock(model.lockRight);
/** 空闲锁闭或者叫进路锁闭 */
model.routeLock && this.routeLock(model.lockRight);
/** 计轴故障 */
/** 计轴故障 */
model.invalid && this.invalid();
/** 轨道封锁 */
model.blockade && this.block(model.routeLock);

8
src/jmapNew/shape/StationTurnBack/index.js
View File

@ -157,7 +157,13 @@ export default class StationTurnBack extends Group {
});
}
}
getShapeTipPoint() {
const rect = this.control.getBoundingRect();
return {
x: rect.x + rect.width,
y: rect.y
};
}
setShowMode() {
const showMode = this.model.showMode;
const showConditions = (this.style.StationTurnBack || {}).displayCondition;

18
src/jmapNew/shape/Switch/index.js
View File

@ -604,13 +604,25 @@ export default class Switch extends Group {
this.name.getNameText().setStyle({textFill: '#7F7F7F'});
}
preReset(normalPosition, reversePosition ) {
if (this.style.Switch.coverBlock.preResetColor) { // 范围且封锁时显示
const coverBlock = this.style.Switch.coverBlock;
if (coverBlock && coverBlock.preResetColor) { // 范围且封锁时显示
if (normalPosition) {
this.shapeModelB.show();
this.shapeModelB.setColor(this.style.Switch.coverBlock.preResetColor);
this.shapeModelB.setColor(coverBlock.preResetColor);
} else if (reversePosition) {
this.shapeModelA.show();
this.shapeModelA.setColor(this.style.Switch.coverBlock.preResetColor);
this.shapeModelA.setColor(coverBlock.preResetColor);
}
} else {
const sectionReset = this.style.Section.sectionMiddle;
if (sectionReset && sectionReset.preResetColor) {
if (normalPosition) {
this.shapeModelB.show();
this.shapeModelB.setColor(sectionReset.preResetColor);
} else if (reversePosition) {
this.shapeModelA.show();
this.shapeModelA.setColor(sectionReset.preResetColor);
}
}
}
}

5
src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue
View File

@ -229,11 +229,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
stopTask() {
if (this.task) {

5
src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue
View File

@ -74,11 +74,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
if (!this.dialogShow) {

5
src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue
View File

@ -92,11 +92,6 @@ export default {
return '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
if (!this.dialogShow) {

5
src/jmapNew/theme/beijing_01/menus/dialog/childDialog/passwordInputBox.vue
View File

@ -112,11 +112,6 @@ export default {
return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operate.operateNext) : '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

5
src/jmapNew/theme/beijing_01/menus/dialog/childDialog/popupAlarm.vue
View File

@ -48,11 +48,6 @@ export default {
return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, messages) {
this.operate = operate || {};

5
src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue
View File

@ -113,11 +113,6 @@ export default {
return disabled;
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
getProtectedSectionName(row) {
let name = '';

5
src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
View File

@ -114,11 +114,6 @@ export default {
return '变通策略管理';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
loadInitData(selected, opts) {
this.tempData = [];

5
src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue
View File

@ -166,11 +166,6 @@ export default {
return '站台详细信息';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
loadInitData(selected, opts) {
this.tempData = [];

3
src/jmapNew/theme/beijing_01/menus/dialog/stationCmdControl.vue
View File

@ -179,9 +179,6 @@ export default {
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
this.timer = setInterval(() => {
if (!this.$store.state.menuOperation.break) {
if (this.timeCountCommand > 0) {

5
src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue
View File

@ -59,11 +59,6 @@ export default {
return this.dialogShow ? OperationEvent.Station.humanControlALL.menu.domId : '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;

5
src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue
View File

@ -73,11 +73,6 @@ export default {
return this.dialogShow ? OperationEvent.Station.atsAutoControlALL.menu.domId : '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;

5
src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue
View File

@ -87,11 +87,6 @@ export default {
return '定义车组号';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;

5
src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue
View File

@ -81,11 +81,6 @@ export default {
return '删除车组号';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
loadInitData(map) {
if (map) {

5
src/jmapNew/theme/beijing_01/menus/dialog/trainDeletePlan.vue
View File

@ -97,11 +97,6 @@ export default {
return '删除计划车';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
// 如果不是断点激活，则需要对初始值进行初始化

5
src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue
View File

@ -87,11 +87,6 @@ export default {
return '修改计划车';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;

5
src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue
View File

@ -79,11 +79,6 @@ export default {
return 'ATP切除功能';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;

5
src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue
View File

@ -87,11 +87,6 @@ export default {
return '平移车组号';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;

5
src/jmapNew/theme/beijing_01/menus/dialog/trainMoveEvently.vue
View File

@ -105,11 +105,6 @@ export default {
return '平移计划车';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
// 如果不是断点激活，则需要对初始值进行初始化

5
src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue
View File

@ -87,11 +87,6 @@ export default {
return '设置头码车';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;

5
src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue
View File

@ -79,11 +79,6 @@ export default {
return '设置计划车';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;

5
src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue
View File

@ -71,11 +71,6 @@ export default {
return '设置人工车';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;

11
src/jmapNew/theme/beijing_01/menus/menuButton.vue
View File

@ -293,9 +293,6 @@ export default {
}
},
watch: {
'$store.state.config.canvasOffsetCount': function (val) {
this.resetPosition();
},
'$store.state.menuOperation.buttonOperation': function (val, old) {
this.updateButtonShow(val, old);
},
@ -303,15 +300,7 @@ export default {
this.selectedChange();
}
},
mounted() {
this.resetPosition();
},
methods: {
resetPosition() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
updateButtonShow(val, old) {
if (old) {
// 恢复旧按钮显示

5
src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/twoConfirmation.vue
View File

@ -73,11 +73,6 @@ export default {
return [];
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, message) {
this.operate = operate || {};

5
src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userAdd.vue
View File

@ -93,11 +93,6 @@ export default {
return '增加用户';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
// 非断电激活时设置初始值

5
src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userDelete.vue
View File

@ -65,11 +65,6 @@ export default {
return '删除用户';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
// 非断电激活时设置初始值

5
src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userEdit.vue
View File

@ -101,11 +101,6 @@ export default {
return '用户编辑页面';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
// 非断电激活时设置初始值

5
src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue
View File

@ -81,11 +81,6 @@ export default {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
if (!this.dialogShow) {

5
src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue
View File

@ -81,11 +81,6 @@ export default {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
if (!this.dialogShow) {

5
src/jmapNew/theme/beijing_01/menus/menuDialog/helpAbout.vue
View File

@ -73,11 +73,6 @@ export default {
return '关于ControlMonitor';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
// 非断电激活时设置初始值

5
src/jmapNew/theme/beijing_01/menus/menuDialog/manageUser.vue
View File

@ -121,11 +121,6 @@ export default {
return '用户管理';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
// 非断电激活时设置初始值

5
src/jmapNew/theme/beijing_01/menus/menuDialog/stationControl.vue
View File

@ -106,11 +106,6 @@ export default {
});
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.message = '';

5
src/jmapNew/theme/beijing_01/menus/menuDialog/trainAdd.vue
View File

@ -96,11 +96,6 @@ export default {
return '添加计划车';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

5
src/jmapNew/theme/beijing_01/menus/menuDialog/trainDelete.vue
View File

@ -79,11 +79,6 @@ export default {
return '删除计划车';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

5
src/jmapNew/theme/beijing_01/menus/menuDialog/trainTranstalet.vue
View File

@ -96,11 +96,6 @@ export default {
return '平移计划车';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

2
src/jmapNew/theme/beijing_01/menus/menuSection.vue
View File

@ -299,7 +299,7 @@ export default {
setStoppage() {
commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.SetFault, this.selected);
this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
}
});
},

5
src/jmapNew/theme/beijing_01/menus/passiveDialog/alarm.vue
View File

@ -140,11 +140,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

5
src/jmapNew/theme/beijing_01/menus/passiveDialog/timeout.vue
View File

@ -59,11 +59,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

19
src/jmapNew/theme/beijing_01/planConvert.js
View File

@ -118,7 +118,7 @@ export default {
pointdata.directionCode = train.right ? '1' : '2';
}
// pointdata.directionCode = train.directionCode;
pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)];
pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], pointdata.directionCode, false)];
/** 给服务对象添加服务名称和标记点*/
opt.markPointData.push(createMartPoint(pointdata));
@ -134,7 +134,7 @@ export default {
index > 0 && index < train.stationTimeList.length - 1) {
// ${train.directionCode}
const aa = `${train.tripNumber}`;
opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, pointdata.directionCode, false), elem.stationCode, aa]);
}
});
@ -145,8 +145,8 @@ export default {
num = this.computedReentryNumber(train.tripNumber);
// ${train.directionCode}
const aa = `${train.tripNumber}`;
opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]);
opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]);
opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, pointdata.directionCode, true, num), lastPoint.stationCode, aa]);
opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, pointdata.directionCode, true, num), nextPoint.stationCode, aa]);
}
/** 如果是备用车，按车次添加线*/
@ -210,15 +210,14 @@ export default {
runPlanData[elem.serviceNumber][elem.tripNumber].sort((a, b) => {
return parseInt(a.secondTime) - parseInt(b.secondTime);
});
let directionCode = elem.right ? '2' : '1';
if (!store.state.map.mapConfig.upRight) {
directionCode = elem.right ? '1' : '2';
}
/** 如果此记录车组号的数据为第一条时，则打上标签*/
if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) {
const result = serie.markPoint.data.some(ele => ele.name == `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`);
if (!result) {
let directionCode = elem.right ? '2' : '1';
if (!store.state.map.mapConfig.upRight) {
directionCode = elem.right ? '1' : '2';
}
serie.markPoint.data.push(createMartPoint({
directionCode: directionCode,
coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)],
@ -229,7 +228,7 @@ export default {
}
/** 计算折返点*/
var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false), elem.directionCode];
var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false), directionCode];
if (serie.data.length > 0) {
var lastPoint = serie.data[serie.data.length - 1];
if (lastPoint[2] !== nextPoint[2]) {

5
src/jmapNew/theme/chengdu_01/menus/dialog/createDeviceLabel.vue
View File

@ -186,11 +186,6 @@ export default {
return '设备标签';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

3
src/jmapNew/theme/chengdu_01/menus/dialog/sectionCmdControl.vue
View File

@ -181,9 +181,6 @@ export default {
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
this.timer = setInterval(() => {
if (!this.$store.state.menuOperation.break) {
if (this.timeCountCommand > 0) {

5
src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue
View File

@ -181,11 +181,6 @@ export default {
return list;
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(step, selected) {
// this.operate = operate || {};

5
src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/twoConfirmation.vue
View File

@ -62,11 +62,6 @@ export default {
return [];
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.domIdConfirm = '';

5
src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userAdd.vue
View File

@ -93,11 +93,6 @@ export default {
return '增加用户';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
// 非断电激活时设置初始值

5
src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userDelete.vue
View File

@ -67,11 +67,6 @@ export default {
return '删除用户';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
// 非断电激活时设置初始值

5
src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userEdit.vue
View File

@ -101,11 +101,6 @@ export default {
return '用户编辑页面';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
// 非断电激活时设置初始值

5
src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue
View File

@ -100,11 +100,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(position) {
// this.operate = operate || {};

5
src/jmapNew/theme/chengdu_01/menus/passiveDialog/alarm.vue
View File

@ -141,11 +141,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

7
src/jmapNew/theme/chengdu_01/menus/passiveDialog/timeout.vue
View File

@ -59,11 +59,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};
@ -83,7 +78,7 @@ export default {
},
cancel() {
const operate = {
operation: this.operate.type,
// operation: this.operate.type,
operation: OperationEvent.Command.close.notice.operation
};

18
src/jmapNew/theme/chengdu_01/planConvert.js
View File

@ -118,7 +118,7 @@ export default {
pointdata.directionCode = train.right ? '1' : '2';
}
// pointdata.directionCode = train.directionCode;
pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)];
pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], pointdata.directionCode, false)];
/** 给服务对象添加服务名称和标记点*/
opt.markPointData.push(createMartPointReverse(pointdata));
@ -134,7 +134,7 @@ export default {
index > 0 && index < train.stationTimeList.length - 1) {
// ${train.directionCode}
const aa = `${train.tripNumber}`;
opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, pointdata.directionCode, false), elem.stationCode, aa]);
}
});
@ -145,8 +145,8 @@ export default {
num = this.computedReentryNumber(train.tripNumber);
// ${train.directionCode}
const aa = `${train.tripNumber}`;
opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]);
opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]);
opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, pointdata.directionCode, true, num), lastPoint.stationCode, aa]);
opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, pointdata.directionCode, true, num), nextPoint.stationCode, aa]);
}
/** 如果是备用车，按车次添加线*/
@ -211,14 +211,14 @@ export default {
return parseInt(a.secondTime) - parseInt(b.secondTime);
});
let directionCode = elem.right ? '2' : '1';
if (!store.state.map.mapConfig.upRight) {
directionCode = elem.right ? '1' : '2';
}
/** 如果此记录车组号的数据为第一条时，则打上标签*/
if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) {
const result = serie.markPoint.data.some(ele => ele.name == `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`);
if (!result) {
let directionCode = elem.right ? '2' : '1';
if (!store.state.map.mapConfig.upRight) {
directionCode = elem.right ? '1' : '2';
}
serie.markPoint.data.push(createMartPointReverse({
directionCode: directionCode,
coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)],
@ -229,7 +229,7 @@ export default {
}
/** 计算折返点*/
var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false), elem.directionCode];
var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false), directionCode];
if (serie.data.length > 0) {
var lastPoint = serie.data[serie.data.length - 1];
if (lastPoint[2] !== nextPoint[2]) {

5
src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue
View File

@ -70,11 +70,6 @@ export default {
return '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
if (!this.dialogShow) {

5
src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue
View File

@ -75,11 +75,6 @@ export default {
return '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
if (!this.dialogShow) {

5
src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue
View File

@ -92,11 +92,6 @@ export default {
return '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
if (!this.dialogShow) {

5
src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
View File

@ -112,11 +112,6 @@ export default {
return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

5
src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/popupAlarm.vue
View File

@ -48,11 +48,6 @@ export default {
return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, messages) {
this.operate = operate || {};

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

@ -118,11 +118,6 @@ export default {
return '查询进路状态';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected, tempData) {
this.selected = selected;

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

@ -130,11 +130,6 @@ export default {
'mapConfig'
])
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
getProtectedSectionName(row) {
let name = '';

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

@ -123,11 +123,6 @@ export default {
return '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected, tempData) {
this.selected = selected;

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

@ -138,11 +138,6 @@ export default {
'mapConfig'
])
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
getProtectedSectionName(row) {
let name = '';

5
src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue
View File

@ -69,11 +69,6 @@ export default {
return '无岔区段属性对话框';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;

23
src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue
View File

@ -26,23 +26,26 @@
>
<span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">范围</span>
<el-row style="margin-top: -13px;">
<el-radio-group :id="domIdDetainCar" v-model="radio" @change="choose">
<el-radio-group v-model="radio" @change="choose">
<el-col :span="24">
<el-radio
:id="domIdDetainCar"
label="01"
style="display: block; text-align: left; float: left; margin-right: 10px;"
>本站台
</el-radio>
<el-radio
:id="isUpDirection? domIdDetainChoose: ''"
v-if="radio1 == 2"
:disabled="!isUpDirection"
label="02"
:label="`${isUpDirection}`"
style="display: block; text-align: left; float: left; margin-right: 10px;"
>上行全线
</el-radio>
<el-radio
:id="isUpDirection ? '': domIdDetainChoose"
v-if="radio1 == 2"
label="03"
:label="`${!isUpDirection}`"
:disabled="isUpDirection"
style="display: block; text-align: left; float: left;"
>下行全线</el-radio>
@ -296,7 +299,10 @@ export default {
},
domIdDetainCar() {
return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrain.choose.domId : '';
},
},
domIdDetainChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
},
domIdChoose() {
if (this.radio1 == '1') { // 跳停
return this.dialogShow ? OperationEvent.StationStand.setJumpStop.select.domId : '';
@ -380,11 +386,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected, tempDate = null) {
this.selected = selected;
@ -434,7 +435,9 @@ export default {
},
choose(upDown) { // 取消扣车 请求code码
const operate = {
operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation,
operation: upDown == '01'
? OperationEvent.StationStand.cancelDetainTrain.choose.operation
: OperationEvent.Command.common.choose.operation,
val: this.radio
};
if (this.radio == '02' || this.radio == '03') {

5
src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue
View File

@ -130,11 +130,6 @@ export default {
return '站台信息';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
loadInitData(selected, opts) {
this.tempData = [];

5
src/jmapNew/theme/chengdu_03/menus/dialog/trainControl.vue
View File

@ -196,11 +196,6 @@ export default {
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
loadInitData(map) {
},

5
src/jmapNew/theme/chengdu_03/menus/dialog/trainCreate.vue
View File

@ -80,11 +80,6 @@ export default {
return '设置列车';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.dialogShow = true;

5
src/jmapNew/theme/chengdu_03/menus/dialog/trainCreateNumber.vue
View File

@ -100,11 +100,6 @@ export default {
return '新建车组号';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
loadInitData(map) {
},

5
src/jmapNew/theme/chengdu_03/menus/dialog/trainDelete.vue
View File

@ -80,11 +80,6 @@ export default {
return '删除列车识别号';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
loadInitData(map) {
if (map) {

5
src/jmapNew/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue
View File

@ -95,11 +95,6 @@ export default {
return '删除车组号';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
loadInitData(map) {
},

5
src/jmapNew/theme/chengdu_03/menus/dialog/trainDetailInfo.vue
View File

@ -321,11 +321,6 @@ export default {
return '列车信息显示';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;

5
src/jmapNew/theme/chengdu_03/menus/dialog/trainEditNumber.vue
View File

@ -93,11 +93,6 @@ export default {
return '修改车组号';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
loadInitData(map) {
},

5
src/jmapNew/theme/chengdu_03/menus/dialog/trainMove.vue
View File

@ -132,11 +132,6 @@ export default {
return '移动列车识别号';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;

5
src/jmapNew/theme/chengdu_03/menus/dialog/trainMoveNumber.vue
View File

@ -110,11 +110,6 @@ export default {
return '移动车组号';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
loadInitData(map) {
},

5
src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue
View File

@ -137,11 +137,6 @@ export default {
return '移动列车识别号';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;

81
src/jmapNew/theme/chengdu_03/menus/menuButton.vue
View File

@ -144,7 +144,7 @@ export default {
};
},
computed: {
...mapGetters('training', [
...mapGetters('training', [
'operatemode'
]),
...mapGetters('map', [
@ -152,7 +152,7 @@ export default {
'routeData',
'signalList',
'autoReentryList',
'autoReentryData',
'autoReentryData'
]),
Switch() {
return OperationEvent.Switch;
@ -209,9 +209,6 @@ export default {
}
},
watch: {
'$store.state.config.canvasOffsetCount': function (val) {
this.resetPosition();
},
'$store.state.menuOperation.buttonOperation': function (val, old) {
this.updateButtonShow(val, old);
},
@ -219,9 +216,6 @@ export default {
this.selectedChange();
}
},
mounted() {
this.resetPosition();
},
beforeDestroy() {
this.buttonDown(this.Command.cancel.clearMbm.operation);
},
@ -236,12 +230,20 @@ export default {
cmdType:this.cmdType,
param: data.param
};
} else if (data.nextCmdType) {
operate = {
over: true,
operation: data.operation,
cmdType:data.nextCmdType
};
} else {
operate = {
operation: data.operateNext
};
}
this.trainingOperation(operate);
},
checkCancel() {
Handler.clear(); // 清空操作组
@ -258,11 +260,6 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
resetPosition() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
updateButtonShow(val, old) {
if (old) {
// 恢复旧按钮显示
@ -333,7 +330,7 @@ export default {
const operate = {
operation: this.$store.state.menuOperation.buttonOperation
};
let isArrangementRoute = false;
let isArrangementRoute = false;
if (deviceList.length === 1) {
const signal = deviceList[0];
const sectionModel = this.$store.getters['map/getDeviceByCode'](signal.sectionCode);
@ -385,52 +382,71 @@ export default {
}
}
},
//
handelFunctionButton(model, subType) {
// debugger;
const operate = {
over: true,
operation: this.$store.state.menuOperation.buttonOperation,
cmdType: '',
param: {}
};
if (model._type === 'StationStand' && subType === 'StopJumpLamp') {
operate.cmdType = CMD.Stand.CMD_STAND_SET_JUMP_STOP;
operate.param = {standCode: model.code, trainGroupNumber: ''};
operate.code = model.code;
operate.param = {standCode: model.code, trainGroupNumber: ''};
operate.code = model.code;
} else if (model._type === 'StationStand' && subType === 'CancelStopJumpLamp') {
operate.cmdType = CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP;
operate.param = {standCode: model.code, trainGroupNumber: ''};
operate.code = model.code;
operate.param = {standCode: model.code, trainGroupNumber: ''};
operate.code = model.code;
} else if (model._type === 'AutoTurnBack' ) {
operate.cmdType = CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK;
operate.param = {cycleCode: model.cycleCode};
operate.code = model.code;
} else if (model._type === 'AutomaticRoute') {
const route = this.routeData[model.automaticRouteCode];
operate.cmdType = CMD.Signal.CMD_SIGNAL_SET_CI_AUTO;
operate.param = {signalCode: route.startSignalCode};
operate.code = model.code;
} else if (model._type === 'Station') {
switch (subType) {
case 'substation':
operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL;
operate.param = {stationCodes: [model.code]};
operate.code = model.code;
operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL;
operate.param = {stationCodes: [model.code]};
operate.code = model.code;
break;
case 'center':
operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
operate.param = {stationCodes: [model.code]};
operate.code = model.code;
// operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
delete operate.over;
operate.subType = 'center';
operate.param = {stationCodes: [model.code]};
operate.code = model.code;
break;
case 'emergency':
operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
operate.param = {stationCodes: [model.code]};
operate.code = model.code;
// operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
delete operate.over;
operate.subType = 'emergency';
operate.param = {stationCodes: [model.code]};
operate.code = model.code;
break;
}
}
this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch((error) => {
this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
// 判断是否需要 弹窗密码框
// const operate = Object.assign({}, operate);
if (subType == 'center' || subType == 'emergency') {
operate['operateNext'] = operate.operation = this.Command.close.password.operation;
if (subType == 'center') {
operate['nextCmdType'] = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
} else {
operate['nextCmdType'] = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
}
this.$refs.password.doShow(operate);
}
}).catch((error) => {
this.deviceList = [];
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handelTotalCancel(model, subType) {
@ -460,10 +476,12 @@ export default {
} else if (model._type === 'AutoTurnBack') {
operate.cmdType = CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK;
operate.param = {cycleCode: model.cycleCode, cancelRoute: false};
operate.code = model.code;
} else if (model._type === 'AutomaticRoute') {
const route = this.routeData[model.automaticRouteCode];
operate.cmdType = CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO;
operate.param = {signalCode: route.startSignalCode};
operate.code = model.code;
}
this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch((error) => {
this.deviceList = [];
@ -671,7 +689,6 @@ export default {
if (station.controlMode == 'Local' || station.controlMode == 'Emergency') {
if (buttonOperation && this.commandTypeList.includes(model._type)) {
this.deviceList.push(model);
// debugger;
if (buttonOperation === this.Signal.arrangementRoute.button.operation) {
this.arrangementRouteOperation(this.deviceList);
} else if (buttonOperation === this.MixinCommand.totalCancel.button.operation) {
@ -697,8 +714,8 @@ export default {
this.clearOperate();
}
} else {
this.clearOperate();
this.operatemode != OperateMode.FAULT && this.$message.info('请先切换到站控或紧急站控');
this.clearOperate();
this.operatemode != OperateMode.FAULT && this.$message.info('请先切换到站控或紧急站控');
}
}
}

5
src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue
View File

@ -62,11 +62,6 @@ export default {
return [];
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.domIdConfirm = '';

5
src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userAdd.vue
View File

@ -83,11 +83,6 @@
return '增加用户'
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
})
},
methods: {
doShow(operate) {
//非断电激活时设置初始值

5
src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userDelete.vue
View File

@ -57,11 +57,6 @@
return '删除用户'
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
})
},
methods: {
doShow(operate, selected) {
//非断电激活时设置初始值

5
src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userEdit.vue
View File

@ -91,11 +91,6 @@
return '用户编辑页面'
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
})
},
methods: {
doShow(operate, selected) {
//非断电激活时设置初始值

5
src/jmapNew/theme/chengdu_03/menus/menuDialog/helpAbout.vue
View File

@ -63,11 +63,6 @@
return '关于ControlMonitor'
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
})
},
methods: {
doShow(operate) {
//非断电激活时设置初始值

5
src/jmapNew/theme/chengdu_03/menus/menuDialog/limitSpeed.vue
View File

@ -66,11 +66,6 @@ export default {
return '设置限速';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

5
src/jmapNew/theme/chengdu_03/menus/menuDialog/manageUser.vue
View File

@ -103,11 +103,6 @@
return '用户管理'
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
})
},
methods: {
doShow(operate) {
//非断电激活时设置初始值

5
src/jmapNew/theme/chengdu_03/menus/menuDialog/passwordBox.vue
View File

@ -94,11 +94,6 @@ export default {
return '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
loadInitData(operate) {
this.model.username = '';

5
src/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue
View File

@ -193,11 +193,6 @@ export default {
return '设置临时限速';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

3
src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue
View File

@ -189,9 +189,6 @@ export default {
},
mounted() {
this.loadTableData();
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
updateTableValue(code, result, success) {

5
src/jmapNew/theme/chengdu_03/menus/menuDialog/trainAdd.vue
View File

@ -95,11 +95,6 @@ export default {
return '添加计划车';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

5
src/jmapNew/theme/chengdu_03/menus/menuDialog/trainDelete.vue
View File

@ -78,11 +78,6 @@ export default {
return '删除计划车';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

5
src/jmapNew/theme/chengdu_03/menus/menuDialog/trainTranstalet.vue
View File

@ -95,11 +95,6 @@ export default {
return '平移计划车';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

1
src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue
View File

@ -103,7 +103,6 @@ export default {
mounted() {
this.$nextTick(() => {
this.setNameDisplay();
this.$store.dispatch('training/tipReload');
});
},
methods: {

5
src/jmapNew/theme/chengdu_03/menus/passiveDialog/alarm.vue
View File

@ -142,11 +142,6 @@ export default {
// }
// }
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

5
src/jmapNew/theme/chengdu_03/menus/passiveDialog/timeout.vue
View File

@ -59,11 +59,6 @@ export default {
// }
// },
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate || {};

105
src/jmapNew/theme/chengdu_03/operationConfig.js
View File

@ -26,6 +26,8 @@
// {id: "12", trainingType: "Stand", name: "站台行驶方向"}
// {id: "13", trainingType: "Stand", name: "站台行驶方向编号(反)"}
// {id: "14", trainingType: "Stand", name: "站台行驶方向(反)"}
// {id: "29", trainingType: "Stand", name: "站台名称"}
// {id: "30", trainingType: "Stand", name: "站台编码"}
// {id: "15", trainingType: "Switch", name: "道岔位置"}
// {id: "16", trainingType: "Switch", name: "道岔位置(反)"}
@ -70,7 +72,8 @@ export default {
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
{ deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【紧急站控】', codeType:'STATION', subType:'emergency' }
{ deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【紧急站控】', codeType:'STATION', subType:'emergency' },
{ deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }
]
},
{
@ -84,7 +87,8 @@ export default {
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
{ deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【中控】', codeType:'STATION', subType:'center' }
{ deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【中控】', codeType:'STATION', subType:'center' },
{ deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }
]
},
// 信号机列表
@ -153,21 +157,6 @@ export default {
{ deviceType: '04', orderNum: 4, operateCode: '3080', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' }
]
},
// {
// maxDuration: 15,
// minDuration: 8,
// operateType: CMD.Signal.CMD_STATION_SET_MASTER_GUIDE_LOCK.value,
// skinCode: '04',
// trainingName: '引导总锁({3})',
// trainingRemark: '进路办理引导总锁',
// trainingType: 'Signal',
// productTypes: ['01'],
// stepVOList: [
// { deviceType: '04', orderNum: 1, operateCode: '1190', tip: '鼠标左键点击【引导总锁】' },
// { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
// { deviceType: '04', orderNum: 3, operateCode: '1190', tip: '鼠标左键点击【{5}】', codeType:'GUIDELOCK' }
// ]
// },
{
maxDuration: 15,
minDuration: 8,
@ -652,16 +641,16 @@ export default {
{
maxDuration: 15,
minDuration: 8,
operateType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN.value,
operateType: CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN.value,
skinCode: '04',
trainingName: '取消扣车({10}-{12}站台)',
trainingRemark: '设置取消扣车功能(上行全线)',
trainingName: '全线取消扣车',
trainingRemark: '设置取消扣车功能({12}全线)',
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
{ deviceType: '06', orderNum: 2, operateCode: '5051', tip: '鼠标左键点击【上行全线】按钮', val: '02' },
{ deviceType: '06', orderNum: 3, operateCode: '508', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '06', orderNum: 2, operateCode: 'com01', tip: '鼠标左键点击【{12}全线】按钮', val: 'true' },
{ deviceType: '06', orderNum: 3, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -826,24 +815,86 @@ export default {
{ deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【退出】按钮' }
]
},
// CMD_SIGNAL_CANCEL_CI_AUTO
{
maxDuration: 15,
minDuration: 8,
operateType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO.value,
skinCode: '04',
trainingName: '设置自动进路({3} 进路)',
trainingName: '设置自动进路({3})',
trainingRemark: '设置自动进路功能',
trainingType: 'Signal',
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
{ deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'START_SIGNAL' },
{ deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' }
{ deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' }
],
// 成都三号线 特殊配置 类似于哈尔滨线的 atp/联锁进路 配置
config:{onlySignalOP:true}
config:{autoRouteBT:true}
},
{
maxDuration: 15,
minDuration: 8,
operateType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO.value,
skinCode: '04',
trainingName: '取消自动进路({3})',
trainingRemark: '取消自动进路功能',
trainingType: 'Signal',
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' },
{ deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' }
],
// 成都三号线 特殊配置 类似于哈尔滨线的 atp/联锁进路 配置
config:{autoRouteBT:true}
},
{
maxDuration: 15,
minDuration: 8,
operateType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK.value,
skinCode: '04',
trainingName: '设置自动折返({3})',
trainingRemark: '设置自动折返功能',
trainingType: 'Signal',
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
{ deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' }
],
// 成都三号线 特殊配置 类似于哈尔滨线的 atp/联锁进路 配置
config:{autoCycleBT:true}
},
{
maxDuration: 15,
minDuration: 8,
operateType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK.value,
skinCode: '04',
trainingName: '取消自动折返({3})',
trainingRemark: '取消自动折返功能',
trainingType: 'Signal',
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' },
{ deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' }
],
// 成都三号线 特殊配置 类似于哈尔滨线的 atp/联锁进路 配置
config:{autoCycleBT:true}
}
/** 暂时不生成实训 */
// {
// maxDuration: 15,
// minDuration: 8,
// operateType: CMD.Station.CMD_STATION_SET_MASTER_GUIDE_LOCK.value,
// skinCode: '04',
// trainingName: '引导总锁({3})',
// trainingRemark: '进路办理引导总锁',
// trainingType: 'Station',
// productTypes: ['01'],
// stepVOList: [
// { deviceType: '04', orderNum: 1, operateCode: '1190', tip: '鼠标左键点击【引导总锁】' },
// { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
// { deviceType: '04', orderNum: 3, operateCode: '1190', tip: '鼠标左键点击【{5}】', codeType:'GUIDELOCK' }
// ]
// }
]
};

19
src/jmapNew/theme/chengdu_03/planConvert.js
View File

@ -95,7 +95,7 @@ export default {
if (!store.state.map.mapConfig.upRight) {
pointdata.directionCode = train.right ? '1' : '2';
}
pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)];
pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], pointdata.directionCode, false)];
/** 给服务对象添加服务名称和标记点*/
opt.markPointData.push(createMartPoint(pointdata));
@ -110,7 +110,7 @@ export default {
index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime ||
index > 0 && index < train.stationTimeList.length - 1) {
const aa = `${train.tripNumber}`;
opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, pointdata.directionCode, false), elem.stationCode, aa]);
}
});
@ -120,8 +120,8 @@ export default {
nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1];
num = this.computedReentryNumber(train.tripNumber);
const aa = `${train.tripNumber}`;
opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode, aa]);
opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode, aa]);
opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, pointdata.directionCode, true, num), lastPoint.stationCode, aa]);
opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, pointdata.directionCode, true, num), nextPoint.stationCode, aa]);
}
/** 如果是备用车，按车次添加线*/
@ -182,15 +182,14 @@ export default {
runPlanData[elem.serviceNumber][elem.tripNumber].sort((a, b) => {
return parseInt(a.secondTime) - parseInt(b.secondTime);
});
let directionCode = elem.right ? '2' : '1';
if (!store.state.map.mapConfig.upRight) {
directionCode = elem.right ? '1' : '2';
}
/** 如果此记录车组号的数据为第一条时，则打上标签*/
if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) {
const result = serie.markPoint.data.some(ele => ele.name == `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}`);
if (!result) {
let directionCode = elem.right ? '2' : '1';
if (!store.state.map.mapConfig.upRight) {
directionCode = elem.right ? '1' : '2';
}
serie.markPoint.data.push(createMartPoint({
directionCode: directionCode,
coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)],
@ -201,7 +200,7 @@ export default {
}
/** 计算折返点*/
var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false), elem.directionCode];
var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false), directionCode];
if (serie.data.length > 0) {
var lastPoint = serie.data[serie.data.length - 1];
if (lastPoint[2] !== nextPoint[2]) {

5
src/jmapNew/theme/components/menus/childDialog/confirmControl.vue
View File

@ -107,11 +107,6 @@ export default {
return '';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
if (!this.dialogShow) {

Some files were not shown because too many files have changed in this diff Show More