车库门防淹门状态调整

rts-sim-testing-message

@@ -1 +1 @@
-Subproject commit ee7cf291112f13273080ee430588e9a9b9a72d04
+Subproject commit 208bcaedccf71e7bfd2535e2889ca4cf7c4bdbb6

src/components/line-app/states/FloodGateState.vue

@@ -83,6 +83,7 @@ const list: KeyType[] = [
   { label: '防淹门索引', key: 'id' },
   { label: '防淹门名称', key: 'code', formatFn: getNameFormat },
   { label: '防淹门关闭', key: 'mgj', formatFn: getName },
+  { label: '控制端', key: 'local', formatFn: getLocal },
   { label: '防淹门强制', key: 'param', formatFn: getForceName },
   { label: '设置故障', key: 'param', formatFn: getFaultName },
 ];
@@ -117,6 +118,9 @@ function getName(v: boolean) {
   if (v) return '是';
   return '否';
 }
+function getLocal(v: boolean) {
+  return v ? '本地' : '远程';
+}
 
 function getForceName() {
   return (

src/components/line-app/states/GarageDoorState.vue

@@ -83,6 +83,7 @@ const list: KeyType[] = [
   { label: '车库门索引', key: 'id' },
   { label: '车库门名称', key: 'code', formatFn: getNameFormat },
   { label: '车库门关闭', key: 'mgj', formatFn: getName },
+  { label: '控制端', key: 'local', formatFn: getLocal },
   // { label: '状态丢失', key: 'stateLoss', formatFn: getName },
   { label: '车库门强制', key: 'param', formatFn: getForceName },
   { label: '设置故障', key: 'param', formatFn: getFaultName },
@@ -118,6 +119,9 @@ function getName(v: boolean) {
   if (v) return '是';
   return '否';
 }
+function getLocal(v: boolean) {
+  return v ? '本地' : '远程';
+}
 
 function getForceName() {
   return (

src/configs/UrlManage.ts

@@ -9,7 +9,7 @@ function getHost(): string {
   // return '192.168.3.7:9091';
   // return '192.168.3.47:9091';
   // return '192.168.3.37:9091';
-  //return '192.168.33.207:9091'; // 张骞
+  return '192.168.33.207:9091'; // 张骞
   // return '192.168.33.93:9091';
   // return '192.168.3.37:9091'; //卫志宏
   // return 'test.joylink.club/bjrtsts-service'; // 测试

src/drawApp/graphics/FloodGateInteraction.ts

@@ -108,6 +108,12 @@ export class FloodGateState
   set param(param: request.CkmParam) {
     this.states.param = param;
   }
+  get local(): boolean {
+    return this.states.local;
+  }
+  set local(v: boolean) {
+    this.states.local = v;
+  }
   get states(): state.CkmState {
     return this.getState<state.CkmState>();
   }

src/drawApp/graphics/GarageDoorInteraction.ts

@@ -108,6 +108,12 @@ export class GarageDoorState
   set param(param: request.CkmParam) {
     this.states.param = param;
   }
+  get local(): boolean {
+    return this.states.local;
+  }
+  set local(v: boolean) {
+    this.states.local = v;
+  }
   get states(): state.CkmState {
     return this.getState<state.CkmState>();
   }

src/drawApp/lineScene.ts

@@ -465,6 +465,7 @@ function handleSubscribe(lineScene: IGraphicScene) {
             states.push(new FloodGateState(item));
           }
         });
+        // console.log(storage.allStatus.ckmStates, storage.allStatus.fymStates);
         storage.allStatus.xcjStates.forEach((item) => {
           if (item.id) {
             states.push(new CarWashingState(item));

src/graphics/floodGate/FloodGate.ts

@@ -31,6 +31,8 @@ export interface IFloodGateState extends GraphicState {
   set mgj(v: boolean);
   get param(): request.CkmParam;
   set param(v: request.CkmParam);
+  get local(): boolean;
+  set local(v: boolean);
 }
 
 const garageConsts = {
@@ -38,6 +40,7 @@ const garageConsts = {
   codeColor: 0xffffff,
   bodyLineColor: 0xffffff,
   lossStateColor: 0x0000ff,
+  localStateColor: 0x00ff00,
   bodyLineWidth: 2,
   bodyColor: 0x000000,
   bodyRectWidth: 10,
@@ -87,10 +90,13 @@ export class FloodGate 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;
+    let color = garageConsts.bodyLineColor;
+    if (this.states.local) {
+      color = garageConsts.localStateColor;
+    }
+    if (this.states.param?.fault === request.Ckm.Fault.FA_State_Loss) {
+      color = garageConsts.lossStateColor;
+    }
     this.lineBody.lineStyle(garageConsts.bodyLineWidth, color);
     this.lineBody.moveTo(
       -garageConsts.bodyRectWidth / 2,

src/graphics/garageDoor/GarageDoor.ts

@@ -31,6 +31,8 @@ export interface IGarageDoorState extends GraphicState {
   set mgj(v: boolean);
   get param(): request.CkmParam;
   set param(v: request.CkmParam);
+  get local(): boolean;
+  set local(v: boolean);
 }
 
 const garageConsts = {
@@ -38,6 +40,7 @@ const garageConsts = {
   codeColor: 0xffffff,
   bodyLineColor: 0xffffff,
   lossStateColor: 0x0000ff,
+  localStateColor: 0x00ff00,
   bodyLineWidth: 2,
   bodyColor: 0x000000,
   bodyRectWidth: 10,
@@ -87,10 +90,13 @@ 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;
+    let color = garageConsts.bodyLineColor;
+    if (this.states.local) {
+      color = garageConsts.localStateColor;
+    }
+    if (this.states.param?.fault === request.Ckm.Fault.FA_State_Loss) {
+      color = garageConsts.lossStateColor;
+    }
     this.lineBody.lineStyle(garageConsts.bodyLineWidth, color);
     this.lineBody.moveTo(
       -garageConsts.bodyRectWidth / 2,