From 2048eb43dd732459960be88ab68a2cbc297042c9 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Wed, 27 Mar 2024 15:48:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=BA=93=E9=97=A8=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../draw-app/dialogs/CkmOperation.vue | 2 +- src/graphics/garageDoor/GarageDoor.ts | 23 +++++++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/components/draw-app/dialogs/CkmOperation.vue b/src/components/draw-app/dialogs/CkmOperation.vue index 07a9df7..a423c38 100644 --- a/src/components/draw-app/dialogs/CkmOperation.vue +++ b/src/components/draw-app/dialogs/CkmOperation.vue @@ -112,7 +112,7 @@ const ckmFaultOption = [ value: request.Ckm.Fault.FA_NONE, }, { - label: '设置故障物', + label: '状态丢失', value: request.Ckm.Fault.FA_State_Loss, }, ]; diff --git a/src/graphics/garageDoor/GarageDoor.ts b/src/graphics/garageDoor/GarageDoor.ts index 6aa6805..c640cb2 100644 --- a/src/graphics/garageDoor/GarageDoor.ts +++ b/src/graphics/garageDoor/GarageDoor.ts @@ -36,7 +36,8 @@ export interface IGarageDoorState extends GraphicState { const garageConsts = { codeFontSize: 12, codeColor: 0xffffff, - bodyLineColor: 0x0000ff, + bodyLineColor: 0xffffff, + lossStateColor: 0x0000ff, bodyLineWidth: 2, bodyColor: 0x000000, bodyRectWidth: 10, @@ -81,10 +82,11 @@ export class GarageDoor extends JlGraphic { codeGraph.position.set(0, -30); } this.lineBody.clear(); - this.lineBody.lineStyle( - garageConsts.bodyLineWidth, - garageConsts.bodyLineColor - ); + const color = + this.states.param?.fault === request.Ckm.Fault.FA_State_Loss + ? garageConsts.lossStateColor + : garageConsts.bodyLineColor; + this.lineBody.lineStyle(garageConsts.bodyLineWidth, color); this.lineBody.moveTo( -garageConsts.bodyRectWidth / 2, -garageConsts.bodyRectHeight / 2 @@ -101,8 +103,15 @@ export class GarageDoor extends JlGraphic { garageConsts.bodyRectWidth / 2, garageConsts.bodyRectHeight / 2 ); - this.lineBody.moveTo(0, -garageConsts.bodyRectHeight / 2); - this.lineBody.lineTo(0, garageConsts.bodyRectHeight / 2); + if (this.states.mgj) { + this.lineBody.moveTo(0, -garageConsts.bodyRectHeight / 2); + this.lineBody.lineTo(0, garageConsts.bodyRectHeight / 2); + } else { + this.lineBody.moveTo(0, -garageConsts.bodyRectHeight / 2); + this.lineBody.lineTo(0, -garageConsts.bodyRectHeight / 4); + this.lineBody.moveTo(0, garageConsts.bodyRectHeight / 4); + this.lineBody.lineTo(0, garageConsts.bodyRectHeight / 2); + } } buildRelation() {