shared-ritm 1.2.36 → 1.2.38

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

@@ -1,11 +1,11 @@
 import ApiService, { ResponseApi } from '@/api/settings/ApiService';
 import { Api_ControlZones_Dto } from '@/api/types/Api_Controls';
 declare class ControlsService extends ApiService {
-    fetchProjectById(id: string): Promise<ResponseApi<Api_ControlZones_Dto>>;
-    createProject(params: any): Promise<ResponseApi<any>>;
-    editProject(id: string, params: any): Promise<ResponseApi<any>>;
-    fetchProjects(params: any): Promise<ResponseApi<Api_ControlZones_Dto[]>>;
-    deleteProject(id: string): Promise<any>;
+    fetchControlZones(params: Record<string, any>): Promise<ResponseApi<Api_ControlZones_Dto[]>>;
+    fetchControlZone(id: string): Promise<ResponseApi<Api_ControlZones_Dto>>;
+    createControlZone(params: any): Promise<ResponseApi<any>>;
+    editControlZone(id: string, params: any): Promise<ResponseApi<any>>;
+    deleteControlZone(id: string): Promise<any>;
 }
 export default function useControlsService(): ControlsService;
 export {};

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

@@ -23,6 +23,8 @@ declare class MetricsService extends ApiService {
     fetchQualityInfo(params: string): Promise<any>;
     fetchPieWorkZone(queryString: string): Promise<ResponseApi<any>>;
     fetchWorkZoneInfo(queryString: string): Promise<ResponseApi<any>>;
+    fetchPieAllTasks(queryString: string): Promise<ResponseApi<any>>;
+    fetchPieAllTasksInfo(queryString: string): Promise<ResponseApi<any>>;
 }
 export default function useMetricsService(): MetricsService;
 export {};

package/dist/types/common/app-table/controllers/useTableModel.d.ts

@@ -0,0 +1,31 @@
+import { Ref } from 'vue';
+export interface TableColumn {
+    name: string;
+    label: string;
+    style?: string;
+    headerStyle?: string;
+    field: string | ((row: any) => any);
+    sortable?: boolean;
+    filterType: 'single' | 'multi' | null;
+    align?: 'left' | 'center' | 'right';
+}
+export interface FilterOption {
+    id: string;
+    name: string;
+}
+export interface TableModel<T = any> {
+    columns: TableColumn[];
+    rows: T[] | Ref<T[]>;
+    filtersOptions?: Ref<Record<string, FilterOption[]>>;
+}
+export declare const useTableModel: <T = any>(model: TableModel<T>) => {
+    rows: import("vue").ComputedRef<T[]>;
+    columns: import("vue").ComputedRef<TableColumn[]>;
+    columnFilters: Ref<Record<string, string | string[] | undefined>, Record<string, string | string[] | undefined>>;
+    filterMenus: Ref<Record<string, boolean>, Record<string, boolean>>;
+    filteredRows: import("vue").ComputedRef<T[]>;
+    toggleFilterValue: (colName: string, value: string) => void;
+    clearFilter: (colName: string) => void;
+    openFilterMenu: (colName: string, isOpen: boolean) => void;
+    selectedFilters: import("vue").ComputedRef<Record<string, string[]>>;
+};

package/dist/types/index.d.ts

@@ -15,6 +15,10 @@ import AppToggle from '@/common/app-toggle/AppToggle.vue';
 import AppWrapper from '@/common/app-wrapper/AppWrapper.vue';
 import AppConfirmDialog from '@/common/app-dialogs/AppConfirmDialog.vue';
 import AppDropdown from '@/common/app-dropdown/AppDropdown.vue';
+import AppTablePagination from '@/common/app-table/components/TablePagination.vue';
+import AppTableSearch from '@/common/app-table/components/TableSearch.vue';
+import AppTableModal from '@/common/app-table/components/TableModal.vue';
+import AppTable from '@/common/app-table/AppTable.vue';
 import useGanttService from '@/api/services/GanttService';
 import useMetricsService from '@/api/services/MetricsService';
 import useProjectsService from '@/api/services/ProjectsService';
