Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client

src/drawApp/graphics/IBPButtonInteraction.ts

@@ -207,22 +207,20 @@ export class IbpButtonInteraction extends GraphicInteractionPlugin<IBPButton> {
       });
     };
     bypassResetConfig.handler = () => {
-      bypassConfig.handler = () => {
-        if (!simulationId || !mapId) {
-          return;
-        }
-        bypassOperation({
-          simulationId,
-          mapId,
-          deviceId: ibpButton.id,
-          deviceCode: ibpButton.datas.code,
-          stationId,
-          operation: request.BypassOperationReq.Operation.bypass_reset,
-          btnType: request.BypassOperationReq.BtnType.ibp_btn,
-        }).catch((err) => {
-          errorNotify('操作失败', { message: err.origin.response.data.title });
-        });
-      };
+      if (!simulationId || !mapId) {
+        return;
+      }
+      bypassOperation({
+        simulationId,
+        mapId,
+        deviceId: ibpButton.id,
+        deviceCode: ibpButton.datas.code,
+        stationId,
+        operation: request.BypassOperationReq.Operation.bypass_reset,
+        btnType: request.BypassOperationReq.BtnType.ibp_btn,
+      }).catch((err) => {
+        errorNotify('操作失败', { message: err.origin.response.data.title });
+      });
     };
     IbpButtonMenu.open(e.global);
   }

src/drawApp/graphics/IbpKeyInteraction.ts

@@ -155,22 +155,20 @@ export class IbpKeyInteraction extends GraphicInteractionPlugin<IbpKey> {
       });
     };
     bypassResetConfig.handler = () => {
-      bypassConfig.handler = () => {
-        if (!simulationId || !mapId) {
-          return;
-        }
-        bypassOperation({
-          simulationId,
-          mapId,
-          deviceId: ibpKey.id,
-          deviceCode: ibpKey.datas.code,
-          stationId,
-          operation: request.BypassOperationReq.Operation.bypass_reset,
-          btnType: request.BypassOperationReq.BtnType.ibp_key,
-        }).catch((err) => {
-          errorNotify('操作失败', { message: err.origin.response.data.title });
-        });
-      };
+      if (!simulationId || !mapId) {
+        return;
+      }
+      bypassOperation({
+        simulationId,
+        mapId,
+        deviceId: ibpKey.id,
+        deviceCode: ibpKey.datas.code,
+        stationId,
+        operation: request.BypassOperationReq.Operation.bypass_reset,
+        btnType: request.BypassOperationReq.BtnType.ibp_key,
+      }).catch((err) => {
+        errorNotify('操作失败', { message: err.origin.response.data.title });
+      });
     };
     IbpKeyMenu.open(e.global);
   }

src/drawApp/graphics/PslButtonInteraction.ts

@@ -233,22 +233,20 @@ export class PslButtonOperateInteraction extends GraphicInteractionPlugin<PslBut
       });
     };
     bypassResetConfig.handler = () => {
-      bypassConfig.handler = () => {
-        if (!simulationId || !mapId) {
-          return;
-        }
-        bypassOperation({
-          simulationId,
-          mapId,
-          deviceId: pslButton.id,
-          deviceCode: pslButton.datas.code,
-          gateBoxId,
-          operation: request.BypassOperationReq.Operation.bypass_reset,
-          btnType: request.BypassOperationReq.BtnType.pls_btn,
-        }).catch((err) => {
-          errorNotify('操作失败', { message: err.origin.response.data.title });
-        });
-      };
+      if (!simulationId || !mapId) {
+        return;
+      }
+      bypassOperation({
+        simulationId,
+        mapId,
+        deviceId: pslButton.id,
+        deviceCode: pslButton.datas.code,
+        gateBoxId,
+        operation: request.BypassOperationReq.Operation.bypass_reset,
+        btnType: request.BypassOperationReq.BtnType.pls_btn,
+      }).catch((err) => {
+        errorNotify('操作失败', { message: err.origin.response.data.title });
+      });
     };
     PslButtonMenu.open(e.global);
   }