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 
# Conflicts:
#	src/views/newMap/displayNew/menuSchema.vue
This commit is contained in:
joylink_cuiweidong 2022-07-22 16:04:28 +08:00
commit 4d8fbdf8c8
23 changed files with 313 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jmapNew/map.js
View File

@ -85,15 +85,20 @@ class Jlmap {
}
reloadStyle(lineCode) {
if (this.lineCode !== lineCode) {
this.handleModelData(this.lineCode, lineCode);
this.reloadModelData(this.lineCode, lineCode);
}
this.lineCode = lineCode;
this.style = selectLineCode(lineCode);
this.$zr.dom.style.backgroundColor = this.style.backgroundColor || '#000';
}
// 处理私有属性
handleModelData(oldLineCode, lineCode) {
reloadModelData(oldLineCode, lineCode) {
const propConvert = lineCode ? Vue.prototype.$theme.loadPropConvert(lineCode) : null;
const oldPropConvert = oldLineCode ? Vue.prototype.$theme.loadPropConvert(oldLineCode) : null;
for (const deviceCode in this.mapDevice) {
oldPropConvert.deletePrivateProps(this.mapDevice[deviceCode]);
propConvert.initPrivateProps(this.mapDevice[deviceCode]);
}
}
loadDefaultState() { // 加载默认状态
const defaultStateDict = {};

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

@ -1163,7 +1163,7 @@ class Signal extends Group {
// 灯颜色状态显示
exec(SignalAspectMap[model.signalAspect], this.lamps, this.style);
// 灯是否点灯显示
this.lamps.forEach(lamp => { lamp.setStop(model.signalLight); });
// this.lamps.forEach(lamp => { lamp.setStop(model.signalLight); });
}
if (model.hasSelected) {
this.sigName && this.sigName.setAnimationStart(this.style.Signal.text.defaultColor);

18
src/jmapNew/theme/beijing_01/model.js
View File

@ -43,9 +43,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -56,9 +56,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -66,6 +66,16 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

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

@ -46,9 +46,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -59,9 +59,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -69,6 +69,16 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

18
src/jmapNew/theme/chengdu_03/model.js
View File

@ -43,9 +43,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -56,9 +56,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -66,6 +66,16 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

20
src/jmapNew/theme/datie_01/model.js
View File

@ -43,22 +43,21 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
}
return model;
}
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -66,6 +65,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

2
src/jmapNew/theme/datie_02/menus/index.vue
View File

@ -33,7 +33,7 @@
<div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;">与中心通信正常</div>
</div>
</div>
<div v-if="$store.state.training.prdType == '01'&& !isCtc" style="width: 1405px;position: fixed;height: 30px;background: #808080;z-index: 9;bottom: 0;left: 0;display: flex;">
<div v-if="$store.state.training.prdType == '01'&& !isCtc" style="width: 1560px;position: fixed;height: 30px;background: #808080;z-index: 9;bottom: 0;left: 0;display: flex;">
<div style="width: 60%;height: 30px;line-height: 30px;text-align: center;">提示信息窗</div>
<div style="width: 40%;height: 30px;line-height: 30px;text-align: center;border-left: 2px #ccc solid;">{{ '操控A:主机' + ' ' + dateString + ' ' + time }}</div>
</div>

59
src/jmapNew/theme/datie_02/menus/menuButton.vue
View File

@ -71,16 +71,16 @@
<center><b>道岔解封</b></center>
</span>
</button>
<!--<button :id="Signal.signalLight.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalLight.menuButton.operation, ['Signal'])">-->
<!--<span style="color: black">-->
<!--<center><b>点灯</b></center>-->
<!--</span>-->
<!--</button>-->
<!--<button :id="Signal.signalDestroy.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalDestroy.menuButton.operation, ['Signal'])">-->
<!--<span style="color:#800000">-->
<!--<center><b>灭灯</b></center>-->
<!--</span>-->
<!--</button>-->
<button :id="Signal.signalTurnOn.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOn.menuButton.operation, ['Signal'])">
<span style="color: black">
<center><b>点灯</b></center>
</span>
</button>
<button :id="Signal.signalTurnOff.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOff.menuButton.operation, ['SignalButton'])">
<span style="color:#800000">
<center><b>灭灯</b></center>
</span>
</button>
<button :id="Station.stationMasterLock.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: sGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockLeftButtonDown()">
<span style="color: #800000">
<center><b>S引导总锁</b></center>
@ -213,7 +213,7 @@ export default {
return this.$store.state.map.stationSGuideMasterLock;
},
xGuideMasterLock() {
return this.$store.state.map.stationXGuideMasterLock;
return this.$store.state.map.stationXGuideMasterLock;
},
isShowBtn() {
return this.$store.state.training.prdType == '01' || this.$store.state.training.prdType == '10';
@ -243,6 +243,10 @@ export default {
return CMD.Signal.CMD_SIGNAL_SET_ROUTE;
case this.Signal.guide.button.operation: // 办理引导
return CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE;
case this.Signal.signalTurnOn.menuButton.operation:
return CMD.Signal.CMD_SIGNAL_TURN_ON;
case this.Signal.signalTurnOff.menuButton.operation:
return CMD.Signal.CMD_SIGNAL_TURN_OFF;
}
return '';
}
@ -275,7 +279,7 @@ export default {
}
},
'$store.state.map.showCentralizedStationCode': function(val) {
if (val) {
if (val) {
const station = this.$store.getters['map/getDeviceByCode'](val);
this.$store.getters['map/checkStationGuideMaster'](station.code, station.sGuideMasterLock, station.xGuideMasterLock);
}
@ -408,7 +412,8 @@ export default {
operation: operation
};
// 以下 会弹出密码框 （总人解，区故解） 铅封按钮
const operationList = [this.Signal.humanTrainRoute.button.operation, this.Section.fault.button.operation, this.Section.defectiveShunting.button.operation];
const operationList = [this.Signal.humanTrainRoute.button.operation, this.Section.fault.button.operation, this.Section.defectiveShunting.button.operation,
this.Signal.signalTurnOff.menuButton.operation];
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.operation = operation;
@ -558,7 +563,7 @@ export default {
val: model.code,
cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
};
const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode || model.code);
// const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode || model.code);
if (model._type === 'SignalButton' && model.type === 'PICK') {
operate.param = {signalCode: model.signalCode};
this.sendCommand(operate);
@ -656,6 +661,28 @@ export default {
this.sendCommand(operate);
}
},
handleSignalTurnOn(model) {
const operate = {
over: true,
code: model.code,
operation: this.$store.state.menuOperation.buttonOperation,
cmdType: CMD.Signal.CMD_SIGNAL_TURN_ON,
param: {signalCode: model.code}
};
this.sendCommand(operate);
},
handleSignalTurnOff(model) {
if (model.type === 'PICK') {
const operate = {
over: true,
code: model.code,
operation: this.$store.state.menuOperation.buttonOperation,
cmdType: CMD.Signal.CMD_SIGNAL_TURN_OFF,
param: {signalCode: model.signalCode}
};
this.sendCommand(operate);
}
},
// CHANGE_DIRECTION
selectedChange() {
// 按钮按下时
@ -687,6 +714,10 @@ export default {
this.handelFaultSection(model);
} else if (buttonOperation === this.Section.defectiveShunting.button.operation) {
this.handelDefectiveShunting(model);
} else if (buttonOperation === this.Signal.signalTurnOn.menuButton.operation) {
this.handleSignalTurnOn(model);
} else if (buttonOperation === this.Signal.signalTurnOff.menuButton.operation) {
this.handleSignalTurnOff(model);
} else {
this.clearOperate();
}

19
src/jmapNew/theme/datie_02/model.js
View File

@ -43,9 +43,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -56,9 +56,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -66,6 +66,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

19
src/jmapNew/theme/datie_jd1a/model.js
View File

@ -43,9 +43,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -56,9 +56,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -66,6 +66,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

19
src/jmapNew/theme/datie_tky/model.js
View File

@ -43,9 +43,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -56,9 +56,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -66,6 +66,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

19
src/jmapNew/theme/foshan_01/model.js
View File

@ -45,9 +45,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -58,9 +58,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -68,6 +68,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

19
src/jmapNew/theme/fuzhou_01/model.js
View File

@ -45,9 +45,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -58,9 +58,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -68,6 +68,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

19
src/jmapNew/theme/haerbin_01/model.js
View File

@ -44,9 +44,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -57,9 +57,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -67,6 +67,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

19
src/jmapNew/theme/nanjing_02/model.js
View File

@ -44,9 +44,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -57,9 +57,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -67,6 +67,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

19
src/jmapNew/theme/ningbo_01/model.js
View File

@ -54,9 +54,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -67,9 +67,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -77,6 +77,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

19
src/jmapNew/theme/ningbo_03/model.js
View File

@ -54,9 +54,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -67,9 +67,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -77,6 +77,17 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

18
src/jmapNew/theme/race_01/model.js
View File

@ -54,9 +54,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -67,9 +67,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -77,6 +77,16 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

18
src/jmapNew/theme/xian_01/model.js
View File

@ -45,9 +45,9 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -58,9 +58,9 @@ class Model {
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
@ -68,6 +68,16 @@ class Model {
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

21
src/jmapNew/theme/xian_02/model.js
View File

@ -48,29 +48,38 @@ class Model {
initPublicProps(model) {
if (model) {
var modelInitial = this.public[model._type];
const modelInitial = this.public[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
}
return model;
}
initPrivateProps(model) {
if (model) {
var modelInitial = this.private[model._type];
const modelInitial = this.private[model._type];
if (modelInitial) {
for (var prop in modelInitial) {
for (const prop in modelInitial) {
model[prop] = modelInitial[prop];
}
}
}
return model;
}
deletePrivateProps(model) {
if (model) {
const modelInitial = this.private[model._type];
if (modelInitial) {
for (const prop in modelInitial) {
delete model[prop];
}
}
}
}
}
export default new Model();

6
src/scripts/cmdPlugin/CommandEnum.js
View File

@ -139,7 +139,11 @@ export default {
/** 设置保护 */
CMD_SIGNAL_SET_OVERLAP : {value: 'Signal_Set_Overlap', label: '设置保护'},
/** 冲突进路办理 */
CMD_SIGNAL_CONFLICT_ROUTE_SET_CONFIRM:{value: 'Signal_Conflict_Route_Set_Confirm', label: '冲突进路办理'}
CMD_SIGNAL_CONFLICT_ROUTE_SET_CONFIRM:{value: 'Signal_Conflict_Route_Set_Confirm', label: '冲突进路办理'},
/** 信号机点灯 */
CMD_SIGNAL_TURN_ON: {value: 'Signal_Turn_On', label: '信号机点灯'},
/** 信号机灭灯 */
CMD_SIGNAL_TURN_OFF: {value: 'Signal_Turn_Off', label: '信号机灭灯'}
},
// 物理区段操作

8
src/scripts/cmdPlugin/OperationHandler.js
View File

@ -1774,17 +1774,17 @@ export const OperationEvent = {
}
},
// 点灯 （大铁）
signalLight: {
signalTurnOn: {
menuButton: {
operation: '3231',
domId: '_Tips-Signal-signalLight-MenuButton{BOTTOM}'
domId: '_Tips-Signal-signalTurnOn-MenuButton{BOTTOM}'
}
},
// 灭灯 （大铁）
signalDestroy: {
signalTurnOff: {
menuButton: {
operation: '3232',
domId: '_Tips-Signal-signalDestroy-MenuButton{BOTTOM}'
domId: '_Tips-Signal-signalTurnOff-MenuButton{BOTTOM}'
}
}
},

18
src/views/newMap/displayNew/menuSchema.vue
View File

@ -52,8 +52,6 @@ import RunPlanView from './demon/runPlanView';
import FaultChoose from './demon/faultChoose';
import LineBoard from '../displayCity/lineBoard';
import AddQuest from './demon/addQuest';
import TrainTicket from '../trainTicket/index';
import RegisterBook from '../registerBook/index';
import { OperateMode } from '@/scripts/ConstDic';
import { getByGroupStationList } from '@/api/jmap/map';
import { generateRunPlanInfoSync } from '@/api/jmap/mapdraft.js';
@ -63,6 +61,8 @@ import { getIbpInfoByStation } from '@/api/ibp';
import { loadRunPlanData } from '@/utils/loaddata';
import { EventBus } from '@/scripts/event-bus';
import { timesSpeedPlayback } from '@/api/rtSimulation';
import TrainTicket from '../trainTicket/index';
import RegisterBook from '../registerBook/index';
// 右上角操作
export default {
@ -74,9 +74,9 @@ export default {
AddQuest,
// RunPlanEdit,
SelectStation,
LineBoard,
TrainTicket,
RegisterBook,
LineBoard
RegisterBook
},
props: {
offset: {
@ -254,6 +254,16 @@ export default {
window.open(routeData.href, '_blank');
},
showTrainTicket() {
const stationSupervisorList = [];
for (const memberId in this.$store.state.training.memberData) {
const item = this.$store.state.training.memberData[memberId];
if (item.type === 'STATION_SUPERVISOR') {
const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
const memberData = { labelName: '值班员-' + device.name + (item.name ? `-${item.name }` : ''), id:item.id, userId:item.userId };
stationSupervisorList.push(memberData);
}
}
EventBus.$emit('trainTicketMember', stationSupervisorList);
this.$refs.trainTicket.doShow();
},
showRegisterBook() {