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:
joylink_cuiweidong 2020-07-23 17:57:49 +08:00
commit a2fdb7a571
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/jmapNew/shape/Psd/ESafeDoor.js
View File

@ -142,15 +142,15 @@ class ESafeDoor extends Group {
} }
hasDoor(show) { hasDoor(show) {
const style = this.model.style; const style = this.model.style;
if (style.StationStand.common.special) { if (style.StationStand.common.special) {
if (show) { if (show) {
this.stand1.setStyle('fill', style.transparentColor); this.stand1.setStyle('fill', style.transparentColor);
this.stand2.setStyle('fill', style.transparentColor); this.stand2.setStyle('fill', style.transparentColor);
} else { } else {
this.stand1.setStyle('fill', style.StationStand.safetyDoor.defaultColor); this.stand1.setStyle('fill', style.StationStand.safetyDoor.defaultColor);
this.stand2.setStyle('fill', style.StationStand.safetyDoor.defaultColor); this.stand2.setStyle('fill', style.StationStand.safetyDoor.defaultColor);
} }
} else { } else {
if (!this.model.style.StationStand.safetyDoor.special) { if (!this.model.style.StationStand.safetyDoor.special) {
show ? this.safeC.hide() : this.safeC.show(); show ? this.safeC.hide() : this.safeC.show();
@ -170,8 +170,8 @@ class ESafeDoor extends Group {
} }
hide() { hide() {
this.stand1 && this.stand1.setStyle('fill', style.transparentColor); this.stand1 && this.stand1.hide();
this.stand2 && this.stand2.setStyle('fill', style.transparentColor); this.stand2 && this.stand2.hide();
this.safeL && this.safeL.hide(); this.safeL && this.safeL.hide();
this.safeC && this.safeC.hide(); this.safeC && this.safeC.hide();
this.safeR && this.safeR.hide(); this.safeR && this.safeR.hide();
@ -179,8 +179,8 @@ class ESafeDoor extends Group {
this.safeB && this.safeB.hide(); this.safeB && this.safeB.hide();
} }
show() { show() {
this.stand1 && this.stand1.setStyle('fill', style.StationStand.safetyDoor.defaultColor); this.stand1 && this.stand1.show();
this.stand2 && this.stand2.setStyle('fill', style.StationStand.safetyDoor.defaultColor); this.stand2 && this.stand2.show();
this.safeL && this.safeL.show(); this.safeL && this.safeL.show();
this.safeC && this.safeC.show(); this.safeC && this.safeC.show();
this.safeR && this.safeR.show(); this.safeR && this.safeR.show();

14
src/store/modules/training.js
View File

@ -228,13 +228,13 @@ const training = {
setSimulationUserList: (state, simulationUserList) => { setSimulationUserList: (state, simulationUserList) => {
state.simulationUserList = simulationUserList; state.simulationUserList = simulationUserList;
}, },
updateMemberTrust:(state, {deviceCode,trust}) => { updateMemberTrust:(state, {deviceCode, trust}) => {
for(let k in state.memberData){ for (const k in state.memberData) {
if(state.memberData[k].deviceCode == deviceCode){ if (state.memberData[k].deviceCode == deviceCode) {
state.memberData[k].trust = trust; state.memberData[k].trust = trust;
break; break;
}
} }
}
}, },
updateMemberListInScript:(state, {oldMemberId, newMemberId, userId, name}) => { updateMemberListInScript:(state, {oldMemberId, newMemberId, userId, name}) => {
if (oldMemberId) { if (oldMemberId) {
@ -466,7 +466,7 @@ const training = {
} }
try { try {
// 处理operation // 处理operation
Handler.handle(operate).then(rtn => { Handler.handle(operate).then(rtn => {
if (state.started) { if (state.started) {
// 教学和联系模式需要给出过程步骤提示 // 教学和联系模式需要给出过程步骤提示