shared-ritm 1.2.93 → 1.2.95

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

@@ -1,7 +1,21 @@
 import ApiService from '../settings/ApiService';
+import { ResponseApi } from '@/api/types/Api_Service';
+import { Api_Work_Zone, Api_Work_Zone_Search } from '@/api/types/Api_Video';
 declare class VideoService extends ApiService {
     startVideoAnalytics(): Promise<boolean>;
     reloadVideoAnalytics(ids: string[]): Promise<any>;
+    fetchWorkZones(params?: any): Promise<ResponseApi<Api_Work_Zone_Search[]>>;
+    fetchWorkZone(id: string): Promise<ResponseApi<Api_Work_Zone>>;
+    editWorkZone(id: string, body: {
+        title: string;
+    }): Promise<{
+        data: Api_Work_Zone;
+        status: number;
+    }>;
+    deleteWorkZone(id: string): Promise<{
+        data: boolean;
+        status: number;
+    }>;
 }
 export default function useVideoService(): VideoService;
 export {};

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

@@ -0,0 +1,87 @@
+import { Api_Status_DTO } from '@/api/types/Api_Tasks';
+export type Api_Video_Source = {
+    id: string;
+    name: string;
+    login: string;
+    password: string;
+    camera_id: string | null;
+    comment: string | null;
+    data: unknown | null;
+    snapshot_path: string | null;
+    url: string;
+    updated_at: string;
+    created_at: string;
+    fps: string;
+    domed: boolean;
+    height: number;
+    width: number;
+};
+export type Api_Work_Zone_Search = {
+    id: string;
+    name: string;
+    title: string;
+    type: number;
+    parent_id: string | null;
+    created_at: string;
+    deleted_at: string | null;
+    updated_at: string;
+    description: string;
+    detect_face: boolean;
+    detect_helmet: boolean;
+    detect_mask: boolean;
+    detect_work_time: boolean;
+    detect_work_zone: boolean;
+    has_tasks: boolean;
+    is_parent: boolean;
+    x0: number;
+    x1: number;
+    y0: number;
+    y1: number;
+    video_source: Api_Video_Source;
+    video_source_id: string;
+    warehouse_by_work_zone_instruments: unknown[];
+};
+export type Api_Work_Zone_Usage_User = {
+    id: string;
+    user_id: string;
+    user_full_name: string;
+    work_zone_id: string;
+    start_interval: string;
+    end_interval: string;
+    minutes: number;
+};
+export type Api_Work_Zone_Task = {
+    id: string;
+    name: string;
+    plan_date: string;
+    planned_start: null | string;
+    planned_end: null | string;
+    deadline: string;
+    is_critical_path: boolean | null;
+    is_expired: boolean;
+    power_output_MWh: number;
+    cost_per_MWh: number | null;
+    fact_start_date: null | string;
+    fact_end_date: null | string;
+    time_to_complete_sec: number | null;
+    status: Api_Status_DTO[];
+    usage_users: Api_Work_Zone_Usage_User[];
+};
+export type Api_Work_Zone_Coords = {
+    x0: number;
+    x1: number;
+    y0: number;
+    y1: number;
+};
+export type Api_Work_Zone = {
+    id: string;
+    title: string;
+    created_at: string;
+    video_source: {
+        id: string;
+        name: string;
+    };
+    coordinates: Api_Work_Zone_Coords;
+    warehouse_by_work_zone_instruments: unknown[];
+    tasks: Api_Work_Zone_Task[];
+};

package/dist/types/index.d.ts

@@ -58,3 +58,4 @@ export * from './api/types/Api_Search';
 export * from './api/types/Api_User';
 export * from './api/types/Api_Comment';
 export * from './api/types/Api_Files';
+export * from './api/types/Api_Video';

package/package.json

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

package/src/api/services/VideoService.ts

@@ -1,12 +1,31 @@
 import ApiService from '../settings/ApiService'
+import { ResponseApi } from '@/api/types/Api_Service'
+import { Api_Work_Zone, Api_Work_Zone_Search } from '@/api/types/Api_Video'
 
 class VideoService extends ApiService {
   public async startVideoAnalytics(): Promise<boolean> {
     return await this.post('/statanly/start', null)
   }
+
   public reloadVideoAnalytics(ids: string[]): Promise<any> {
     return this.post('/horizon/video-source/reload', { video_source_ids: ids })
   }
+
+  public async fetchWorkZones(params?: any): Promise<ResponseApi<Api_Work_Zone_Search[]>> {
+    return await this.get('/search/work_zones', { params })
+  }
+
+  public async fetchWorkZone(id: string): Promise<ResponseApi<Api_Work_Zone>> {
+    return await this.get(`/work_zone/get_work_zone/${id}`)
+  }
+
+  public async editWorkZone(id: string, body: { title: string }): Promise<{ data: Api_Work_Zone; status: number }> {
+    return await this.put(`/admin/work-zones/${id}`, body)
+  }
+
+  public async deleteWorkZone(id: string): Promise<{ data: boolean; status: number }> {
+    return await this.delete(`/admin/work-zones/${id}`)
+  }
 }
 
 let api: VideoService

package/src/api/types/Api_Video.ts

