shared-ritm 1.3.126 → 1.3.128

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

@@ -1,6 +1,6 @@
 import ApiService from '../settings/ApiService';
 import { ResponseApi } from '../types/Api_Service';
-import { Api_Metrics_Instruments_Plan, Api_Metrics_Performance, Api_Metrics_Personnel_Plan, Api_Metrics_Personnel_Plan_Project, Api_Metrics_Personnel_Plan_Project_Body, Api_Metrics_Task_Project, Api_Metrics_Unused_Personnel } from '@/api/types/Api_Metrics';
+import { Api_Metrics_Instruments_Plan, Api_Metrics_Performance, Api_Metrics_Personnel_Plan, Api_Metrics_Personnel_Plan_Project, Api_Metrics_Personnel_Plan_Project_Body, Api_Metrics_Task_By_Status, Api_Metrics_Task_Project, Api_Metrics_Unused_Personnel } from '@/api/types/Api_Metrics';
 declare class MetricsService extends ApiService {
     fetchPieProjects(queryString: string): Promise<ResponseApi<any>>;
     fetchPieTasks(queryString: string): Promise<ResponseApi<any>>;
@@ -30,7 +30,7 @@ declare class MetricsService extends ApiService {
     fetchPieWorkZone(queryString: string): Promise<any>;
     fetchWorkZoneInfo(queryString: string): Promise<any>;
     fetchPieAllTasks(queryString: string): Promise<any>;
-    fetchPieAllTasksInfo(queryString: string): Promise<any>;
+    fetchPieAllTasksInfo(params: any): Promise<Api_Metrics_Task_By_Status>;
     fetchPersonnelPlan(params: any): Promise<Api_Metrics_Personnel_Plan>;
     fetchPersonnelPlanProjects(body: Api_Metrics_Personnel_Plan_Project_Body): Promise<Api_Metrics_Personnel_Plan_Project[]>;
     fetchInstrumentsPlan(params: any): Promise<Api_Metrics_Instruments_Plan[]>;
@@ -39,6 +39,7 @@ declare class MetricsService extends ApiService {
         status_name: string;
     }): Promise<Api_Metrics_Task_Project[]>;
     fetchWarehouseByCompliance(params: string): Promise<any>;
+    fetchEquipmentTree(params: string): Promise<any>;
 }
 export default function useMetricsService(): MetricsService;
 export {};

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

