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:
fan 2021-04-27 15:52:39 +08:00
parent b107ae58d6
commit 83eddd42d3
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,7 +183,7 @@ class SkinCode extends defaultStyle {
fontSize: 11, // 信号机名称字体大小
fontWeight: 'bold', // 信号机名称字体粗细
defaultColor: '#FFFFFF', // 信号灯字体默认色
blockColor: '#EF0C08', // 信号灯字体锁定颜色
blockColor: '#FFFFFF', // 信号灯字体锁定颜色
checkColor: '#00FF00' // 信号保护区段检查颜色
},
lamp: {

2
src/jmapNew/shape/Signal/index.js
View File

@ -699,7 +699,7 @@ class Signal extends Group {
if (this.style.Signal.text.nameBorderShow) {
this.sigName.setStyle({ textBorderWidth: 1 });
}
if (this.sigBack) {
if (this.sigBack && (!this.model.signalButtonList || !this.model.signalButtonList.length)) {
this.sigBack.show();
this.sigBack.setStyle('fill', this.style.Signal.sigBack.fillColor);
}

22
src/jmapNew/theme/datie_01/menus/menuButton.vue
View File

@ -51,12 +51,12 @@
<center><b>单解</b></center>
</span>
</button>
<button :id="Signal.lock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.lock.button.operation, ['Signal'])">
<button :id="Signal.lock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.lock.button.operation, ['Signal', 'SignalButton'])">
<span style="color: black">
<center><b>按钮封锁</b></center>
</span>
</button>
<button :id="Signal.unlock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.unlock.button.operation, ['Signal'])">
<button :id="Signal.unlock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.unlock.button.operation, ['Signal', 'SignalButton'])">
<span style="color: black">
<center><b>按钮解封</b></center>
</span>
@ -508,15 +508,14 @@ export default {
});
},
handleGuideSignal(model) {
const signal = this.$store.getters['map/getDeviceByCode'](model.code);
const operate = {
over: true,
code: model.code,
operation: this.Signal.guide.button.operation,
cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
param: {signalId: model.code}
param: {signalId: model.signalCode}
};
if (signal.delayTime) {
if (this.guideTime) {
this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
this.guideTime = 15;
this.handleGuideTime();
@ -666,7 +665,8 @@ export default {
if (model.signalButtonList && model.signalButtonList.length > 0) {
let flag = false;
model.signalButtonList.forEach(item => {
flag = flag || item.type === 'TRAIN_TERMINAL';
const signalButton = this.$store.getters['map/getDeviceByCode'](item);
flag = flag || signalButton.type === 'PICK';
});
return flag;
} else {
@ -690,7 +690,7 @@ export default {
operate.cmdType = CMD.Signal.CMD_SIGNAL_UNBLOCK;
operate.param = {signalId: model.code};
}
} else if (model._type === 'SignalButton' && model.type === 'TRAIN_TERMINAL') {
} else if (model._type === 'SignalButton' && model.type === 'PICK') {
if (buttonOperation === this.Signal.lock.button.operation) {
operate.cmdType = CMD.Signal.CMD_SIGNAL_BLOCK;
operate.param = {signalId: model.signalCode};
@ -766,13 +766,10 @@ export default {
const station = this.$store.getters['map/getDeviceByCode'](model.stationCode);
if (station) {
if (buttonOperation && this.commandTypeList.includes(model._type)) {
this.deviceList.push(model);
if (buttonOperation === this.MixinCommand.totalCancel.button.operation) {
this.handelTotalCancel(model, subType);
} else if (buttonOperation === this.Signal.humanTrainRoute.button.operation) {
this.handleTotalHumanSolution(model);
// } else if (buttonOperation === this.Signal.guide.button.operation) {
// this.handleGuideRoute(this.deviceList);
} else if (buttonOperation === this.Signal.atsAutoControl.button.operation || buttonOperation === this.Signal.humanControl.button.operation) {
this.handelControlRoute(model);
} else if (switchOperation.includes(buttonOperation)) {
@ -805,11 +802,14 @@ export default {
checkSignalBlock(code) {
if (code) {
const signal = this.$store.getters['map/getDeviceByCode'](code);
return signal.blockade;
return signal && signal.blockade;
} else { return false; }
},
clearOperate() {
Handler.clear(); // 清空操作组
if (this.deviceList && this.deviceList.length && this.deviceList[0]._type === 'SignalButton') {
this.$store.dispatch('training/updateMapState', [{code: this.deviceList[0].code, _type: 'SignalButton', hasSelected: 0}]);
}
this.deviceList = [];
this.$store.dispatch('menuOperation/setButtonOperation', null);
}

4
src/views/newMap/newMapdraft/dataRelation/bigroutingoperate/detail.vue
View File

@ -245,8 +245,8 @@ export default {
routeAspectList.forEach(item => {
const route = this.filterRouteMap[item.routeCode];
if (route) {
const signalAspect = this.$convertField(route.signalAspect, this.signalAspectList, ['value', 'label']) || '';
nameList.push(route.name + '(' + signalAspect + ')');
const signalAspect = this.$convertField(item.signalAspect, this.signalAspectList, ['value', 'label']) || '';
nameList.push(route + '(' + signalAspect + ')');
}
});
}