shared-ritm 1.3.28 → 1.3.30

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

@@ -2,6 +2,7 @@ import ApiService from '../settings/ApiService';
 declare class GanttService extends ApiService {
     fetchCriticalPathTasks(params: string): Promise<any>;
     fetchGanttList(params: string): Promise<any>;
+    setFixPlan(project_id: string): Promise<any>;
 }
 export default function useGanttService(): GanttService;
 export {};

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.28",
+  "version": "1.3.30",
   "private": false,
   "files": [
     "dist",

package/src/api/services/GanttService.ts

@@ -7,6 +7,12 @@ class GanttService extends ApiService {
   public async fetchGanttList(params: string): Promise<any> {
     return await this.get(`/list/tasks/search?${params}&gantt=1`)
   }
+  public async setFixPlan(project_id: string): Promise<any> {
+    const params = new URLSearchParams()
+    params.append(`projects[0]`, project_id)
+    params.append(`filter[state]`, '1')
+    return await this.post<null, any>(`/gantt/set-planned-date?${params.toString()}`, null)
+  }
 }
 
 let api: GanttService

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-table/components/TableModal.vue

@@ -8,7 +8,7 @@
       <q-card-section>
         <q-form ref="formRef" @submit.prevent="submit">
           <div v-for="field in fields" :key="field.key" class="field-wrapper">
-            <label v-if="field.type === 'text'" class="field-label">
+            <label v-if="field.type === 'text'" :data-test="`${field.key}-label`" class="field-label">
               {{ field.label }}
               <span v-if="field.rules?.length && mode !== 'view'" class="required">*</span>
             </label>
@@ -16,6 +16,7 @@
             <q-input
               v-if="field.type === 'text'"
               v-model="formData[field.key]"
+              :data-test="`${field.key}-input`"
               :rules="field.rules"
               :readonly="mode === 'view' || (field.key === 'uuid' && mode === 'edit')"
               filled
@@ -50,6 +51,7 @@
             <app-modal-select
               v-else-if="field.type === 'select'"
               v-model="formData[field.key]"
+              :data-test="`${field.key}-select`"
               :options="filteredOptions[field.key] || field.options"
               :rules="field.rules"
               :placeholder="mode === 'view' ? '' : field.placeholder"
@@ -77,18 +79,35 @@
       </q-card-section>
 
       <q-card-actions align="center">
-        <q-btn v-if="mode === 'view'" class="remove" flat label="Удалить" :loading="loading" @click="emit('delete')" />
+        <q-btn
+          v-if="mode === 'view'"
+          class="remove"
+          data-test="remove-button"
+          flat
+          label="Удалить"
+          :loading="loading"
+          @click="emit('delete')"
+        />
         <q-btn
           v-if="mode !== 'view'"
           class="confirm"
+          data-test="save-create-button"
           flat
           :label="mode === 'edit' ? 'Сохранить' : 'Создать'"
           :disable="isSubmitDisabled"
           :loading="loading"
           @click="submit"
         />
-        <q-btn v-else class="confirm" flat label="Редактировать" :disable="loading" @click="$emit('edit')" />
-        <q-btn class="cancel" flat label="Закрыть" :disable="loading" @click="close" />
+        <q-btn
+          v-else
+          class="confirm"
+          data-test="edit-button"
+          flat
+          label="Редактировать"
+          :disable="loading"
+          @click="$emit('edit')"
+        />
+        <q-btn class="cancel" data-test="cancel-button" flat label="Закрыть" :disable="loading" @click="close" />
       </q-card-actions>
     </q-card>
   </q-dialog>

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

@@ -23,7 +23,18 @@ export function useColumnSelector(allColumns: ColumnConfig[], fixedColumnNames:
           disable: fixedColumnNames.includes(col.name),
         })),
       },
-      cancel: true,
+      cancel: {
+        label: 'Отмена',
+        attrs: {
+          'data-test': 'cancel-button',
+        },
+      },
+      ok: {
+        label: 'Ок',
+        attrs: {
+          'data-test': 'ok-button',
+        },
+      },
       persistent: true,
     }).onOk((val: string[]) => {
       selectedColumnNames.value = Array.from(new Set([...val, ...fixedColumnNames]))