Compare commits
No commits in common. "2048eb43dd732459960be88ab68a2cbc297042c9" and "b0b00746083cc228017b9dd5229c183fe427a740" have entirely different histories.
2048eb43dd
...
b0b0074608
@ -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": "set NODE_ENV=local_test&&quasar build",
|
||||
"build": "quasar build",
|
||||
"build:test": "set NODE_ENV=test&&quasar build",
|
||||
"build:publish": "set NODE_ENV=publish&&quasar build",
|
||||
"protoc": "node scripts/proto.cjs",
|
||||
|
@ -112,7 +112,7 @@ const ckmFaultOption = [
|
||||
value: request.Ckm.Fault.FA_NONE,
|
||||
},
|
||||
{
|
||||
label: '状态丢失',
|
||||
label: '设置故障物',
|
||||
value: request.Ckm.Fault.FA_State_Loss,
|
||||
},
|
||||
];
|
||||
|
@ -3,8 +3,6 @@ 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';
|
||||
|
@ -36,8 +36,7 @@ export interface IGarageDoorState extends GraphicState {
|
||||
const garageConsts = {
|
||||
codeFontSize: 12,
|
||||
codeColor: 0xffffff,
|
||||
bodyLineColor: 0xffffff,
|
||||
lossStateColor: 0x0000ff,
|
||||
bodyLineColor: 0x0000ff,
|
||||
bodyLineWidth: 2,
|
||||
bodyColor: 0x000000,
|
||||
bodyRectWidth: 10,
|
||||
@ -82,11 +81,10 @@ export class GarageDoor extends JlGraphic {
|
||||
codeGraph.position.set(0, -30);
|
||||
}
|
||||
this.lineBody.clear();
|
||||
const color =
|
||||
this.states.param?.fault === request.Ckm.Fault.FA_State_Loss
|
||||
? garageConsts.lossStateColor
|
||||
: garageConsts.bodyLineColor;
|
||||
this.lineBody.lineStyle(garageConsts.bodyLineWidth, color);
|
||||
this.lineBody.lineStyle(
|
||||
garageConsts.bodyLineWidth,
|
||||
garageConsts.bodyLineColor
|
||||
);
|
||||
this.lineBody.moveTo(
|
||||
-garageConsts.bodyRectWidth / 2,
|
||||
-garageConsts.bodyRectHeight / 2
|
||||
@ -103,15 +101,8 @@ export class GarageDoor extends JlGraphic {
|
||||
garageConsts.bodyRectWidth / 2,
|
||||
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);
|
||||
}
|
||||
this.lineBody.moveTo(0, -garageConsts.bodyRectHeight / 2);
|
||||
this.lineBody.lineTo(0, garageConsts.bodyRectHeight / 2);
|
||||
}
|
||||
|
||||
buildRelation() {
|
||||
|
@ -246,7 +246,7 @@ watch(
|
||||
if (!container) return;
|
||||
const pslScene = pslStore.getPslScene();
|
||||
pslScene?.bindDom(container);
|
||||
await pslScene?.forceReload();
|
||||
await pslScene?.reload();
|
||||
if (pslScene) {
|
||||
pslCanvasWidth.value = pslScene.canvas.width;
|
||||
pslCanvasHeight.value = pslScene.canvas.height;
|
||||
|
Loading…
Reference in New Issue
Block a user