shared-ritm 1.2.67 → 1.2.68

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

@@ -1,6 +1,5 @@
-import ApiService from '@/api/settings/ApiService';
+import ApiService, { ResponseApi } from '@/api/settings/ApiService';
 import { Api_ControlLogs_Dto, Api_ControlZones_Dto } from '@/api/types/Api_Controls';
-import { ResponseApi } from '@/api/types/Api_Service';
 declare class ControlsService extends ApiService {
     fetchControlZones(params: Record<string, any>): Promise<ResponseApi<Api_ControlZones_Dto[]>>;
     fetchControlZone(id: string): Promise<ResponseApi<Api_ControlZones_Dto>>;

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

@@ -1,5 +1,4 @@
-import ApiService from '@/api/settings/ApiService';
-import { ResponseApi } from '@/api/types/Api_Service';
+import ApiService, { ResponseApi } from '@/api/settings/ApiService';
 import { Api_Files_Responsible_Dto } from '@/api/types/Api_Files';
 declare class FileService extends ApiService {
     uploadFile(data: FormData): Promise<ResponseApi<Api_Files_Responsible_Dto>>;

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

@@ -1,5 +1,4 @@
-import ApiService from '@/api/settings/ApiService';
-import { ResponseApi } from '@/api/types/Api_Service';
+import ApiService, { ResponseApi } from '@/api/settings/ApiService';
 declare class MetricsService extends ApiService {
     fetchPieProjects(queryString: string): Promise<ResponseApi<any>>;
     fetchPieTasks(queryString: string): Promise<ResponseApi<any>>;

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

@@ -0,0 +1,41 @@
+import * as faceapi from 'face-api.js';
+import ApiService from '@/api/settings/ApiService';
+declare class PhotoService extends ApiService {
+    getVideoStreamConfig(width: number, height: number): {
+        audio: boolean;
+        video: {
+            width: {
+                min: number;
+                ideal: number;
+            };
+            height: {
+                min: number;
+                ideal: number;
+            };
+            facingMode: string;
+        };
+    };
+    getContourCoordinate(width: number, height: number): {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+    getBoxData(box: any): {
+        x: any;
+        y: any;
+        width: any;
+        height: any;
+    } | null;
+    setStylesForCanvas(canvasContainer: any): void;
+    checkFaceInclusion(frame: any, face: any): boolean;
+    getFaceDetections(videoRef: any): Promise<faceapi.WithFaceExpressions<faceapi.WithFaceLandmarks<{
+        detection: faceapi.FaceDetection;
+    }, faceapi.FaceLandmarks68>>[]>;
+    getCanvas(videoRef: any): HTMLCanvasElement;
+    getResizedAndDetection(canvas: any, detections: any, ctx: any, videoWidth: number, videoHeight: number): void;
+    getFaceSnapshot(inputImage: any, box: any): Promise<string | null>;
+    initModels(): Promise<void>;
+}
+export default function usePhotoService(): PhotoService;
+export {};

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

@@ -1,5 +1,4 @@
-import ApiService from '@/api/settings/ApiService';
-import { ResponseApi } from '@/api/types/Api_Service';
+import ApiService, { ResponseApi } from '@/api/settings/ApiService';
 import { Api_Project_Dto } from '@/api/types/Api_Projects';
 declare class ProjectsService extends ApiService {
     fetchProjectById(id: string): Promise<ResponseApi<Api_Project_Dto>>;

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

@@ -1,5 +1,4 @@
-import ApiService from '@/api/settings/ApiService';
-import { ResponseApi } from '@/api/types/Api_Service';
+import ApiService, { ResponseApi } from '@/api/settings/ApiService';
 import { Api_Create_Repair_With_Equipments, Api_Equipment_Full_Dto, Api_Repair_Dto, Api_Update_Repair, OptionFilters } from '@/api/types/Api_Repairs';
 declare class RepairsService extends ApiService {
     fetchFilters(fullParams: string): Promise<OptionFilters>;

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

@@ -1,5 +1,4 @@
-import ApiService from '@/api/settings/ApiService';
-import { ResponseApi } from '@/api/types/Api_Service';
+import ApiService, { ResponseApi } from '@/api/settings/ApiService';
 import { Api_Task_Close_Reason, Api_Task_Instrument_Dto, Api_Task_Instrument_From_Warehouse, Api_Task_Module_Instrument_Condition, Api_Tasks_Dto, Api_Tasks_Task_Dto } from '@/api/types/Api_Tasks';
 import { Api_Equipment_Full_Dto, Api_Task_Video_Source, Api_Task_Video_Source_Stream } from '@/api/types/Api_Repairs';
 declare class TasksService extends ApiService {

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

@@ -0,0 +1,11 @@
+import ApiService from '@/api/settings/ApiService';
+import { Api_User } from '@/api/types/Api_User';
+declare class UserService extends ApiService {
+    editUser({ id, model }: {
+        id: string;
+        model: any;
+    }): Promise<Api_User>;
+    getUser(id: string): Promise<Api_User>;
+}
+export default function useUserService(): UserService;
+export {};

package/dist/types/api/settings/ApiService.d.ts

@@ -2,6 +2,14 @@ import { AxiosRequestConfig, AxiosResponse } from 'axios';
 export declare enum ApiServiceType {
     SERVICE_AUTH = "SERVICE_AUTH"
 }
+export type ResponseApi<T> = {
+    count: number;
+    current_page: number;
+    data: T;
+    per_page: number;
+    total: number;
+    total_pages: number;
+};
 export default class ApiService {
     private axiosInstance;
     constructor();

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

@@ -1,3 +1,4 @@
+import { Api_User } from '@/api/types/Api_User';
 export type Api_Instrument_Storage = {
     id: string;
     created_at: string;
@@ -30,18 +31,6 @@ export type Api_Instrument_Location = {
     deleted_at: string | null;
     state_id: unknown | null;
 };
-export type Api_User_Team = {
-    id: string;
-    name: string;
-    display_name: string;
-    description: string;
-    created_at: string;
-    updated_at: string;
-    pivot: {
-        team_id: string;
-        user_id: string;
-    };
-};
 export type Api_Instrument_Status = {
     id: string;
     description: string;
@@ -51,29 +40,6 @@ export type Api_Instrument_Status = {
     updated_at: string;
     deleted_at: string | null;
 };
-export type Api_User = {
-    id: string;
-    RFID: string;
-    avatar: unknown | null;
-    avatar_id: string | null;
-    change_password: string;
-    created_at: string;
-    updated_at: string;
-    deleted_at: string | null;
-    dismissal_at: string | null;
-    email_verified_at: string;
-    divisions: string;
-    email: string;
-    face_recognition_id: string | null;
-    first_name: string;
-    full_name: string;
-    last_name: string;
-    patronymic: string;
-    personnel_number: number;
-    phone: string;
-    profession: string;
-    teams: Api_User_Team[];
-};
 export type Api_Instrument = {
     id: string;
     RFID: string | null;

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

@@ -0,0 +1,42 @@
+export type Api_User_Team = {
+    id: string;
+    name: string;
+    display_name: string;
+    description: string;
+    created_at: string;
+    updated_at: string;
+    pivot: {
+        team_id: string;
+        user_id: string;
+    };
+};
+export type Api_User_Photo = {
+    id: string;
+    name: string;
+    path: string;
+    type: string;
+};
+export type Api_User = {
+    id: string;
+    RFID: string;
+    avatar: unknown | null;
+    avatar_id: string | null;
+    change_password: string;
+    created_at: string;
+    updated_at: string;
+    deleted_at: string | null;
+    dismissal_at: string | null;
+    email_verified_at: string;
+    divisions: string;
+    email: string;
+    face_recognition_id: string | null;
+    first_name: string;
+    full_name: string;
+    last_name: string;
+    patronymic: string;
+    personnel_number: number;
+    phone: string;
+    profession: string;
+    teams: Api_User_Team[];
+    photos: Api_User_Photo[];
+};

package/dist/types/index.d.ts

@@ -21,7 +21,6 @@ import AppTableModal from '@/common/app-table/components/TableModal.vue';
 import AppTable from '@/common/app-table/AppTable.vue';
 import AppTableLayout from '@/common/app-table/AppTableLayout.vue';
 import AppModalSelect from '@/common/app-table/components/ModalSelect.vue';
-import ApiService from '@/api/settings/ApiService';
 import useGanttService from '@/api/services/GanttService';
 import useMetricsService from '@/api/services/MetricsService';
 import useProjectsService from '@/api/services/ProjectsService';
@@ -30,21 +29,23 @@ import useTasksService from '@/api/services/TasksService';
 import useAuthService from '@/api/services/AuthService';
 import useFileService from '@/api/services/FileService';
 import useVideoService from '@/api/services/VideoService';
+import useUserService from '@/api/services/UserService';
+import usePhotoService from '@/api/services/PhotoService';
 import useInstrumentsService from '@/api/services/InstrumentsService';
+import ApiService from '@/api/settings/ApiService';
 import useControlsService from '@/api/services/ControlsService';
-import useSearchService from '@/api/services/SearchService';
 export { AppButton, AppCheckbox, AppDatePicker, AppInput, AppInputSearch, AppLayout, AppLayoutHeader, AppLayoutPage, AppLoader, AppSelect, AppSheet, AppSidebar, AppToggle, AppWrapper, AppConfirmDialog, AppDropdown, AppTablePagination, AppTableSearch, AppTableModal, AppTable, AppTableLayout, AppModalSelect, };
-export { ApiService, useAuthService, useGanttService, useMetricsService, useProjectsService, useRepairsService, useTasksService, useFileService, useControlsService, useVideoService, useInstrumentsService, useSearchService, };
+export { ApiService, useAuthService, useGanttService, useMetricsService, useProjectsService, useRepairsService, useTasksService, useFileService, useControlsService, useVideoService, useUserService, usePhotoService, useInstrumentsService, };
 export { useBaseTable } from './common/app-table/controllers/useBaseTable';
 export { useTableModel } from './common/app-table/controllers/useTableModel';
 export { useColumnSelector } from './common/app-table/controllers/useColumnSelector';
 export type { FilterOption, TableModel, TableColumn } from './common/app-table/controllers/useTableModel';
 export type { NotificationType } from './utils/notification';
 export { notificationSettings } from './utils/notification';
-export * from './api/types/Api_Service';
+export * from './utils/helpers';
 export * from './api/types/Api_Tasks';
 export * from './api/types/Api_Repairs';
 export * from './api/types/Api_Projects';
 export * from './api/types/Api_Controls';
 export * from './api/types/Api_Instruments';
-export * from './api/types/Api_Search';
+export * from './api/types/Api_User';

package/dist/types/utils/helpers.d.ts

@@ -15,3 +15,4 @@ export declare function normalizeValue(val: any): any;
  * Используется для идентификаторов временных сущностей.
  */
 export declare function uuidv4(): string;
+export declare function base64ToBlob(base64Data: string): Blob;

package/package.json

@@ -1,63 +1,64 @@
-{
-  "name": "shared-ritm",
-  "version": "1.2.67",
-  "private": false,
-  "files": [
-    "dist",
-    "src"
-  ],
-  "main": "dist/shared-ritm.umd.js",
-  "type": "module",
-  "module": "./dist/shared-ritm.es.js",
-  "types": "./dist/types/index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./dist/shared-ritm.es.js",
-      "require": "./dist/shared-ritm.umd.js",
-      "default": "./dist/shared-ritm.es.js",
-      "types": "./dist/types/index.d.ts"
-    },
-    "./style": "./dist/index.css"
-  },
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build && tsc --emitDeclarationOnly",
-    "typecheck": "vue-tsc --noEmit",
-    "lint": "eslint --fix",
-    "format": "prettier -w -u ."
-  },
-  "dependencies": {
-    "@quasar/extras": "^1.16.17",
-    "@vueuse/core": "^10.1.2",
-    "axios": "^1.7.7",
-    "vue": "^3.5.12",
-    "vue-router": "^4.0.3"
-  },
-  "peerDependencies": {
-    "quasar": "^2.18.1"
-  },
-  "devDependencies": {
-    "@quasar/vite-plugin": "^1.9.0",
-    "@rollup/pluginutils": "^5.1.3",
-    "@types/node": "^22.7.9",
-    "@typescript-eslint/eslint-plugin": "^4.25.0",
-    "@typescript-eslint/parser": "^4.25.0",
-    "@vitejs/plugin-vue": "^5.1.4",
-    "@vue/compiler-sfc": "^3.0.5",
-    "@vue/eslint-config-prettier": "^6.0.0",
-    "@vue/eslint-config-typescript": "^7.0.0",
-    "eslint": "^7.27.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-vue": "^7.10.0",
-    "install": "^0.13.0",
-    "npm": "^11.4.0",
-    "prettier": "^2.3.0",
-    "quasar": "^2.18.1",
-    "rollup-plugin-visualizer": "^5.14.0",
-    "sass": "^1.80.4",
-    "typescript": "^5.6.3",
-    "vite": "^5.4.9",
-    "vite-plugin-css-modules": "^0.0.1",
-    "vue-tsc": "^2.1.6"
-  }
-}
+{
+  "name": "shared-ritm",
+  "version": "1.2.68",
+  "private": false,
+  "files": [
+    "dist",
+    "src"
+  ],
+  "main": "dist/shared-ritm.umd.js",
+  "type": "module",
+  "module": "./dist/shared-ritm.es.js",
+  "types": "./dist/types/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/shared-ritm.es.js",
+      "require": "./dist/shared-ritm.umd.js",
+      "default": "./dist/shared-ritm.es.js",
+      "types": "./dist/types/index.d.ts"
+    },
+    "./style": "./dist/index.css"
+  },
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build && tsc --emitDeclarationOnly",
+    "typecheck": "vue-tsc --noEmit",
+    "lint": "eslint --fix",
+    "format": "prettier -w -u ."
+  },
+  "dependencies": {
+    "@quasar/extras": "^1.16.17",
+    "@vueuse/core": "^10.1.2",
+    "face-api.js": "^0.22.2",
+    "axios": "^1.7.7",
+    "vue": "^3.5.12",
+    "vue-router": "^4.0.3"
+  },
+  "peerDependencies": {
+    "quasar": "^2.18.1"
+  },
+  "devDependencies": {
+    "@quasar/vite-plugin": "^1.9.0",
+    "@rollup/pluginutils": "^5.1.3",
+    "@types/node": "^22.7.9",
+    "@typescript-eslint/eslint-plugin": "^4.25.0",
+    "@typescript-eslint/parser": "^4.25.0",
+    "@vitejs/plugin-vue": "^5.1.4",
+    "@vue/compiler-sfc": "^3.0.5",
+    "@vue/eslint-config-prettier": "^6.0.0",
+    "@vue/eslint-config-typescript": "^7.0.0",
+    "eslint": "^7.27.0",
+    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-vue": "^7.10.0",
+    "install": "^0.13.0",
+    "npm": "^11.4.0",
+    "prettier": "^2.3.0",
+    "quasar": "^2.18.1",
+    "rollup-plugin-visualizer": "^5.14.0",
+    "sass": "^1.80.4",
+    "typescript": "^5.6.3",
+    "vite": "^5.4.9",
+    "vite-plugin-css-modules": "^0.0.1",
+    "vue-tsc": "^2.1.6"
+  }
+}

package/src/api/services/PhotoService.ts

@@ -0,0 +1,137 @@
+import * as faceapi from 'face-api.js'
+
+class PhotoService {
+  //  async  getFaceSnapshot(inputImage: any, box: any) {
+  //   const regionsToExtract = [new faceapi.Rect(box.x, box.y, box.width, box.height)]
+  //   const faceImages = await faceapi.extractFaces(inputImage, regionsToExtract)
+  //   if (faceImages.length) {
+  //     const dataUrl = faceImages[0].toDataURL('image/jpeg')
+  //     photo.value = dataUrl.replace(/^data:image\/\w+;base64,/, '')
+  //   }
+  // }
+
+  // Метод настройки конфига для стрима
+  getVideoStreamConfig(width: number, height: number) {
+    return {
+      audio: false,
+      video: {
+        width: { min: width, ideal: width },
+        height: { min: height, ideal: height },
+        facingMode: 'environment', // или 'user' для фронтальной камеры
+      },
+    }
+  }
+
+  // Метод для настройки рамки, где должно помещаться лицо
+  getContourCoordinate(width: number, height: number) {
+    return {
+      x: width * 0.25,
+      y: height * 0.05,
+      width: width * 0.5,
+      height: height * 0.9,
+    }
+  }
+
+  getBoxData(box: any) {
+    if (!box) return null
+    return {
+      x: box.x,
+      y: box.y,
+      width: box.width,
+      height: box.height,
+    }
+  }
+
+  setStylesForCanvas(canvasContainer: any) {
+    canvasContainer.width = '100%'
+    canvasContainer.height = '100%'
+    canvasContainer.style.position = 'absolute'
+    canvasContainer.style.top = '0'
+    canvasContainer.style.left = '0'
+  }
+
+  // Метод для рассчёта того, что лицо полностью помещается в рамке
+  checkFaceInclusion(frame: any, face: any) {
+    if (!frame || !face) return false
+
+    if (face.width > frame.width || face.height > frame.height) {
+      return false
+    }
+
+    const faceXmin = face.x
+    const faceXmax = face.x + face.width
+    const faceYmin = face.y
+    const faceYmax = face.y + face.height
+
+    const frameXmin = frame.x
+    const frameXmax = frame.x + frame.width
+    const frameYmin = frame.y
+    const frameYmax = frame.y + frame.height
+
+    return faceXmin >= frameXmin && faceXmax <= frameXmax && faceYmin >= frameYmin && faceYmax <= frameYmax
+  }
+
+  async getFaceDetections(videoRef: any) {
+    if (!videoRef) return []
+    return faceapi
+      .detectAllFaces(videoRef, new faceapi.TinyFaceDetectorOptions())
+      .withFaceLandmarks()
+      .withFaceExpressions()
+  }
+
+  getCanvas(videoRef: any) {
+    return faceapi.createCanvasFromMedia(videoRef)
+  }
+
+  getResizedAndDetection(canvas: any, detections: any, ctx: any, videoWidth: number, videoHeight: number) {
+    faceapi.matchDimensions(canvas, { width: videoWidth, height: videoHeight })
+
+    const resized = faceapi.resizeResults(detections, {
+      width: videoWidth,
+      height: videoHeight,
+    })
+
+    ctx.clearRect(0, 0, videoWidth, videoHeight)
+
+    faceapi.draw.drawDetections(canvas, resized)
+    faceapi.draw.drawFaceLandmarks(canvas, resized)
+    faceapi.draw.drawFaceExpressions(canvas, resized)
+  }
+
+  async getFaceSnapshot(inputImage: any, box: any) {
+    const regionsToExtract = [new faceapi.Rect(box.x, box.y, box.width, box.height)]
+    const faceImages = await faceapi.extractFaces(inputImage, regionsToExtract)
+
+    if (faceImages.length) {
+      const dataUrl = faceImages[0].toDataURL('image/jpeg')
+      return dataUrl.replace(/^data:image\/\w+;base64,/, '')
+    }
+
+    return null
+  }
+
+  async initModels() {
+    let date = new Date()
+    console.log(date)
+    try {
+      await Promise.all([
+        faceapi.nets.tinyFaceDetector.loadFromUri('/models'),
+        faceapi.nets.faceLandmark68Net.loadFromUri('/models'),
+        faceapi.nets.faceRecognitionNet.loadFromUri('/models'),
+        faceapi.nets.faceExpressionNet.loadFromUri('/models'),
+        //faceapi.nets.ssdMobilenetv1.loadFromUri('/models'),
+      ])
+    } catch (error) {
+      console.error(error)
+    }
+    date = new Date()
+    console.log(date)
+  }
+}
+
+let api: PhotoService
+
+export default function usePhotoService() {
+  if (!api) api = new PhotoService()
+  return api
+}

package/src/api/services/UserService.ts

@@ -0,0 +1,19 @@
+import ApiService from '@/api/settings/ApiService'
+import { Api_User } from '@/api/types/Api_User'
+
+class UserService extends ApiService {
+  public async editUser({ id, model }: { id: string; model: any }): Promise<Api_User> {
+    return await this.put<Partial<Api_User>, Api_User>(`/admin/users/${id}`, model)
+  }
+
+  public async getUser(id: string): Promise<Api_User> {
+    return await this.get<Api_User>(`/admin/users/${id}`)
+  }
+}
+
+let api: UserService
+
+export default function useUserService() {
+  if (!api) api = new UserService()
+  return api
+}