@@ -0,0 +1,90 @@
+import { Api_Status_DTO } from '@/api/types/Api_Tasks'
+
+export type Api_Video_Source = {
+  id: string
+  name: string
+  login: string
+  password: string
+  camera_id: string | null
+  comment: string | null
+  data: unknown | null
+  snapshot_path: string | null
+  url: string
+  updated_at: string
+  created_at: string
+  fps: string
+  domed: boolean
+  height: number
+  width: number
+}
+
+export type Api_Work_Zone_Search = {
+  id: string
+  name: string
+  title: string
+  type: number
+  parent_id: string | null
+  created_at: string
+  deleted_at: string | null
+  updated_at: string
+  description: string
+  detect_face: boolean
+  detect_helmet: boolean
+  detect_mask: boolean
+  detect_work_time: boolean
+  detect_work_zone: boolean
+  has_tasks: boolean
+  is_parent: boolean
+  x0: number
+  x1: number
+  y0: number
+  y1: number
+  video_source: Api_Video_Source
+  video_source_id: string
+  warehouse_by_work_zone_instruments: unknown[]
+}
+
+export type Api_Work_Zone_Usage_User = {
+  id: string
+  user_id: string
+  user_full_name: string
+  work_zone_id: string
+  start_interval: string
+  end_interval: string
+  minutes: number
+}
+
+export type Api_Work_Zone_Task = {
+  id: string
+  name: string
+  plan_date: string
+  planned_start: null | string
+  planned_end: null | string
+  deadline: string
+  is_critical_path: boolean | null
+  is_expired: boolean
+  power_output_MWh: number
+  cost_per_MWh: number | null
+  fact_start_date: null | string
+  fact_end_date: null | string
+  time_to_complete_sec: number | null
+  status: Api_Status_DTO[]
+  usage_users: Api_Work_Zone_Usage_User[]
+}
+
+export type Api_Work_Zone_Coords = {
+  x0: number
+  x1: number
+  y0: number
+  y1: number
+}
+
+export type Api_Work_Zone = {
+  id: string
+  title: string
+  created_at: string
+  video_source: { id: string; name: string }
+  coordinates: Api_Work_Zone_Coords
+  warehouse_by_work_zone_instruments: unknown[]
+  tasks: Api_Work_Zone_Task[]
+}

package/src/common/app-layout/components/AppLayoutHeader.vue

@@ -73,12 +73,17 @@ const isSettingsOpened = ref(false)
 //   { label: 'Root-режим включен', name: 'root-on', isShow: false },
 // ])
 
-const shortName = computed(
-  () =>
-    `${props.userData?.last_name} ${props.userData?.first_name} ${props.userData?.patronymic?.[0] || ''}${
-      props.userData?.patronymic?.[0] ? '.' : ''
-    }`,
-)
+const shortName = computed(() => {
+  if (!props.userData?.full_name) return ''
+
+  const [lastName, name, patronymic] = props.userData.full_name.split(' ')
+
+  const mainPart = `${lastName} ${name}`
+
+  if (!patronymic) return mainPart
+
+  return `${mainPart} ${patronymic[0]}.`
+})
 
 const positionName = computed(() => props.userData?.positions?.[0]?.display_name)
 
@@ -221,7 +226,6 @@ onClickOutside(refMenuSettings, () => (isSettingsOpened.value = false))
     height: 100px;
     background: transparent;
     margin: 0 auto;
-    max-width: 874px;
   }
   .header-search {
     width: 343px;

package/src/common/app-table/AppTable.vue

@@ -24,7 +24,7 @@
 
       <template #body-cell-index="cellProps">
         <q-td :props="cellProps" class="text-center" :class="{ 'q-td--no-hover': noHover }">
-          {{ cellProps.rowIndex + 1 + (meta.value.currentPage - 1) * meta.value.perPage }}
+          {{ getIndex(cellProps.rowIndex) }}
         </q-td>
       </template>
 
@@ -157,6 +157,7 @@ const props = defineProps<{
   meta: Ref<{ currentPage: number; perPage: number }>
   enableMultiSelect?: boolean
   noHover?: boolean
+  hidePagination?: boolean
   selectedRows: any[]
   actions?: string[]
   slots?: Slots
@@ -192,6 +193,12 @@ const rowClick = (e: Event, row: Record<string, any>) => {
   emit('row-click', row)
 }
 
+const getIndex = (rowIndex: number) => {
+  if (props.hidePagination) return rowIndex + 1
+
+  return rowIndex + 1 + (props.meta.value.currentPage - 1) * props.meta.value.perPage
+}
+
 watch(
   () => props.selectedRows,
   val => {

package/src/common/app-table/AppTableLayout.vue

@@ -17,6 +17,7 @@
         :selected-rows="props.selectedRows"
         :no-hover="noHover"
         :slots="slots"
+        :hide-pagination="hidePagination"
         v-on="props.tableEvents"
         @update:selectedRows="rows => emit('update:selectedRows', rows)"
       >
@@ -30,7 +31,7 @@
     </div>
 
     <app-table-pagination
-      v-if="!hidePagination"
+      v-if="!hidePagination && props.currentPage && props.totalPages"
       :model-value="props.currentPage"
       :total-pages="props.totalPages"
       @page-change="props.onPageChange"
@@ -48,10 +49,10 @@ import { defineProps, defineEmits, useSlots, computed } from 'vue'
 const props = defineProps<{
   search?: string
   loading?: boolean
-  currentPage: number
-  totalPages: number
+  currentPage?: number
+  totalPages?: number
   tableProps: any
-  tableEvents: any
+  tableEvents?: any
   onSearch?: (val: string) => void
   onPageChange?: (page: number) => void
   hideSearch?: boolean

package/src/index.ts

@@ -109,4 +109,5 @@ export * from './api/types/Api_Search'
 export * from './api/types/Api_User'
 export * from './api/types/Api_Comment'
 export * from './api/types/Api_Files'
+export * from './api/types/Api_Video'
 // export * from '../types/Api_Metrics'