@@ -75,4 +75,25 @@ export type Api_Metrics_Performance_User = {
 export type Api_Metrics_Task_Project = {
     id: string;
     name: string;
+    period_start: string;
+    period_end: string;
+};
+export type Api_Metrics_Task = {
+    id: string;
+    name: string;
+    expired: boolean;
+    has_subtasks: boolean;
+    is_critical_path: boolean;
+    state_id: string | null;
+    time_of_delay: number | null;
+    video_source_id: string | null;
+    deleted_at?: string | null;
+};
+export type Api_Metrics_Task_By_Status = {
+    status: {
+        id: string | null;
+        name: string;
+        title: string;
+    };
+    tasks: Api_Metrics_Task[];
 };

package/package.json

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

package/src/api/services/MetricsService.ts

@@ -6,6 +6,7 @@ import {
   Api_Metrics_Personnel_Plan,
   Api_Metrics_Personnel_Plan_Project,
   Api_Metrics_Personnel_Plan_Project_Body,
+  Api_Metrics_Task_By_Status,
   Api_Metrics_Task_Project,
   Api_Metrics_Unused_Personnel,
 } from '@/api/types/Api_Metrics'
@@ -122,8 +123,8 @@ class MetricsService extends ApiService {
     return await this.get('repairs/metrics/get_list_task_group_by_status' + '?' + queryString)
   }
 
-  public async fetchPieAllTasksInfo(queryString: string): Promise<any> {
-    return await this.get('repairs/metrics/get_list_task_by_status' + '?' + queryString)
+  public async fetchPieAllTasksInfo(params: any): Promise<Api_Metrics_Task_By_Status> {
+    return await this.get('repairs/metrics/get_list_task_by_status', { params })
   }
 
   public fetchPersonnelPlan(params: any): Promise<Api_Metrics_Personnel_Plan> {
@@ -150,6 +151,9 @@ class MetricsService extends ApiService {
   public async fetchWarehouseByCompliance(params: string): Promise<any> {
     return await this.get(`repairs/metrics/get_warehouse_by_compliance?${params}`)
   }
+  public async fetchEquipmentTree(params: string): Promise<any> {
+    return await this.get(`repairs/equipments/get_equipment_tree_repaired_not_repaired?${params}`)
+  }
 }
 
 let api: MetricsService

package/src/api/types/Api_Metrics.ts

@@ -86,4 +86,27 @@ export type Api_Metrics_Performance_User = {
 export type Api_Metrics_Task_Project = {
   id: string
   name: string
+  period_start: string
+  period_end: string
+}
+
+export type Api_Metrics_Task = {
+  id: string
+  name: string
+  expired: boolean
+  has_subtasks: boolean
+  is_critical_path: boolean
+  state_id: string | null
+  time_of_delay: number | null
+  video_source_id: string | null
+  deleted_at?: string | null
+}
+
+export type Api_Metrics_Task_By_Status = {
+  status: {
+    id: string | null
+    name: string
+    title: string
+  }
+  tasks: Api_Metrics_Task[]
 }

package/src/common/app-datepicker/AppDatepicker.vue

@@ -7,8 +7,9 @@
       :label="label"
       :required="required"
       :rules="rules"
-      :error="error"
+      :error="isError || error"
       :disable="disabled"
+      :hide-bottom-space="hideBottomSpace"
       placeholder="Выберите дату"
     >
       <q-popup-proxy v-if="!disabled" class="datepicker__wrapper" @update:model-value="updateError">
@@ -49,6 +50,8 @@ interface Props {
   disabled?: boolean
   required?: boolean
   timeFormat?: string
+  hideBottomSpace?: boolean
+  isError?: boolean
 }
 const props = withDefaults(defineProps<Props>(), {
   label: '',

package/src/common/app-input-new/AppInputNew.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-input-new">
+  <div class="app-input-new" :class="{ hideBottomSpace }">
     <label v-if="label" class="app-input-new__label">
       {{ label }}
       <span v-if="required" class="required">*</span>
@@ -20,6 +20,7 @@
       :loading="loading"
       :maxlength="maxlength"
       :counter="counter"
+      :hide-bottom-space="hideBottomSpace"
       @blur="emit('blur')"
     >
       <slot />
@@ -123,6 +124,10 @@ const copyToClipboard = () => {
   flex-direction: column;
   margin-bottom: 15px;
 
+  &.hideBottomSpace {
+    margin-bottom: 0;
+  }
+
   &__label {
     font-size: 14px;
     font-weight: 700;

package/src/common/app-select/AppSelect.vue

@@ -22,7 +22,13 @@
     autocomplete=""
     @filter="filterFn"
   >
-    <template v-if="multiple" #selected-item="scope">
+    <template v-if="multiple && hideChips" #selected>
+      <div v-if="Array.isArray(selected) && selected.length" class="q-field__input">
+        <span class="selected-counter">Выбрано: {{ selected.length }} </span>
+      </div>
+    </template>
+
+    <template v-else-if="multiple" #selected-item="scope">
       <q-chip
         v-if="scope.opt"
         removable
@@ -63,6 +69,7 @@ interface AppQSelectProps {
   clearable?: boolean
   search?: boolean
   dataTest?: string
+  hideChips?: boolean
 }
 
 const props = defineProps<AppQSelectProps>()
@@ -78,8 +85,9 @@ const selected = computed({
 })
 
 const type = () => {
-  if (Array.isArray(selected.value) && !selected.value.length) return true
-  return typeof selected.value === 'string' && !selected.value
+  if (Array.isArray(selected.value) || props.multiple) return !selected.value?.length
+
+  return !selected.value
 }
 
 const lcText: Ref<string> = ref('')