Merge remote-tracking branch 'origin/develop' into local-test

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",

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,
   },
 ];

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';

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(
+    const color =
-      garageConsts.bodyLineWidth,
+      this.states.param?.fault === request.Ckm.Fault.FA_State_Loss
-      garageConsts.bodyLineColor
+        ? 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);
+    if (this.states.mgj) {
-    this.lineBody.lineTo(0, garageConsts.bodyRectHeight / 2);
+      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() {

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;