shared-ritm 1.3.29 → 1.3.31

package/dist/types/api/services/VideoService.d.ts

@@ -38,6 +38,7 @@ declare class VideoService extends ApiService {
     fetchVisualizationDataLink(params?: Record<string, string>): Promise<string>;
     updateVisualizationData(params?: Record<string, string>): Promise<number>;
     deleteFrameFromVideo(id: string): Promise<void>;
+    sendEvent(params?: Record<string, any>): Promise<number>;
 }
 export default function useVideoService(): VideoService;
 export {};

package/dist/types/api/types/Api_Video.d.ts

@@ -1,4 +1,4 @@
-import { Api_Status_DTO } from '@/api/types/Api_Tasks';
+import { Api_Status_DTO, Api_Tasks_Task_Dto } from '@/api/types/Api_Tasks';
 import { Api_Work_Zone_By_Tasks } from '@/api/types/Api_Repairs';
 export type Api_Video_Source = {
     id: string;
@@ -102,7 +102,7 @@ export type Api_Video_Source_Search = {
     url: string;
     video_source: Api_Video_Source_Search[];
     width: number;
-    work_zones: unknown[];
+    work_zones: Api_Video_Source_Work_Zone[];
 };
 export type Api_Video_Source_Create = {
     fps: string;
@@ -183,3 +183,13 @@ export type Api_Video_Combination = {
     };
     origin_data: Api_Video_Combination_Origin;
 };
+export type Api_Video_Source_Work_Zone_Task = Pick<Api_Tasks_Task_Dto, 'id' | 'fact_end_date' | 'fact_start_date' | 'deadline' | 'expired' | 'name' | 'plan_date' | 'responsible' | 'status' | 'time_to_complete_sec'> & {
+    power_output_MWh: number | null;
+    cost_per_MWh: number | null;
+};
+export type Api_Video_Source_Work_Zone = Pick<Api_Work_Zone_Search, 'id' | 'detect_face' | 'detect_helmet' | 'detect_mask' | 'detect_work_time' | 'detect_work_zone' | 'is_parent' | 'name' | 'x0' | 'x1' | 'y0' | 'y1' | 'video_source_id' | 'parent_id' | 'type' | 'title'> & {
+    power_output_MWh: number | null;
+    cost_per_MWh: number | null;
+    points: unknown[];
+    tasks: Api_Video_Source_Work_Zone_Task[];
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shared-ritm",
-  "version": "1.3.29",
+  "version": "1.3.31",
   "private": false,
   "files": [
     "dist",

package/src/api/services/VideoService.ts

@@ -98,6 +98,11 @@ class VideoService extends ApiService {
   public async deleteFrameFromVideo(id: string): Promise<void> {
     await this.delete(`horizon/video-source/delete/fragment/video/training/${id}`)
   }
+
+  // Для тестирования ws видеостены
+  public async sendEvent(params?: Record<string, any>): Promise<number> {
+    return await this.post('alerts_callback_url', params)
+  }
 }
 
 let api: VideoService

package/src/api/types/Api_Video.ts

@@ -1,4 +1,4 @@
-import { Api_Status_DTO } from '@/api/types/Api_Tasks'
+import { Api_Status_DTO, Api_Tasks_Task_Dto } from '@/api/types/Api_Tasks'
 import { Api_Work_Zone_By_Tasks } from '@/api/types/Api_Repairs'
 
 export type Api_Video_Source = {
@@ -106,7 +106,7 @@ export type Api_Video_Source_Search = {
   url: string
   video_source: Api_Video_Source_Search[]
   width: number
-  work_zones: unknown[]
+  work_zones: Api_Video_Source_Work_Zone[]
 }
 
 export type Api_Video_Source_Create = {
@@ -196,3 +196,45 @@ export type Api_Video_Combination = {
   }
   origin_data: Api_Video_Combination_Origin
 }
+
+export type Api_Video_Source_Work_Zone_Task = Pick<
+  Api_Tasks_Task_Dto,
+  | 'id'
+  | 'fact_end_date'
+  | 'fact_start_date'
+  | 'deadline'
+  | 'expired'
+  | 'name'
+  | 'plan_date'
+  | 'responsible'
+  | 'status'
+  | 'time_to_complete_sec'
+> & {
+  power_output_MWh: number | null
+  cost_per_MWh: number | null
+}
+
+export type Api_Video_Source_Work_Zone = Pick<
+  Api_Work_Zone_Search,
+  | 'id'
+  | 'detect_face'
+  | 'detect_helmet'
+  | 'detect_mask'
+  | 'detect_work_time'
+  | 'detect_work_zone'
+  | 'is_parent'
+  | 'name'
+  | 'x0'
+  | 'x1'
+  | 'y0'
+  | 'y1'
+  | 'video_source_id'
+  | 'parent_id'
+  | 'type'
+  | 'title'
+> & {
+  power_output_MWh: number | null
+  cost_per_MWh: number | null
+  points: unknown[]
+  tasks: Api_Video_Source_Work_Zone_Task[]
+}

package/src/common/app-dialogs/AppConfirmDialog.vue

@@ -16,7 +16,7 @@
           @click="onDialogOK"
         />
         <app-button
-          data-test="cancel-button"
+          data-test="close-button"
           :class="$style['footer__btn--cancel']"
           label="Отменить"
           @click="onDialogHide"

package/src/common/app-table/controllers/useColumnSelector.ts

@@ -25,15 +25,11 @@ export function useColumnSelector(allColumns: ColumnConfig[], fixedColumnNames:
       },
       cancel: {
         label: 'Отмена',
-        attrs: {
-          'data-test': 'cancel-button',
-        },
+        'data-test': 'cancel-button',
       },
       ok: {
         label: 'Ок',
-        attrs: {
-          'data-test': 'ok-button',
-        },
+        'data-test': 'ok-button',
       },
       persistent: true,
     }).onOk((val: string[]) => {