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:
zyy 2020-06-24 17:37:24 +08:00
commit 678f0ba839
13 changed files with 28 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,7 +286,8 @@ class SkinCode extends defaultStyle {
monolockLocationColor: 'lightgreen', // 道岔单锁'定位'颜色 (浅绿色)
monolockInversionColor: '#FFFF00', // 道岔单锁'反位'颜色 (黄色)
block: true, // 封锁名称
faultFlashing: true // 故障闪烁
faultFlashing: true, // 故障闪烁
lossRect: true // 道岔失表矩形
},
sectionAction: {
flag: false, // 道岔 关联区段显示

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

@ -285,7 +285,7 @@ export default {
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { 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.cancelFault, this.selected);
}
});
}

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

@ -204,7 +204,7 @@ export default {
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { 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.cancelFault, this.selected);
}
});
},

2
src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
View File

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

2
src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
View File

@ -191,7 +191,7 @@ export default {
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { 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.cancelFault, this.selected);
}
});
},

2
src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
View File

@ -164,7 +164,7 @@ export default {
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { 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.cancelFault, this.selected);
}
});
},

2
src/jmapNew/theme/foshan_01/menus/menuSignal.vue
View File

@ -239,7 +239,7 @@ export default {
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { 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.cancelFault, this.selected);
}
});
},

4
src/jmapNew/theme/ningbo_01/planConvert.js
View File

@ -134,7 +134,7 @@ export default {
/** 如果车次号为空，不显示名称*/
if (train.tripNumber) {
/** 创建标记点名称和坐标*/
pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`;
pointdata.name = `${service.serviceNumber}${train.tripNumber}${train.destinationCode || ''}`;
pointdata.color = '#000' || lineStyle.color;
pointdata.directionCode = train.directionCode;
pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)];
@ -229,7 +229,7 @@ export default {
serie.markPoint.data.push(createMartPoint({
directionCode: elem.directionCode,
coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)],
name: `(${elem.groupNumber})${elem.serviceNumber}${elem.directionCode}${elem.tripNumber}`,
name: `(${elem.groupNumber})${elem.serviceNumber}${elem.tripNumber}${elem.destinationCode || ''}`,
color: lineStyle.color || '#000'
}));
}

2
src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue
View File

@ -133,7 +133,6 @@ export default {
send: true,
operation: OperationEvent.Signal.detail.menu.operation
};
this.loading = true;
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
@ -150,7 +149,6 @@ export default {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();

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

@ -205,7 +205,7 @@ export default {
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { 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.cancelFault, this.selected);
}
});
},

2
src/jmapNew/theme/xian_01/menus/menuStationStand.vue
View File

@ -204,7 +204,7 @@ export default {
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { 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.cancelFault, this.selected);
}
});
},

2
src/jmapNew/theme/xian_01/menus/menuSwitch.vue
View File

@ -228,7 +228,7 @@ export default {
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { 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.cancelFault, this.selected);
}
});
},

45
src/jmapNew/theme/xian_02/menus/menuSwitch.vue
View File

@ -49,12 +49,12 @@ export default {
menuNormal: {
Local: [
{
label: '定操',
label: '道岔定位',
handler: this.locate,
cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
},
{
label: '反操',
label: '道岔反位',
handler: this.reverse,
cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
},
@ -67,17 +67,17 @@ export default {
label: '道岔单解',
handler: this.unlock,
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
},
{
label: '道岔封锁',
handler: this.block,
cmdType: CMD.Switch.CMD_SWITCH_BLOCK
},
{
label: '道岔解封',
handler: this.unblock,
cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK
}
// {
// label: '道岔封锁',
// handler: this.block,
// cmdType: CMD.Switch.CMD_SWITCH_BLOCK
// },
// {
// label: '道岔解封',
// handler: this.unblock,
// cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK
// }
],
Center: [
{
@ -238,7 +238,7 @@ export default {
this.$store.dispatch('menuOperation/pushRequestList', {
device: this.selected,
operation: { code: OperationEvent.Switch.locate.menu.operation, name: '道岔定位'},
cmdType: CMD.Switch.CMD_SWITCH_TURN,
cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION,
param: operate.param
});
}
@ -251,12 +251,13 @@ export default {
this.$store.dispatch('menuOperation/pushRequestList', {
device: this.selected,
operation: { code: OperationEvent.Switch.reverse.menu.operation, name: '道岔反位'},
cmdType: CMD.Switch.CMD_SWITCH_TURN,
cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION,
param: operate.param
});
}
});
},
// 道岔单锁
lock() {
commitOperate(menuOperate.Switch.lock, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
@ -300,22 +301,6 @@ export default {
}
});
},
// 区段切除
split() {
commitOperate(menuOperate.Switch.split, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.switchControl.doShow(operate, this.selected);
}
});
},
// 区段激活
active() {
commitOperate(menuOperate.Switch.active, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.switchControl.doShow(operate, this.selected);
}
});
},
// 设置临时限速
setSpeed() {
commitOperate(menuOperate.Switch.setSpeed, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{