Remnants/AdministrationItDepartmens
1
0
Fork 0
mirror of https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git synced 2025-08-14 00:25:46 +02:00
Code Activity

add websockets suppor7

Browse Source
This commit is contained in:
MoonTestUse1
2025-01-05 02:23:37 +06:00
parent 7180fad403
commit 143a8ca482
3 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
backend/app/crud/requests.py
View File

@@ -72,15 +72,24 @@ def update_request_status(db: Session, request_id: int, status: RequestStatus) -
db.refresh(db_request)
return db_request
def get_statistics(db: Session) -> Dict:
"""Get request statistics"""
total = db.query(func.count(Request.id)).scalar()
by_status = dict(
db.query(
Request.status,
func.count(Request.id)
).group_by(Request.status).all()
def get_statistics(db: Session) -> dict:
"""Get requests statistics"""
# Получаем общее количество заявок
total = db.query(Request).count()
# Получаем количество заявок по статусам
status_counts = (
db.query(Request.status, func.count(Request.id))
.group_by(Request.status)
.all()
)
# Формируем словарь статусов
by_status = {}
for status, count in status_counts:
by_status[status] = count
# Возвращаем статистику в нужном формате
return {
"total": total,
"by_status": by_status

24
frontend/src/components/admin/StatisticsPanel.vue
View File

@@ -27,15 +27,15 @@
</div>
<div class="bg-white p-4 rounded-lg shadow">
<div class="text-sm text-gray-500">Новые заявки</div>
<div class="text-2xl font-semibold mt-1 text-blue-600">{{ statistics.by_status?.NEW || 0 }}</div>
<div class="text-2xl font-semibold mt-1 text-blue-600">{{ statistics.by_status?.new || 0 }}</div>
</div>
<div class="bg-white p-4 rounded-lg shadow">
<div class="text-sm text-gray-500">В работе</div>
<div class="text-2xl font-semibold mt-1 text-yellow-600">{{ statistics.by_status?.IN_PROGRESS || 0 }}</div>
<div class="text-2xl font-semibold mt-1 text-yellow-600">{{ statistics.by_status?.in_progress || 0 }}</div>
</div>
<div class="bg-white p-4 rounded-lg shadow">
<div class="text-sm text-gray-500">Завершенные</div>
<div class="text-2xl font-semibold mt-1 text-green-600">{{ statistics.by_status?.COMPLETED || 0 }}</div>
<div class="text-2xl font-semibold mt-1 text-green-600">{{ statistics.by_status?.completed || 0 }}</div>
</div>
</div>
@@ -58,7 +58,7 @@
</template>
<script setup lang="ts">
import { ref, onMounted, watch, onUnmounted } from 'vue';
import { ref, onMounted, onUnmounted, watch } from 'vue';
import axios from '@/plugins/axios';
import { wsClient } from '@/plugins/websocket';
import VolumeChart from './charts/VolumeChart.vue';
@@ -68,7 +68,11 @@ import StatusChart from './charts/StatusChart.vue';
const period = ref('week');
const statistics = ref({
total: 0,
by_status: {}
by_status: {
new: 0,
in_progress: 0,
completed: 0
}
});
const chartData = ref({
volumeLabels: [],
@@ -96,7 +100,10 @@ const fetchStatistics = async () => {
console.log('StatisticsPanel: Received statistics:', statsResponse.data);
// Принудительно обновляем реактивное состояние
statistics.value = JSON.parse(JSON.stringify(statsResponse.data));
statistics.value = {
total: statsResponse.data.total,
by_status: statsResponse.data.by_status || {}
};
chartData.value = chartsResponse.data;
} catch (error) {
console.error('Error fetching statistics:', error);
@@ -113,7 +120,10 @@ const handleWebSocketMessage = (data: any) => {
console.log('StatisticsPanel: Updating statistics:', data.statistics);
// Принудительно обновляем реактивное состояние
statistics.value = JSON.parse(JSON.stringify(data.statistics));
statistics.value = {
total: data.statistics.total,
by_status: data.statistics.by_status || {}
};
console.log('StatisticsPanel: New statistics:', statistics.value);
}

10
frontend/src/views/admin/AdminDashboard.vue
View File

@@ -95,7 +95,10 @@ const fetchData = async () => {
console.log('AdminDashboard: Received statistics:', statsResponse.data)
// Принудительно обновляем реактивное состояние
statistics.value = JSON.parse(JSON.stringify(statsResponse.data))
statistics.value = {
total: statsResponse.data.total,
by_status: statsResponse.data.by_status || {}
}
} catch (error) {
console.error('Error fetching data:', error)
}
@@ -111,7 +114,10 @@ const handleWebSocketMessage = (data: any) => {
console.log('AdminDashboard: Updating statistics:', data.statistics)
// Принудительно обновляем реактивное состояние
statistics.value = JSON.parse(JSON.stringify(data.statistics))
statistics.value = {
total: data.statistics.total,
by_status: data.statistics.by_status || {}
}
console.log('AdminDashboard: New statistics:', statistics.value)
}