From 1194c2c1bd276a6ec4c77073fe7429c582be90c3 Mon Sep 17 00:00:00 2001
From: MoonTestUse1 <crocoman7887@gmail.com>
Date: Wed, 1 Jan 2025 21:13:15 +0600
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=BA=D0=B0=20ad?=
 =?UTF-8?q?m6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/admin/EmployeeList.vue     |  2 +-
 frontend/src/composables/useRequests.ts       | 21 +++++++
 frontend/src/composables/useStatistics.ts     | 31 ++++++++++
 frontend/src/types/statistics.ts              | 17 +++++
 frontend/src/utils/labels.ts                  | 22 +++++++
 frontend/src/views/admin/DashboardView.vue    | 62 +++----------------
 6 files changed, 100 insertions(+), 55 deletions(-)
 create mode 100644 frontend/src/composables/useRequests.ts
 create mode 100644 frontend/src/composables/useStatistics.ts
 create mode 100644 frontend/src/types/statistics.ts
 create mode 100644 frontend/src/utils/labels.ts

diff --git a/frontend/src/components/admin/EmployeeList.vue b/frontend/src/components/admin/EmployeeList.vue
index 01c5bca..6d30fab 100644
--- a/frontend/src/components/admin/EmployeeList.vue
+++ b/frontend/src/components/admin/EmployeeList.vue
@@ -67,7 +67,7 @@ onMounted(fetchEmployees);
 <template>
   <div class="space-y-4">
     <div class="flex justify-between items-center mb-6">
-      <h2 class="text-lg font-semibold">Сотрудники</h2>
+      <h2 class="text-lg font-semibold">Сотрудники88</h2>
       <button
         @click="showAddForm = true"
         class="bg-blue-600 text-white px-4 py-2 rounded-md hover:bg-blue-700"
diff --git a/frontend/src/composables/useRequests.ts b/frontend/src/composables/useRequests.ts
new file mode 100644
index 0000000..ee6754b
--- /dev/null
+++ b/frontend/src/composables/useRequests.ts
@@ -0,0 +1,21 @@
+import { ref } from 'vue';
+import type { Request } from '@/types/request';
+
+export function useRequests() {
+  const requests = ref<Request[]>([]);
+
+  const fetchRequests = async () => {
+    try {
+      const response = await fetch('/api/admin/requests');
+      if (!response.ok) throw new Error('Failed to fetch requests');
+      requests.value = await response.json();
+    } catch (error) {
+      console.error('Error fetching requests:', error);
+    }
+  };
+
+  return {
+    requests,
+    fetchRequests
+  };
+}
\ No newline at end of file
diff --git a/frontend/src/composables/useStatistics.ts b/frontend/src/composables/useStatistics.ts
new file mode 100644
index 0000000..05baba1
--- /dev/null
+++ b/frontend/src/composables/useStatistics.ts
@@ -0,0 +1,31 @@
+import { ref, computed } from 'vue';
+import type { Statistics, StatisticCard } from '@/types/statistics';
+
+export function useStatistics() {
+  const statistics = ref<Statistics | null>(null);
+
+  const statisticsCards = computed<StatisticCard[]>(() => {
+    if (!statistics.value) return [];
+    return [
+      { period: 'total', label: 'Всего заявок', value: statistics.value.totalRequests },
+      { period: 'resolved', label: 'Решено', value: statistics.value.resolvedRequests },
+      { period: 'avgTime', label: 'Среднее время', value: statistics.value.averageResolutionTime }
+    ];
+  });
+
+  const fetchStatistics = async () => {
+    try {
+      const response = await fetch('/api/admin/statistics?period=week');
+      if (!response.ok) throw new Error('Failed to fetch statistics');
+      statistics.value = await response.json();
+    } catch (error) {
+      console.error('Error fetching statistics:', error);
+    }
+  };
+
+  return {
+    statistics,
+    statisticsCards,
+    fetchStatistics
+  };
+}
\ No newline at end of file
diff --git a/frontend/src/types/statistics.ts b/frontend/src/types/statistics.ts
new file mode 100644
index 0000000..dfbbb22
--- /dev/null
+++ b/frontend/src/types/statistics.ts
@@ -0,0 +1,17 @@
+export interface Statistics {
+    totalRequests: number;
+    resolvedRequests: number;
+    averageResolutionTime: string;
+    volumeLabels: string[];
+    volumeData: number[];
+    typeLabels: string[];
+    typeData: number[];
+    statusLabels: string[];
+    statusData: number[];
+  }
+  
+  export interface StatisticCard {
+    period: string;
+    label: string;
+    value: number | string;
+  }
\ No newline at end of file
diff --git a/frontend/src/utils/labels.ts b/frontend/src/utils/labels.ts
new file mode 100644
index 0000000..bfe0e48
--- /dev/null
+++ b/frontend/src/utils/labels.ts
@@ -0,0 +1,22 @@
+const STATUS_LABELS: Record<string, string> = {
+    new: 'Новая',
+    in_progress: 'В работе',
+    resolved: 'Решена',
+    closed: 'Закрыта'
+  };
+  
+  const REQUEST_TYPE_LABELS: Record<string, string> = {
+    hardware: 'Проблемы с оборудованием',
+    software: 'Проблемы с ПО',
+    network: 'Проблемы с сетью',
+    access: 'Доступ к системам',
+    other: 'Другое'
+  };
+  
+  export const getStatusLabel = (status: string): string => {
+    return STATUS_LABELS[status] || status;
+  };
+  
+  export const getRequestTypeLabel = (type: string): string => {
+    return REQUEST_TYPE_LABELS[type] || type;
+  };
\ No newline at end of file
diff --git a/frontend/src/views/admin/DashboardView.vue b/frontend/src/views/admin/DashboardView.vue
index 63ac240..8938b5d 100644
--- a/frontend/src/views/admin/DashboardView.vue
+++ b/frontend/src/views/admin/DashboardView.vue
@@ -2,18 +2,11 @@
   <div class="space-y-6">
     <div class="flex justify-between items-center">
       <h1 class="text-2xl font-bold">Панель администратора</h1>