@@ -23,10 +27,14 @@ import useTasksService from '@/api/services/TasksService';
 import useAuthService from '@/api/services/AuthService';
 import useFileService from '@/api/services/FileService';
 import ApiService from '@/api/settings/ApiService';
-export { AppButton, AppCheckbox, AppDatePicker, AppInput, AppInputSearch, AppLayout, AppLayoutHeader, AppLayoutPage, AppLoader, AppSelect, AppSheet, AppSidebar, AppToggle, AppWrapper, AppConfirmDialog, AppDropdown, };
-export { ApiService, useAuthService, useGanttService, useMetricsService, useProjectsService, useRepairsService, useTasksService, useFileService, };
+import useControlsService from '@/api/services/ControlsService';
+export { AppButton, AppCheckbox, AppDatePicker, AppInput, AppInputSearch, AppLayout, AppLayoutHeader, AppLayoutPage, AppLoader, AppSelect, AppSheet, AppSidebar, AppToggle, AppWrapper, AppConfirmDialog, AppDropdown, AppTablePagination, AppTableSearch, AppTableModal, AppTable, };
+export { ApiService, useAuthService, useGanttService, useMetricsService, useProjectsService, useRepairsService, useTasksService, useFileService, useControlsService, };
+export { useTableModel } from './common/app-table/controllers/useTableModel';
+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_Tasks';
 export * from './api/types/Api_Repairs';
 export * from './api/types/Api_Projects';
+export * from './api/types/Api_Controls';

package/package.json

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

package/src/api/services/ControlsService.ts

