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:
joylink_cuiweidong 2022-05-06 18:08:42 +08:00
parent d91c6cbbfd
commit 0a57b5343f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jmapNew/map.js
View File

@ -520,8 +520,8 @@ class Jlmap {
if (elem.receiveAspect != undefined) {
model.aspect = elem.receiveAspect;
}
if (elem.blockStatus != undefined ) {
model.blockStatus = elem.blockStatus;
if (elem.readyStatus != undefined ) {
model.readyStatus = elem.readyStatus;
}
this.$painter.update(model);
}
@ -535,8 +535,8 @@ class Jlmap {
if (elem.deliverAspect != undefined) {
model.aspect = elem.deliverAspect;
}
if (elem.blockStatus != undefined ) {
model.blockStatus = elem.blockStatus;
if (elem.readyStatus != undefined ) {
model.readyStatus = elem.readyStatus;
}
this.$painter.update(model);
}

4
src/jmapNew/shape/graph/SaidLamp/index.js
View File

@ -236,11 +236,11 @@ export default class SaidLamp extends Group {
if (model.runModel == 'S') {
// blockStatus：false * 指示灯（F）的时候为黄色，true为绿色
// 指示灯（O）为红色
if (model.blockStatus != undefined) {
if (model.readyStatus != undefined) {
if (model.aspect == 'O') {
this.control && this.control.setControlColor(this.deviceStyle.occupiedColor);
} else if (model.aspect == 'F') {
if (model.blockStatus) {
if (model.readyStatus) {
this.control && this.control.setControlColor(this.deviceStyle.blockStatusColor);
} else {
this.control && this.control.setControlColor(this.deviceStyle.noBlockStatusColor);