-      <button 
-        @click="router.push('/admin/employees/add')"
-        class="bg-blue-500 hover:bg-blue-600 text-white font-semibold py-2 px-4 rounded-lg flex items-center gap-2 transition-colors"
-      >
-        <PlusCircle class="w-5 h-5" />
-        Добавить работника
-      </button>
     </div>
 
     <!-- Statistics -->
     <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
-      <div v-for="stat in statistics" :key="stat.period" class="bg-white p-4 rounded-lg shadow">
+      <div v-for="stat in statisticsCards" :key="stat.period" class="bg-white p-4 rounded-lg shadow">
         <h3 class="text-lg font-semibold">{{ stat.label }}</h3>
         <p class="text-2xl font-bold">{{ stat.value }}</p>
       </div>
@@ -39,8 +32,8 @@
             <tr v-for="request in requests" :key="request.id">
               <td class="px-6 py-4 whitespace-nowrap">{{ request.id }}</td>
               <td class="px-6 py-4 whitespace-nowrap">{{ request.employee_last_name }}</td>
-              <td class="px-6 py-4 whitespace-nowrap">{{ request.request_type }}</td>
-              <td class="px-6 py-4 whitespace-nowrap">{{ request.status }}</td>
+              <td class="px-6 py-4 whitespace-nowrap">{{ getRequestTypeLabel(request.request_type) }}</td>
+              <td class="px-6 py-4 whitespace-nowrap">{{ getStatusLabel(request.status) }}</td>
               <td class="px-6 py-4 whitespace-nowrap">{{ formatDate(request.created_at) }}</td>
             </tr>
           </tbody>
@@ -52,56 +45,17 @@
 
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
-import { useRouter } from 'vue-router';
-import { PlusCircle } from 'lucide-vue-next';
+import { useRequests } from '@/composables/useRequests';
+import { useStatistics } from '@/composables/useStatistics';
+import { getRequestTypeLabel, getStatusLabel } from '@/utils/labels';
 
-interface Statistic {
-  period: string;
-  label: string;
-  value: number | string;
-}
-
-interface Request {
-  id: number;
-  employee_last_name: string;
-  request_type: string;
-  status: string;
-  created_at: string;
-}
-
-const router = useRouter();
-const statistics = ref<Statistic[]>([]);
-const requests = ref<Request[]>([]);
+const { requests, fetchRequests } = useRequests();
+const { statistics, statisticsCards, fetchStatistics } = useStatistics();
 
 const formatDate = (date: string) => {
   return new Date(date).toLocaleString('ru-RU');
 };
 
-const fetchStatistics = async () => {
-  try {
-    const response = await fetch('/api/admin/statistics?period=week');
-    if (!response.ok) throw new Error('Failed to fetch statistics');
-    const data = await response.json();
-    statistics.value = [
-      { period: 'total', label: 'Всего заявок', value: data.totalRequests },
-      { period: 'resolved', label: 'Решено', value: data.resolvedRequests },
-      { period: 'avgTime', label: 'Среднее время', value: data.averageResolutionTime }
-    ];
-  } catch (error) {
-    console.error('Error fetching statistics:', error);
-  }
-};
-
-const fetchRequests = async () => {
-  try {
-    const response = await fetch('/api/admin/requests');
-    if (!response.ok) throw new Error('Failed to fetch requests');
-    requests.value = await response.json();
-  } catch (error) {
-    console.error('Error fetching requests:', error);
-  }
-};
-
 onMounted(() => {
   fetchStatistics();
   fetchRequests();