From f0db7a70ab49f4977c63f1dd9d27db5b9bd8887a Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Wed, 27 Mar 2024 15:47:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/configs/UrlManage.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 1797ecb..9124179 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "format": "prettier --write \"**/*.{js,ts,vue,scss,html,md,json}\" --ignore-path .gitignore", "test": "echo \"No test specified\" && exit 0", "dev": "quasar dev", - "build": "quasar build", + "build": "set NODE_ENV=local_test&&quasar build", "build:test": "set NODE_ENV=test&&quasar build", "build:publish": "set NODE_ENV=publish&&quasar build", "protoc": "node scripts/proto.cjs", diff --git a/src/configs/UrlManage.ts b/src/configs/UrlManage.ts index 815e4f8..b047e37 100644 --- a/src/configs/UrlManage.ts +++ b/src/configs/UrlManage.ts @@ -3,6 +3,8 @@ function getHost(): string { return 'test.joylink.club/bjrtsts-server'; } else if (process.env.ENV_MODE == 'publish') { return 'joylink.club/bjrtsts-server'; + } else if (process.env.NODE_ENV == 'local_test') { + return '192.168.33.233:9091'; } // return '192.168.3.7:9091'; // return '192.168.3.47:9091'; From 9c95c229e5dc50c4195318ceb930a210bed3b2c0 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Wed, 27 Mar 2024 15:48:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?psl=E5=88=87=E6=8D=A2=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=9B=B4=E6=96=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/LineLayout.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/LineLayout.vue b/src/layouts/LineLayout.vue index a9f7de6..41fe8c8 100644 --- a/src/layouts/LineLayout.vue +++ b/src/layouts/LineLayout.vue @@ -246,7 +246,7 @@ watch( if (!container) return; const pslScene = pslStore.getPslScene(); pslScene?.bindDom(container); - await pslScene?.reload(); + await pslScene?.forceReload(); if (pslScene) { pslCanvasWidth.value = pslScene.canvas.width; pslCanvasHeight.value = pslScene.canvas.height; 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 3/3] =?UTF-8?q?=E8=BD=A6=E5=BA=93=E9=97=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=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() {