CCTV设备布局图

2024-10-17 13:50:52 +08:00 · 2024-10-17 13:50:52 +08:00 · d03f30d4cc
commit d03f30d4cc
parent 31d09306b4
4 changed files with 49 additions and 47 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit c3ebea56bd46e93f4bd5204bdc3966b5b9fb9d58
+Subproject commit 587a787812fa16a17d02fd3ab70e3731fc94e36f
--- a/src/drawApp/iscsApp.ts
+++ b/src/drawApp/iscsApp.ts
@ -157,18 +157,19 @@ function handleSubscribe(app: IDrawApp) {
              console.log(fasPlatformAlarm, 'fasPlatformAlarm');
            }
          }
-        } else if (syncData.submenu === '监控布局图') {
+        } else if (syncData.submenu === 'CCTV设备布局图') {
          for (
            let i = 0;
-            i < storage.cctvOfStationControlStorages.length;
+            i < storage.cctvOfEquipmentLayoutStorages.length;
            i++
          ) {
-            const ctvOfStationControl = storage.cctvOfStationControlStorages[i];
-            if (ctvOfStationControl.stationName == syncData.station) {
+            const cctvOfEquipmentLayout =
+              storage.cctvOfEquipmentLayoutStorages[i];
+            if (cctvOfEquipmentLayout.stationName == syncData.station) {
              syncData.datas.forEach((data) => {
                handlerNoEditCommonData(
                  data,
-                  ctvOfStationControl,
+                  cctvOfEquipmentLayout,
                  syncData.operationType
                );
              });
@ -246,15 +247,16 @@ export async function loadDrawDatas(): Promise<IGraphicStorage> {
          }
        }
        break;
-      case '监控布局图':
-        for (let i = 0; i < storage.cctvOfStationControlStorages.length; i++) {
-          const ctvOfStationControl = storage.cctvOfStationControlStorages[i];
+      case 'CCTV设备布局图':
+        for (let i = 0; i < storage.cctvOfEquipmentLayoutStorages.length; i++) {
+          const cctvOfEquipmentLayout =
+            storage.cctvOfEquipmentLayoutStorages[i];
          if (
-            ctvOfStationControl.stationName ==
+            cctvOfEquipmentLayout.stationName ==
            drawStore.selectSubmenuAndStation.station
          ) {
-            canvasProperty = ctvOfStationControl.canvas;
-            datas = loadCommonDrawDatas(ctvOfStationControl);
+            canvasProperty = cctvOfEquipmentLayout.canvas;
+            datas = loadCommonDrawDatas(cctvOfEquipmentLayout);
            /*  ctvOfStationControl.cctvButtons.forEach((cctvButton) => {
              datas.push(new CCTVButtonData(cctvButton));
            }); */
@ -295,10 +297,10 @@ export function saveDrawDatas(app: IDrawApp) {
      )
    );
  }
-  if (!storage?.cctvOfStationControlStorages.length) {
+  if (!storage?.cctvOfEquipmentLayoutStorages.length) {
    stationOption.forEach((station) =>
-      storage?.cctvOfStationControlStorages.push(
-        new iscsGraphicData.CCTVOfStationControlStorage({
+      storage?.cctvOfEquipmentLayoutStorages.push(
+        new iscsGraphicData.CCTVOfEquipmentLayoutStorage({
          stationName: station,
          commonGraphicStorage: new iscsGraphicData.CommonGraphicStorage(),
        })
@ -339,22 +341,22 @@ export function saveDrawDatas(app: IDrawApp) {
        }
      }
      break;
-    case '监控布局图':
-      for (let i = 0; i < storage.cctvOfStationControlStorages.length; i++) {
-        let cctvOfStationControl = storage.cctvOfStationControlStorages[i];
+    case 'CCTV设备布局图':
+      for (let i = 0; i < storage.cctvOfEquipmentLayoutStorages.length; i++) {
+        let cctvOfEquipmentLayout = storage.cctvOfEquipmentLayoutStorages[i];
        if (
-          cctvOfStationControl.stationName ==
+          cctvOfEquipmentLayout.stationName ==
          drawStore.selectSubmenuAndStation.station
        ) {
-          cctvOfStationControl =
-            new iscsGraphicData.CCTVOfStationControlStorage({
+          cctvOfEquipmentLayout =
+            new iscsGraphicData.CCTVOfEquipmentLayoutStorage({
              stationName: drawStore.selectSubmenuAndStation.station,
              commonGraphicStorage: new iscsGraphicData.CommonGraphicStorage(),
            });
          const cctvStorage = saveCommonDrawDatas(
            app,
-            cctvOfStationControl
-          ) as iscsGraphicData.CCTVOfStationControlStorage;
+            cctvOfEquipmentLayout
+          ) as iscsGraphicData.CCTVOfEquipmentLayoutStorage;

          /* graphics.forEach((g) => {
            if (g instanceof CCTVButton) {
@ -364,7 +366,7 @@ export function saveDrawDatas(app: IDrawApp) {
              );
            }
          }); */
-          storage.cctvOfStationControlStorages[i] = cctvStorage;
+          storage.cctvOfEquipmentLayoutStorages[i] = cctvStorage;
          break;
        }
      }
--- a/src/layouts/IscsDrawLayout.vue
+++ b/src/layouts/IscsDrawLayout.vue
@ -388,7 +388,7 @@ function handleUtilsOption() {
    Button.Type,
  ];
  switch (drawStore.selectSubmenuAndStation.submenu) {
-    case '监控布局图':
+    case 'CCTV设备布局图':
      //drawAssistantsTypes.push(CCTVButton.Type);
      break;
    case '火灾报警平面图':
--- a/src/protos/iscs_graphic_data.ts
+++ b/src/protos/iscs_graphic_data.ts
@ -9,24 +9,24 @@ export namespace iscsGraphicData {
    export class IscsGraphicStorage extends pb_1.Message {
        #one_of_decls: number[][] = [];
        constructor(data?: any[] | {
-            cctvOfStationControlStorages?: CCTVOfStationControlStorage[];
+            cctvOfEquipmentLayoutStorages?: CCTVOfEquipmentLayoutStorage[];
            fasOfPlatformAlarmStorages?: FASOfPlatformAlarmStorage[];
        }) {
            super();
            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [1, 2], this.#one_of_decls);
            if (!Array.isArray(data) && typeof data == "object") {
-                if ("cctvOfStationControlStorages" in data && data.cctvOfStationControlStorages != undefined) {
-                    this.cctvOfStationControlStorages = data.cctvOfStationControlStorages;
+                if ("cctvOfEquipmentLayoutStorages" in data && data.cctvOfEquipmentLayoutStorages != undefined) {
+                    this.cctvOfEquipmentLayoutStorages = data.cctvOfEquipmentLayoutStorages;
                }
                if ("fasOfPlatformAlarmStorages" in data && data.fasOfPlatformAlarmStorages != undefined) {
                    this.fasOfPlatformAlarmStorages = data.fasOfPlatformAlarmStorages;
                }
            }
        }
-        get cctvOfStationControlStorages() {
-            return pb_1.Message.getRepeatedWrapperField(this, CCTVOfStationControlStorage, 1) as CCTVOfStationControlStorage[];
+        get cctvOfEquipmentLayoutStorages() {
+            return pb_1.Message.getRepeatedWrapperField(this, CCTVOfEquipmentLayoutStorage, 1) as CCTVOfEquipmentLayoutStorage[];
        }
-        set cctvOfStationControlStorages(value: CCTVOfStationControlStorage[]) {
+        set cctvOfEquipmentLayoutStorages(value: CCTVOfEquipmentLayoutStorage[]) {
            pb_1.Message.setRepeatedWrapperField(this, 1, value);
        }
        get fasOfPlatformAlarmStorages() {
@ -36,12 +36,12 @@ export namespace iscsGraphicData {
            pb_1.Message.setRepeatedWrapperField(this, 2, value);
        }
        static fromObject(data: {
-            cctvOfStationControlStorages?: ReturnType<typeof CCTVOfStationControlStorage.prototype.toObject>[];
+            cctvOfEquipmentLayoutStorages?: ReturnType<typeof CCTVOfEquipmentLayoutStorage.prototype.toObject>[];
            fasOfPlatformAlarmStorages?: ReturnType<typeof FASOfPlatformAlarmStorage.prototype.toObject>[];
        }): IscsGraphicStorage {
            const message = new IscsGraphicStorage({});
-            if (data.cctvOfStationControlStorages != null) {
-                message.cctvOfStationControlStorages = data.cctvOfStationControlStorages.map(item => CCTVOfStationControlStorage.fromObject(item));
+            if (data.cctvOfEquipmentLayoutStorages != null) {
+                message.cctvOfEquipmentLayoutStorages = data.cctvOfEquipmentLayoutStorages.map(item => CCTVOfEquipmentLayoutStorage.fromObject(item));
            }
            if (data.fasOfPlatformAlarmStorages != null) {
                message.fasOfPlatformAlarmStorages = data.fasOfPlatformAlarmStorages.map(item => FASOfPlatformAlarmStorage.fromObject(item));
@ -50,11 +50,11 @@ export namespace iscsGraphicData {
        }
        toObject() {
            const data: {
-                cctvOfStationControlStorages?: ReturnType<typeof CCTVOfStationControlStorage.prototype.toObject>[];
+                cctvOfEquipmentLayoutStorages?: ReturnType<typeof CCTVOfEquipmentLayoutStorage.prototype.toObject>[];
                fasOfPlatformAlarmStorages?: ReturnType<typeof FASOfPlatformAlarmStorage.prototype.toObject>[];
            } = {};
-            if (this.cctvOfStationControlStorages != null) {
-                data.cctvOfStationControlStorages = this.cctvOfStationControlStorages.map((item: CCTVOfStationControlStorage) => item.toObject());
+            if (this.cctvOfEquipmentLayoutStorages != null) {
+                data.cctvOfEquipmentLayoutStorages = this.cctvOfEquipmentLayoutStorages.map((item: CCTVOfEquipmentLayoutStorage) => item.toObject());
            }
            if (this.fasOfPlatformAlarmStorages != null) {
                data.fasOfPlatformAlarmStorages = this.fasOfPlatformAlarmStorages.map((item: FASOfPlatformAlarmStorage) => item.toObject());
@ -65,8 +65,8 @@ export namespace iscsGraphicData {
        serialize(w: pb_1.BinaryWriter): void;
        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
            const writer = w || new pb_1.BinaryWriter();
-            if (this.cctvOfStationControlStorages.length)
-                writer.writeRepeatedMessage(1, this.cctvOfStationControlStorages, (item: CCTVOfStationControlStorage) => item.serialize(writer));
+            if (this.cctvOfEquipmentLayoutStorages.length)
+                writer.writeRepeatedMessage(1, this.cctvOfEquipmentLayoutStorages, (item: CCTVOfEquipmentLayoutStorage) => item.serialize(writer));
            if (this.fasOfPlatformAlarmStorages.length)
                writer.writeRepeatedMessage(2, this.fasOfPlatformAlarmStorages, (item: FASOfPlatformAlarmStorage) => item.serialize(writer));
            if (!w)
@ -79,7 +79,7 @@ export namespace iscsGraphicData {
                    break;
                switch (reader.getFieldNumber()) {
                    case 1:
-                        reader.readMessage(message.cctvOfStationControlStorages, () => pb_1.Message.addToRepeatedWrapperField(message, 1, CCTVOfStationControlStorage.deserialize(reader), CCTVOfStationControlStorage));
+                        reader.readMessage(message.cctvOfEquipmentLayoutStorages, () => pb_1.Message.addToRepeatedWrapperField(message, 1, CCTVOfEquipmentLayoutStorage.deserialize(reader), CCTVOfEquipmentLayoutStorage));
                        break;
                    case 2:
                        reader.readMessage(message.fasOfPlatformAlarmStorages, () => pb_1.Message.addToRepeatedWrapperField(message, 2, FASOfPlatformAlarmStorage.deserialize(reader), FASOfPlatformAlarmStorage));
@ -2164,7 +2164,7 @@ export namespace iscsGraphicData {
            return TemperatureDetector.deserialize(bytes);
        }
    }
-    export class CCTVOfStationControlStorage extends pb_1.Message {
+    export class CCTVOfEquipmentLayoutStorage extends pb_1.Message {
        #one_of_decls: number[][] = [];
        constructor(data?: any[] | {
            stationName?: string;
@ -2213,8 +2213,8 @@ export namespace iscsGraphicData {
            stationName?: string;
            canvas?: ReturnType<typeof dependency_1.common.Canvas.prototype.toObject>;
            commonGraphicStorage?: ReturnType<typeof CommonGraphicStorage.prototype.toObject>;
-        }): CCTVOfStationControlStorage {
-            const message = new CCTVOfStationControlStorage({});
+        }): CCTVOfEquipmentLayoutStorage {
+            const message = new CCTVOfEquipmentLayoutStorage({});
            if (data.stationName != null) {
                message.stationName = data.stationName;
            }
@ -2256,8 +2256,8 @@ export namespace iscsGraphicData {
            if (!w)
                return writer.getResultBuffer();
        }
-        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): CCTVOfStationControlStorage {
-            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new CCTVOfStationControlStorage();
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): CCTVOfEquipmentLayoutStorage {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new CCTVOfEquipmentLayoutStorage();
            while (reader.nextField()) {
                if (reader.isEndGroup())
                    break;
@ -2279,8 +2279,8 @@ export namespace iscsGraphicData {
        serializeBinary(): Uint8Array {
            return this.serialize();
        }
-        static deserializeBinary(bytes: Uint8Array): CCTVOfStationControlStorage {
-            return CCTVOfStationControlStorage.deserialize(bytes);
+        static deserializeBinary(bytes: Uint8Array): CCTVOfEquipmentLayoutStorage {
+            return CCTVOfEquipmentLayoutStorage.deserialize(bytes);
        }
    }
    export class FASOfPlatformAlarmStorage extends pb_1.Message {