shared-ritm 1.2.74 → 1.2.76

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

@@ -1,11 +1,11 @@
 import ApiService from '@/api/settings/ApiService';
 import { ResponseApi } from '@/api/types/Api_Service';
-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_Task_Close_Reason, Api_Task_Instrument_Dto, Api_Task_Instrument_From_Warehouse, Api_Task_Module_Instrument_Condition, Api_Task_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 {
     fetchTaskById(id: string): Promise<ResponseApi<Api_Tasks_Task_Dto>>;
-    fetchTasksList(params: any): Promise<ResponseApi<Api_Tasks_Dto[]>>;
-    fetchSubtasksList(id: string): Promise<ResponseApi<Api_Tasks_Dto[]>>;
+    fetchTasksList(params: any): Promise<ResponseApi<Api_Task_DTO[]>>;
+    fetchSubtasksList(id: string): Promise<ResponseApi<Api_Task_DTO[]>>;
     fetchTaskBranch(id: string): Promise<ResponseApi<any>>;
     fetchInstrumentsList(params: any): Promise<ResponseApi<any[]>>;
     fetchInstrumentTypeListWithPreparedWarehouse(params: {

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

@@ -91,29 +91,6 @@ export type Api_Tasks_Task_Dto = {
     isPause: boolean;
     equipment: Api_Tasks_Equipment_Dto[];
 };
-export type Api_Tasks_Simple_Responsible_Dto = {
-    id: string;
-    full_name: string;
-};
-export type Api_Tasks_Dto = {
-    id: string;
-    name: string;
-    plan_date: null | string;
-    deadline: null | string;
-    priority: number;
-    subtasks_count: number;
-    responsible: Api_Tasks_Simple_Responsible_Dto[];
-    assigned: any[];
-    status: Api_Tasks_Status_Dto;
-    expired: boolean;
-    teams: Api_Tasks_Teams_Dto[];
-    is_critical_path: boolean;
-    isPause: boolean;
-    fact_start_date: null | string;
-    fact_end_date: null | string;
-    pause_sec: number;
-    work_sec: number;
-};
 export type Api_Task_Instrument_Dto = {
     id: string;
     name: string;
@@ -138,3 +115,57 @@ export type Api_Task_Close_Reason = {
     has_reason: boolean;
     category: string;
 };
+export type Api_Assigned_DTO = {
+    id: string;
+    first_name: string;
+    last_name: string;
+    patronymic: string;
+    full_name: string;
+};
+export type Api_Status_DTO = {
+    id: string;
+    name: string;
+    title: string;
+};
+export type Api_Teams_DTO = {
+    id: string;
+    name: string;
+    display_name: string;
+};
+export type Api_Responsible_DTO = {
+    id: string;
+    name: string;
+    display_name: string;
+};
+export type Api_VideoSource_DTO = {
+    id: string;
+    name: string;
+    url: string;
+    work_zone_by_task: {
+        id: string;
+        title: string;
+    };
+};
+export type Api_Task_DTO = {
+    id: string;
+    name: string;
+    plan_date: string;
+    deadline: string;
+    priority: number;
+    subtasks_count: number;
+    expired: boolean;
+    is_critical_path: boolean;
+    power_output_MWh: number;
+    cost_per_MWh: number;
+    isPause: boolean;
+    fact_start_date: null | string;
+    fact_end_date: null | string;
+    pause_sec: number;
+    work_sec: number;
+    has_quality_metrics: boolean;
+    responsible: Api_Responsible_DTO[];
+    assigned: Api_Assigned_DTO[];
+    status: Api_Status_DTO[];
+    teams: Api_Teams_DTO[];
+    video_source: Api_VideoSource_DTO;
+};

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

@@ -0,0 +1,43 @@
+export type Api_Search_User_Passes = {
+    id: string;
+    type: string;
+    uuid: string;
+};
+export type Api_Search_User_Positions = {
+    id: string;
+    name: string;
+    display_name: string;
+    description: string;
+};
+export type Api_Search_User_Roles = {
+    id: string;
+    name: string;
+    display_name: string;
+};
+export type Api_Search_User_Teams = {
+    id: string;
+    name: string;
+    display_name: string;
+    roles: Api_Search_User_Roles[];
+};
+export type Api_Search_User_Photos = {
+    id: string;
+    name: string;
+    path: string;
+    type: string;
+};
+export type Api_Search_User = {
+    id: string;
+    full_name: string;
+    last_name: string;
+    first_name: string;
+    patronymic: string;
+    email: string;
+    phone: string;
+    divisions: string;
+    personnel_number: string;
+    passes: Api_Search_User_Passes[];
+    positions: Api_Search_User_Positions[];
+    teams: Api_Search_User_Teams[];
+    photos: Api_Search_User_Photos[];
+};

package/package.json

@@ -1,64 +1,64 @@
-{
-  "name": "shared-ritm",
-  "version": "1.2.74",
-  "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"
-  }
-}
+{
+  "name": "shared-ritm",
+  "version": "1.2.76",
+  "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

@@ -1,137 +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
-}
+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
+}