@@ -3,24 +3,24 @@ import ApiService, { ResponseApi } from '@/api/settings/ApiService'
 import { Api_ControlZones_Dto } from '@/api/types/Api_Controls'
 
 class ControlsService extends ApiService {
-  public async fetchProjectById(id: string): Promise<ResponseApi<Api_ControlZones_Dto>> {
-    return this.get(`/projects/${id}`)
+  public fetchControlZones(params: Record<string, any>): Promise<ResponseApi<Api_ControlZones_Dto[]>> {
+    return this.get('/frame/list', { params })
   }
 
-  public createProject(params: any): Promise<ResponseApi<any>> {
-    return this.post<any, ResponseApi<any>>('/projects', params)
+  public async fetchControlZone(id: string): Promise<ResponseApi<Api_ControlZones_Dto>> {
+    return this.get(`/frame/${id}`)
   }
 
-  public editProject(id: string, params: any): Promise<ResponseApi<any>> {
-    return this.put<any, ResponseApi<any>>(`/projects/${id}`, params)
+  public createControlZone(params: any): Promise<ResponseApi<any>> {
+    return this.post<any, ResponseApi<any>>('/frame', params)
   }
 
-  public fetchProjects(params: any): Promise<ResponseApi<Api_ControlZones_Dto[]>> {
-    return this.get(`/search/projects`, { params })
+  public editControlZone(id: string, params: any): Promise<ResponseApi<any>> {
+    return this.put<any, ResponseApi<any>>(`/frame/${id}`, params)
   }
 
-  public deleteProject(id: string): Promise<any> {
-    return this.delete<ResponseApi<any>>(`/projects/${id}`)
+  public deleteControlZone(id: string): Promise<any> {
+    return this.delete<ResponseApi<any>>(`/frame/${id}`)
   }
 }
 

package/src/api/services/MetricsService.ts

@@ -91,6 +91,14 @@ class MetricsService extends ApiService {
   public async fetchWorkZoneInfo(queryString: string): Promise<ResponseApi<any>> {
     return await this.get('repairs/metrics/get_list_work_zone_instrument_by_status' + '?' + queryString)
   }
+
+  public async fetchPieAllTasks(queryString: string): Promise<ResponseApi<any>> {
+    return await this.get('repairs/metrics/get_list_task_group_by_status' + '?' + queryString)
+  }
+
+  public async fetchPieAllTasksInfo(queryString: string): Promise<ResponseApi<any>> {
+    return await this.get('repairs/metrics/get_list_task_by_status' + '?' + queryString)
+  }
 }
 
 let api: MetricsService

package/src/api/services/RepairsService.ts

@@ -1,100 +1,100 @@
-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'
-
-class RepairsService extends ApiService {
-  public fetchFilters(fullParams: string): Promise<OptionFilters> {
-    return this.get(`get_list_repair?smart=1&${fullParams}`)
-  }
-
-  public fetchRepairs(
-    isQuery: boolean,
-    queries?: string,
-    hasTeams?: boolean | string,
-    teamsFilter?: string,
-    typeFilter?: string,
-  ): Promise<ResponseApi<Api_Repair_Dto[]>> {
-    return this.get(
-      'get_list_repair' +
-        (isQuery
-          ? `${queries}&per_page=100000${typeFilter ? '&' + typeFilter : ''}&${!hasTeams ? teamsFilter : ''}`
-          : `?per_page=100000${typeFilter ? '&' + typeFilter : ''}&${teamsFilter}`),
-    )
-  }
-
-  public fetchEquipment(): Promise<ResponseApi<Api_Equipment_Full_Dto[]>> {
-    return this.get('repairs/equipment/list?per_page=100000')
-  }
-
-  public createRepair(payload: Api_Create_Repair_With_Equipments) {
-    return this.post<Api_Create_Repair_With_Equipments, any>('/repairs/equipments', payload)
-  }
-
-  public startRepair(id: string): Promise<void> {
-    return this.post<null, void>(`/repairs/${id}/start`, null)
-  }
-
-  public finishRepair(id: string) {
-    return this.post<any, void>(`/repairs/complete_repair_list`, {
-      repairIdList: [id],
-    })
-  }
-
-  public finishPreparationProject(id: string) {
-    return this.post<null, void>(`/repairs/${id}/finish_preparation`, null)
-  }
-
-  public moveRepairToCurrent(id: string) {
-    return this.post<any, void>(`/repairs/transfer_repair_plan_to_current`, {
-      repairs: [id],
-    })
-  }
-
-  public moveArchiveToCurrent(id: string) {
-    return this.post<any, void>(`/repairs/transfer_repair_archive_to_current`, {
-      repairs_ids: [id],
-    })
-  }
-
-  public moveRepairToApr(id: string) {
-    return this.post<any, void>(`/repairs/transfer_repair_current_to_plan`, {
-      repairs: [id],
-    })
-  }
-
-  public moveRepairToArchive(id: string) {
-    return this.post<any, void>(`/repairs/transfer_repair_current_to_archive`, {
-      repairs_ids: [id],
-    })
-  }
-
-  public restoreRepair(id: string) {
-    return this.post<any, void>(`/restore_repair`, {
-      repairs_ids: [id],
-    })
-  }
-
-  public updateRepair(payload: Api_Update_Repair, id: string) {
-    return this.put<Api_Update_Repair, void>(`/repairs/${id}`, payload)
-  }
-
-  public copyRepair(id: string) {
-    return this.post<null, any>(`/repairs/${id}/clone`, null)
-  }
-
-  public deleteRepair(id: string) {
-    return this.delete<any>(`/repairs/${id}`)
-  }
-}
-
-let api: RepairsService
-
-export default function useRepairsService() {
-  if (!api) api = new RepairsService()
-  return api
-}
+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'
+
+class RepairsService extends ApiService {
+  public fetchFilters(fullParams: string): Promise<OptionFilters> {
+    return this.get(`get_list_repair?smart=1&${fullParams}`)
+  }
+
+  public fetchRepairs(
+    isQuery: boolean,
+    queries?: string,
+    hasTeams?: boolean | string,
+    teamsFilter?: string,
+    typeFilter?: string,
+  ): Promise<ResponseApi<Api_Repair_Dto[]>> {
+    return this.get(
+      'get_list_repair' +
+        (isQuery
+          ? `${queries}&per_page=100000${typeFilter ? '&' + typeFilter : ''}&${!hasTeams ? teamsFilter : ''}`
+          : `?per_page=100000${typeFilter ? '&' + typeFilter : ''}&${teamsFilter}`),
+    )
+  }
+
+  public fetchEquipment(): Promise<ResponseApi<Api_Equipment_Full_Dto[]>> {
+    return this.get('repairs/equipment/list?per_page=100000')
+  }
+
+  public createRepair(payload: Api_Create_Repair_With_Equipments) {
+    return this.post<Api_Create_Repair_With_Equipments, any>('/repairs/equipments', payload)
+  }
+
+  public startRepair(id: string): Promise<void> {
+    return this.post<null, void>(`/repairs/${id}/start`, null)
+  }
+
+  public finishRepair(id: string) {
+    return this.post<any, void>(`/repairs/complete_repair_list`, {
+      repairIdList: [id],
+    })
+  }
+
+  public finishPreparationProject(id: string) {
+    return this.post<null, void>(`/repairs/${id}/finish_preparation`, null)
+  }
+
+  public moveRepairToCurrent(id: string) {
+    return this.post<any, void>(`/repairs/transfer_repair_plan_to_current`, {
+      repairs: [id],
+    })
+  }
+
+  public moveArchiveToCurrent(id: string) {
+    return this.post<any, void>(`/repairs/transfer_repair_archive_to_current`, {
+      repairs_ids: [id],
+    })
+  }
+
+  public moveRepairToApr(id: string) {
+    return this.post<any, void>(`/repairs/transfer_repair_current_to_plan`, {
+      repairs: [id],
+    })
+  }
+
+  public moveRepairToArchive(id: string) {
+    return this.post<any, void>(`/repairs/transfer_repair_current_to_archive`, {
+      repairs_ids: [id],
+    })
+  }
+
+  public restoreRepair(id: string) {
+    return this.post<any, void>(`/restore_repair`, {
+      repairs_ids: [id],
+    })
+  }
+
+  public updateRepair(payload: Api_Update_Repair, id: string) {
+    return this.put<Api_Update_Repair, void>(`/repairs/${id}`, payload)
+  }
+
+  public copyRepair(id: string) {
+    return this.post<null, any>(`/repairs/${id}/clone`, null)
+  }
+
+  public deleteRepair(id: string) {
+    return this.delete<any>(`/repairs/${id}`)
+  }
+}
+
+let api: RepairsService
+
+export default function useRepairsService() {
+  if (!api) api = new RepairsService()
+  return api
+}

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

@@ -0,0 +1,188 @@
+<script setup lang="ts">
+import { defineProps, defineEmits, ref, computed } from 'vue'
+import type { Ref } from 'vue'
+import FilterIcon from '@/icons/components/table-filter-icon.vue'
+
+interface FilterOption {
+  id: string
+  name: string
+}
+
+interface TableEmits {
+  'toggle-filter-value': [colName: string, value: string]
+  'clear-filter': [colName: string]
+  'open-filter-menu': [colName: string, isOpen: boolean]
+  'row-click': [row: Record<string, any>]
+}
+
+const emit = defineEmits<TableEmits>()
+
+const props = defineProps<{
+  rows: Ref<any[]>
+  columns: any[]
+  columnFilters: Ref<Record<string, string | string[] | undefined>>
+  filterMenus: Ref<Record<string, boolean>>
+  filtersOptions: Record<string, FilterOption[]>
+  meta: Ref<{ currentPage: number; perPage: number }>
+}>()
+
+const localSearches = ref<Record<string, string>>({})
+
+const filteredOptions = computed(() => {
+  const result: Record<string, FilterOption[]> = {}
+  for (const col of props.columns) {
+    const search = localSearches.value[col.name]?.toLowerCase() || ''
+    const options = props.filtersOptions[col.name] || []
+    result[col.name] = options.filter(opt => opt.name.toLowerCase().includes(search))
+  }
+  return result
+})
+</script>
+
+<template>
+  <q-page class="flex flex-col" style="min-height: 100%">
+    <q-table
+      :rows="rows.value"
+      :columns="columns"
+      row-key="id"
+      flat
+      bordered
+      hide-bottom
+      class="full-width"
+      :rows-per-page-options="[0]"
+      @row-click="(_, row) => emit('row-click', row)"
+    >
+      <template #body-cell-index="props">
+        <q-td :props="props" class="text-center">
+          {{ props.rowIndex + 1 + (meta.value.currentPage - 1) * meta.value.perPage }}
+        </q-td>
+      </template>
+
+      <template v-for="col in columns" :key="col.name" #[`header-cell-${col.name}`]="propsSlot">
+        <q-th :props="propsSlot" :class="{ 'cursor-pointer': col.filterType }">
+          <div
+            v-if="col.filterType"
+            class="row items-center no-wrap"
+            @click.stop="emit('open-filter-menu', col.name, !filterMenus.value[col.name])"
+          >
+            <filter-icon class="q-mr-xs" />
+            <span>{{ col.label }}</span>
+            <template v-if="col.filterType === 'multi' && columnFilters.value[col.name]?.length">
+              <div class="label-length">- {{ columnFilters.value[col.name]?.length }}</div>
+            </template>
+          </div>
+          <div v-else>{{ col.label }}</div>
+
+          <q-menu
+            v-if="col.filterType"
+            :model-value="filterMenus.value[col.name]"
+            fit
+            max-height="300px"
+            class="filter-menu"
+            @update:model-value="isOpen => emit('open-filter-menu', col.name, isOpen)"
+          >
+            <div class="filter-content">
+              <q-input v-model="localSearches[col.name]" dense outlined placeholder="Поиск" class="q-mb-sm" clearable />
+              <q-scroll-area style="height: 200px">
+                <q-list style="min-width: 200px">
+                  <q-item v-for="option in filteredOptions[col.name]" :key="`${col.name}-${option.id}`" tag="label">
+                    <q-item-section avatar>
+                      <q-checkbox
+                        v-if="col.filterType === 'multi'"
+                        dense
+                        :model-value="
+                          Array.isArray(columnFilters.value[col.name]) &&
+                          columnFilters.value[col.name]?.includes(option.name)
+                        "
+                        @update:model-value="() => emit('toggle-filter-value', col.name, option.name)"
+                      />
+                      <q-radio
+                        v-else
+                        dense
+                        :model-value="columnFilters.value[col.name]"
+                        :val="option.name"
+                        @update:model-value="emit('toggle-filter-value', col.name, $event)"
+                      />
+                    </q-item-section>
+                    <q-item-section>{{ option.name }}</q-item-section>
+                  </q-item>
+                </q-list>
+              </q-scroll-area>
+
+              <div class="filter-footer">
+                <q-btn color="negative" flat dense label="Сбросить фильтр" @click="emit('clear-filter', col.name)" />
+              </div>
+            </div>
+          </q-menu>
+        </q-th>
+      </template>
+    </q-table>
+  </q-page>
+</template>
+
+<style scoped lang="scss">
+.cursor-pointer {
+  cursor: pointer;
+}
+
+.filter-menu {
+  padding: 10px;
+}
+.label-length {
+  margin-left: 5px;
+}
+.filter-content {
+  display: flex;
+  flex-direction: column;
+  color: #1d425d;
+  .q-item {
+    padding: 0 5px;
+    min-height: 40px;
+  }
+  .q-item__section {
+    min-width: 30px;
+    padding: 0px;
+  }
+  ::v-deep(.q-radio__inner),
+  ::v-deep(.q-checkbox__inner) {
+    color: #a4b4cf;
+  }
+}
+
+.filter-footer {
+  border-top: 1px solid #eee;
+  display: flex;
+  justify-content: center;
+}
+
+::v-deep(.q-table thead) {
+  background: #f2f7fb;
+}
+
+::v-deep(.q-table th) {
+  font-family: NunitoSansFont, sans-serif;
+  color: #a4b4cf;
+  font-size: 15px;
+  font-style: normal;
+  font-weight: 700;
+  line-height: 20px;
+  height: 61px;
+}
+
+::v-deep(.q-table tbody td) {
+  height: 61px;
+  font-size: 14px;
+}
+
+::v-deep(.q-table tbody) {
+  font-family: NunitoSansFont, sans-serif;
+  border-color: #d7e0ef;
+  color: #1d425d;
+  line-height: 20px;
+  font-size: 14px;
+}
+
+::v-deep(.q-table tbody tr:last-child td) {
+  border-bottom: 1px solid #d7e0ef;
+}
+</style>