Compare commits

...

14 Commits

Author SHA1 Message Date
yangsy
bd7238a7f1 style: code state 2025-12-11 01:30:37 +08:00
yangsy
6c7897198c fix: alarm-query and secutiryBox switch states 2025-12-11 01:30:11 +08:00
yangsy
15a9f68db7 fix(device-alarm-history-diag-card): throw error if deviceId is undefined/null 2025-12-08 11:15:45 +08:00
yangsy
70f52eb3bb fix(use-device-selection): default select to Camera 2025-12-08 11:10:20 +08:00
yangsy
c189f79aa4 fix(security-box-info-card): access status 2025-12-07 11:05:44 +08:00
yangsy
8e9bd75067 feat: sync-camera-result-modal 2025-12-03 16:48:33 +08:00
yangsy
a215f2e391 feat: multiselect stations to export device icmp state 2025-12-03 10:44:14 +08:00
yangsy
e19fcf79a6 chore: vite proxy 2025-12-03 10:43:23 +08:00
yangsy
54591f401f refactor: remove console.log 2025-12-01 15:33:47 +08:00
yangsy
2116631ba6 fix: avoid mutation error from interrupting query 2025-12-01 15:22:50 +08:00
yangsy
b4e2926f08 fix: sync camera & channels 2025-12-01 15:20:11 +08:00
yangsy
168d11c71b style 2025-12-01 14:43:58 +08:00
yangsy
b0c0b88091 fix: /syncCamera 2025-12-01 14:43:42 +08:00
yangsy
f7d1d2d44c fix(security-box-info-card): access status 2025-12-01 11:30:08 +08:00
22 changed files with 287 additions and 93 deletions

View File

@@ -15,4 +15,5 @@ export * from './alarm';
export * from './log'; export * from './log';
export * from './other'; export * from './other';
export * from './storage'; export * from './storage';
export * from './upper-ndm';
export * from './video'; export * from './video';

View File

@@ -0,0 +1,2 @@
export * from './sync-camera-result';
export * from './sync-camera-result-detail';

View File

@@ -0,0 +1,6 @@
export interface SyncCameraResultDetail {
name: string;
deviceId: string;
ipAddress: string;
gbCode: string;
}

View File

@@ -0,0 +1,10 @@
import type { SyncCameraResultDetail } from './sync-camera-result-detail';
export interface SyncCameraResult {
stationCode: string;
startTime: string;
endTime: string;
insertList: SyncCameraResultDetail[];
updateList: SyncCameraResultDetail[];
deleteList: SyncCameraResultDetail[];
}

View File

@@ -55,9 +55,10 @@ export const syncCameraApi = async (options?: { stationCode?: string; signal?: A
const client = stationCode ? ndmClient : userClient; const client = stationCode ? ndmClient : userClient;
const prefix = stationCode ? `/${stationCode}` : ''; const prefix = stationCode ? `/${stationCode}` : '';
const endpoint = `${prefix}/api/ndm/ndmCamera/syncCamera`; const endpoint = `${prefix}/api/ndm/ndmCamera/syncCamera`;
const resp = await client.get<void>(endpoint, { signal }); const resp = await client.get<boolean>(endpoint, { signal });
const [err] = resp; const [err, data] = resp;
if (err) { if (err || !data) {
throw err; throw err;
} }
return data;
}; };

View File

@@ -17,22 +17,24 @@ const cardShow = computed(() => {
return Object.values(props).some((value) => !!value); return Object.values(props).some((value) => !!value);
}); });
// 门禁状态 (switches[0]: 0=关闭/失效, 1=打开/生效) // 门禁状态
const accessControlStatus = computed(() => { const accessControlStatus = computed(() => {
if (!switches?.value || switches.value.length === 0) return null; if (!switches?.value || switches.value.length === 0) return null;
return switches.value[0] === 1 ? '打开' : '关闭'; const status = switches.value.at(0)!;
return status === 0 ? '开门' : status === 1 ? '关门' : '-';
}); });
// 防雷状态 (switches[1]: 0=关闭/失效, 1=打开/生效) // 防雷状态
const lightningProtectionStatus = computed(() => { const lightningProtectionStatus = computed(() => {
if (!switches?.value || switches.value.length < 2) return null; if (!switches?.value || switches.value.length < 2) return null;
return switches.value[1] === 1 ? '生效' : '失效'; const status = switches.value.at(1)!;
return status === 0 ? '正常' : status === 1 ? '失效' : '-';
}); });
// 获取状态标签类型 // 获取状态标签类型
const getStatusTagType = (status: string | null) => { const getStatusTagType = (status: string | null) => {
if (['打开', '生效'].includes(status ?? '')) return 'success'; if (['正常'].includes(status ?? '')) return 'success';
if (['关闭', '失效'].includes(status ?? '')) return 'error'; if (['失效'].includes(status ?? '')) return 'error';
return 'default'; return 'default';
}; };

View File

@@ -78,6 +78,7 @@ const { mutate: getDeviceAlarmLogList, isPending } = useMutation({
if (!dateTimeRange.value) throw new Error('请选择时间范围'); if (!dateTimeRange.value) throw new Error('请选择时间范围');
const range = dateTimeRange.value as [number, number]; const range = dateTimeRange.value as [number, number];
const deviceId = ndmDevice.value.deviceId; const deviceId = ndmDevice.value.deviceId;
if (!deviceId) throw new Error('该设备未配置设备ID');
const alarmDate_ge = range[0]; const alarmDate_ge = range[0];
const alarmDate_le = range[1]; const alarmDate_le = range[1];
const restParams: Omit<PageParams<{ id: string }>, 'model' | 'extra'> = { const restParams: Omit<PageParams<{ id: string }>, 'model' | 'extra'> = {

View File

@@ -262,7 +262,7 @@ const scrollDeviceTreeToSelectedDevice = () => {
<template> <template>
<div style="height: 100%; display: flex; flex-direction: column"> <div style="height: 100%; display: flex; flex-direction: column">
<div style="flex-shrink: 0; padding: 12px"> <div style="padding: 12px; flex-shrink: 0">
<NInput v-model:value="searchInput" placeholder="搜索设备名称、设备ID或IP地址" clearable /> <NInput v-model:value="searchInput" placeholder="搜索设备名称、设备ID或IP地址" clearable />
<NFlex justify="space-between" align="center"> <NFlex justify="space-between" align="center">
<NRadioGroup v-model:value="statusInput"> <NRadioGroup v-model:value="statusInput">
@@ -277,13 +277,13 @@ const scrollDeviceTreeToSelectedDevice = () => {
</NFlex> </NFlex>
</div> </div>
<div style="flex: 1; min-height: 0; display: flex; overflow: hidden"> <div style="min-height: 0; overflow: hidden; flex: 1; display: flex">
<div style="flex: 0 0 auto; height: 100%"> <div style="height: 100%; flex: 0 0 auto">
<NTabs v-model:value="activeTab" animated type="line" placement="left" style="height: 100%"> <NTabs v-model:value="activeTab" animated type="line" placement="left" style="height: 100%">
<NTab v-for="pane in deviceTabPanes" :key="pane.name" :name="pane.name" :tab="pane.tab"></NTab> <NTab v-for="pane in deviceTabPanes" :key="pane.name" :name="pane.name" :tab="pane.tab"></NTab>
</NTabs> </NTabs>
</div> </div>
<div style="flex: 1 1 auto; min-width: 0"> <div style="min-width: 0; flex: 1 1 auto">
<NTree <NTree
:ref="'deviceTreeInst'" :ref="'deviceTreeInst'"
v-model:expanded-keys="expandedKeys" v-model:expanded-keys="expandedKeys"

View File

@@ -14,7 +14,7 @@ import { renderAlarmDateCell, renderDeviceTypeCell, renderAlarmTypeCell, renderF
import { downloadByData } from '@/utils'; import { downloadByData } from '@/utils';
import { useMutation } from '@tanstack/vue-query'; import { useMutation } from '@tanstack/vue-query';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { NButton, NCol, NDataTable, NModal, NRow, NSpace, NStatistic, NTag, type DataTableColumns, type DataTableProps, type DataTableRowData, type PaginationProps } from 'naive-ui'; import { NButton, NDataTable, NGrid, NGridItem, NModal, NSpace, NStatistic, NTag, type DataTableColumns, type DataTableProps, type DataTableRowData, type PaginationProps } from 'naive-ui';
import { computed, h, reactive, ref, toRefs } from 'vue'; import { computed, h, reactive, ref, toRefs } from 'vue';
interface Props { interface Props {
@@ -125,7 +125,7 @@ const resetFilterFields = () => {
filterFields.faultLevel_in = []; filterFields.faultLevel_in = [];
}; };
const tablePagination = reactive<PaginationProps>({ const pagination = reactive<PaginationProps>({
size: 'small', size: 'small',
showSizePicker: true, showSizePicker: true,
page: 1, page: 1,
@@ -135,27 +135,27 @@ const tablePagination = reactive<PaginationProps>({
return h('div', {}, { default: () => `${itemCount}` }); return h('div', {}, { default: () => `${itemCount}` });
}, },
onUpdatePage: (page: number) => { onUpdatePage: (page: number) => {
tablePagination.page = page; pagination.page = page;
getStaionAlarmList(); getTableData();
}, },
onUpdatePageSize: (pageSize: number) => { onUpdatePageSize: (pageSize: number) => {
tablePagination.pageSize = pageSize; pagination.pageSize = pageSize;
tablePagination.page = 1; pagination.page = 1;
getStaionAlarmList(); getTableData();
}, },
}); });
const tableData = ref<DataTableRowData[]>([]); const tableData = ref<DataTableRowData[]>([]);
const onAfterModalEnter = () => { const onAfterModalEnter = () => {
getStaionAlarmList(); getTableData();
}; };
const onAfterModalLeave = () => { const onAfterModalLeave = () => {
resetFilterFields(); resetFilterFields();
tablePagination.page = 1; pagination.page = 1;
tablePagination.pageSize = 10; pagination.pageSize = 10;
tablePagination.itemCount = 0; pagination.itemCount = 0;
tableData.value = []; tableData.value = [];
}; };
@@ -168,10 +168,10 @@ const onUpdateFilters: DataTableProps['onUpdateFilters'] = (filterState) => {
filterFields.alarmType_in = alarmTypeKeys; filterFields.alarmType_in = alarmTypeKeys;
const faultLevelVals = filterState['faultLevel']; const faultLevelVals = filterState['faultLevel'];
filterFields.faultLevel_in = faultLevelVals; filterFields.faultLevel_in = faultLevelVals;
getStaionAlarmList(); getTableData();
}; };
const { mutate: getStaionAlarmList, isPending: tableLoading } = useMutation({ const { mutate: getTableData, isPending: loading } = useMutation({
mutationFn: async () => { mutationFn: async () => {
const now = dayjs(); const now = dayjs();
const res = await pageDeviceAlarmLogApi( const res = await pageDeviceAlarmLogApi(
@@ -188,8 +188,8 @@ const { mutate: getStaionAlarmList, isPending: tableLoading } = useMutation({
createdTime_precisest: now.startOf('date').format('YYYY-MM-DD HH:mm:ss'), createdTime_precisest: now.startOf('date').format('YYYY-MM-DD HH:mm:ss'),
createdTime_preciseed: now.endOf('date').format('YYYY-MM-DD HH:mm:ss'), createdTime_preciseed: now.endOf('date').format('YYYY-MM-DD HH:mm:ss'),
}, },
current: tablePagination.page ?? 1, current: pagination.page ?? 1,
size: tablePagination.pageSize ?? 10, size: pagination.pageSize ?? 10,
order: 'descending', order: 'descending',
sort: 'id', sort: 'id',
}, },
@@ -201,8 +201,8 @@ const { mutate: getStaionAlarmList, isPending: tableLoading } = useMutation({
}, },
onSuccess: (res) => { onSuccess: (res) => {
const { records, size, total } = res; const { records, size, total } = res;
tablePagination.pageSize = parseInt(size); pagination.pageSize = parseInt(size);
tablePagination.itemCount = parseInt(total); pagination.itemCount = parseInt(total);
tableData.value = records; tableData.value = records;
}, },
onError: (error) => { onError: (error) => {
@@ -226,8 +226,8 @@ const { mutate: exportTableData, isPending: exporting } = useMutation({
createdTime_precisest: now.startOf('date').format('YYYY-MM-DD HH:mm:ss'), createdTime_precisest: now.startOf('date').format('YYYY-MM-DD HH:mm:ss'),
createdTime_preciseed: now.endOf('date').format('YYYY-MM-DD HH:mm:ss'), createdTime_preciseed: now.endOf('date').format('YYYY-MM-DD HH:mm:ss'),
}, },
current: tablePagination.page ?? 1, current: pagination.page ?? 1,
size: tablePagination.pageSize ?? 10, size: pagination.pageSize ?? 10,
order: 'descending', order: 'descending',
sort: 'id', sort: 'id',
}, },
@@ -264,11 +264,11 @@ const { mutate: exportTableData, isPending: exporting } = useMutation({
</div> </div>
<div v-else style="height: 100%; display: flex; flex-direction: column"> <div v-else style="height: 100%; display: flex; flex-direction: column">
<div style="flex: 0 0 auto; margin-bottom: 16px"> <div style="flex: 0 0 auto; margin-bottom: 16px">
<NRow> <NGrid cols="9">
<NCol :span="3" v-for="item in classifiedAlarmCounts" :key="item.label"> <NGridItem v-for="item in classifiedAlarmCounts" :key="item.label" span="1">
<NStatistic :label="item.label + '告警'" :value="item.count" /> <NStatistic :label="item.label + '告警'" :value="item.count" />
</NCol> </NGridItem>
</NRow> </NGrid>
</div> </div>
<div style="flex: 0 0 auto; display: flex; align-items: center; padding: 8px 0"> <div style="flex: 0 0 auto; display: flex; align-items: center; padding: 8px 0">
<div style="font-size: medium">今日设备告警列表</div> <div style="font-size: medium">今日设备告警列表</div>
@@ -278,10 +278,10 @@ const { mutate: exportTableData, isPending: exporting } = useMutation({
</div> </div>
<div style="flex: 1 1 auto; min-height: 0"> <div style="flex: 1 1 auto; min-height: 0">
<NDataTable <NDataTable
:loading="tableLoading" :loading="loading"
:columns="tableColumns" :columns="tableColumns"
:data="tableData" :data="tableData"
:pagination="tablePagination" :pagination="pagination"
:single-line="false" :single-line="false"
remote remote
flex-height flex-height

View File

@@ -1,13 +1,17 @@
<script setup lang="ts"> <script setup lang="ts">
import { exportIcmpApi } from '@/apis'; import { exportIcmpApi, type Station } from '@/apis';
import { DeviceType } from '@/enums'; import { DeviceType } from '@/enums';
import { useDeviceStore, useStationStore } from '@/stores'; import { useDeviceStore } from '@/stores';
import { downloadByData } from '@/utils'; import { downloadByData } from '@/utils';
import { useMutation } from '@tanstack/vue-query'; import { useMutation } from '@tanstack/vue-query';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { NButton, NFlex, NGrid, NGridItem, NModal, NRadio, NRadioGroup, NStatistic } from 'naive-ui'; import { NButton, NFlex, NGrid, NGridItem, NModal, NRadio, NRadioGroup, NStatistic } from 'naive-ui';
import { storeToRefs } from 'pinia'; import { storeToRefs } from 'pinia';
import { computed, ref } from 'vue'; import { computed, ref, toRefs } from 'vue';
const props = defineProps<{
stationList: Station[];
}>();
const show = defineModel<boolean>('show', { default: false }); const show = defineModel<boolean>('show', { default: false });
@@ -15,11 +19,11 @@ const emit = defineEmits<{
'after-leave': []; 'after-leave': [];
}>(); }>();
const stationStore = useStationStore();
const { stationList } = storeToRefs(stationStore);
const deviceStore = useDeviceStore(); const deviceStore = useDeviceStore();
const { lineDevices } = storeToRefs(deviceStore); const { lineDevices } = storeToRefs(deviceStore);
const { stationList } = toRefs(props);
const status = ref(''); const status = ref('');
const onAfterLeave = () => { const onAfterLeave = () => {

View File

@@ -4,3 +4,4 @@ export { default as DeviceParamsConfigModal } from './device-params-config-modal
export { default as OfflineDeviceDetailModal } from './offline-device-detail-modal.vue'; export { default as OfflineDeviceDetailModal } from './offline-device-detail-modal.vue';
export { default as RecordCheckExportModal } from './record-check-export-modal.vue'; export { default as RecordCheckExportModal } from './record-check-export-modal.vue';
export { default as StationCard } from './station-card.vue'; export { default as StationCard } from './station-card.vue';
export { default as SyncCameraResultModal } from './sync-camera-result-modal.vue';

View File

@@ -0,0 +1,88 @@
<script setup lang="ts">
import { watchDebounced } from '@vueuse/core';
import { NFlex, NIcon, NList, NListItem, NModal, NScrollbar, NStatistic, NText, NThing } from 'naive-ui';
import { computed, ref, toRefs } from 'vue';
import { useStationStore } from '@/stores';
import { storeToRefs } from 'pinia';
import type { Station, SyncCameraResult } from '@/apis';
import { DeleteFilled, EditFilled, PlusCircleFilled } from '@vicons/antd';
const props = defineProps<{
syncCameraResult: Record<Station['code'], SyncCameraResult>;
}>();
const emit = defineEmits<{
'after-leave': [];
}>();
const stationStore = useStationStore();
const { stationList } = storeToRefs(stationStore);
const { syncCameraResult } = toRefs(props);
const show = ref(false);
watchDebounced(
[syncCameraResult],
([result]) => {
show.value = Object.keys(result).length > 0;
},
{
debounce: 500,
deep: true,
},
);
const onAfterLeave = () => {
emit('after-leave');
};
const syncList = computed(() => {
return Object.values(syncCameraResult.value).map((sync) => {
const { stationCode, startTime, endTime, insertList, updateList, deleteList } = sync;
const stationName = stationList.value.find((station) => station.code === stationCode)?.name;
return { stationName, startTime, endTime, insertList, updateList, deleteList };
});
});
</script>
<template>
<NModal v-model:show="show" preset="card" title="摄像机同步结果" style="width: 600px" @after-leave="onAfterLeave">
<NScrollbar style="max-height: 400px">
<NList hoverable clickable>
<NListItem v-for="{ stationName, endTime, insertList, updateList, deleteList } in syncList" :key="stationName">
<NThing title-independent>
<template #header>
<NText strong>{{ stationName }}</NText>
</template>
<template #header-extra>
<NText depth="3"> {{ endTime }} 完成 </NText>
</template>
<NFlex justify="space-around" :size="24" style="margin-top: 8px">
<NStatistic label="新增">
<template #prefix>
<NIcon :component="PlusCircleFilled" />
</template>
{{ insertList.length }}
</NStatistic>
<NStatistic label="更新">
<template #prefix>
<NIcon :component="EditFilled" />
</template>
{{ updateList.length }}
</NStatistic>
<NStatistic label="删除">
<template #prefix>
<NIcon :component="DeleteFilled" />
</template>
{{ deleteList.length }}
</NStatistic>
</NFlex>
</NThing>
</NListItem>
</NList>
</NScrollbar>
</NModal>
</template>
<style scoped lang="scss"></style>

View File

@@ -8,7 +8,7 @@ export function useDeviceSelection() {
const router = useRouter(); const router = useRouter();
const selectedStationCode = ref<string>(); const selectedStationCode = ref<string>();
const selectedDeviceType = ref<DeviceTypeVal>(DeviceType.AlarmHost); const selectedDeviceType = ref<DeviceTypeVal>(DeviceType.Camera);
const selectedDevice = ref<NdmDeviceResultVO>(); const selectedDevice = ref<NdmDeviceResultVO>();
const initFromRoute = (lineDevices: LineDevices) => { const initFromRoute = (lineDevices: LineDevices) => {

View File

@@ -40,7 +40,7 @@ export function useLineAlarmsQuery() {
queryFn: async ({ signal }) => { queryFn: async ({ signal }) => {
console.time('useLineALarmCountsQuery'); console.time('useLineALarmCountsQuery');
for (const station of stationList.value) { for (const station of stationList.value) {
await getStationAlarmCounts({ station, signal }); await getStationAlarmCounts({ station, signal }).catch(() => {});
} }
console.timeEnd('useLineALarmCountsQuery'); console.timeEnd('useLineALarmCountsQuery');
// pollingStore.updateAlarmQueryUpdatedAt(); // pollingStore.updateAlarmQueryUpdatedAt();
@@ -78,7 +78,7 @@ function useStationAlarmCountsMutation() {
}, },
size: 50000, size: 50000,
current: 1, current: 1,
sort: 'id', sort: 'alarmDate',
order: 'descending', order: 'descending',
}, },
{ {

View File

@@ -47,7 +47,7 @@ export function useLineDevicesQuery() {
queryFn: async ({ signal }) => { queryFn: async ({ signal }) => {
console.time('useLineDevicesQuery'); console.time('useLineDevicesQuery');
for (const station of stationList.value) { for (const station of stationList.value) {
await getStationDevices({ station, signal }); await getStationDevices({ station, signal }).catch(() => {});
} }
console.timeEnd('useLineDevicesQuery'); console.timeEnd('useLineDevicesQuery');
// pollingStore.updateDeviceQueryUpdatedAt(); // pollingStore.updateDeviceQueryUpdatedAt();

View File

@@ -20,7 +20,7 @@ export function useLineStationsQuery() {
staleTime: getAppEnvConfig().requestInterval * 500, staleTime: getAppEnvConfig().requestInterval * 500,
queryFn: async ({ signal }) => { queryFn: async ({ signal }) => {
console.time('useStationListQuery'); console.time('useStationListQuery');
await getStationList({ signal }); await getStationList({ signal }).catch(() => {});
console.timeEnd('useStationListQuery'); console.timeEnd('useStationListQuery');
pollingStore.updateDeviceQueryStamp(); pollingStore.updateDeviceQueryStamp();
pollingStore.updateAlarmQueryStamp(); pollingStore.updateAlarmQueryStamp();

View File

@@ -1,5 +1,5 @@
import type { NdmDeviceAlarmLogResultVO } from '@/apis'; import type { NdmDeviceAlarmLogResultVO, Station, SyncCameraResult } from '@/apis';
import { TOPIC_DEVICE_ALARM } from '@/constants'; import { TOPIC_DEVICE_ALARM, SYNC_CAMERA_STATUS_TOPIC } from '@/constants';
import { useAlarmStore } from '@/stores'; import { useAlarmStore } from '@/stores';
import { Client } from '@stomp/stompjs'; import { Client } from '@stomp/stompjs';
import { destr } from 'destr'; import { destr } from 'destr';
@@ -19,6 +19,8 @@ export const useStompClient = () => {
const { unreadAlarmCount } = storeToRefs(alarmStore); const { unreadAlarmCount } = storeToRefs(alarmStore);
const stompClient = ref<Client | null>(null); const stompClient = ref<Client | null>(null);
const syncCameraResult = ref<Record<Station['code'], SyncCameraResult>>({});
onMounted(() => { onMounted(() => {
stompClient.value = new Client({ stompClient.value = new Client({
brokerURL: getBrokerUrl(), brokerURL: getBrokerUrl(),
@@ -33,10 +35,15 @@ export const useStompClient = () => {
unreadAlarmCount.value++; unreadAlarmCount.value++;
} }
}); });
stompClient.value?.subscribe(SYNC_CAMERA_STATUS_TOPIC, (message) => {
const { stationCode, startTime, endTime, insertList, updateList, deleteList } = destr<SyncCameraResult>(message.body);
syncCameraResult.value[stationCode] = { stationCode, startTime, endTime, insertList, updateList, deleteList };
});
}, },
onDisconnect: () => { onDisconnect: () => {
console.log('Stomp连接断开'); console.log('Stomp连接断开');
stompClient.value?.unsubscribe(TOPIC_DEVICE_ALARM); stompClient.value?.unsubscribe(TOPIC_DEVICE_ALARM);
stompClient.value?.unsubscribe(SYNC_CAMERA_STATUS_TOPIC);
}, },
onStompError: (frame) => { onStompError: (frame) => {
console.log('Stomp错误', frame); console.log('Stomp错误', frame);
@@ -57,5 +64,10 @@ export const useStompClient = () => {
return { return {
stompClient, stompClient,
syncCameraResult,
afterCheckSyncCamera: () => {
syncCameraResult.value = {};
},
}; };
}; };

View File

@@ -1 +1,3 @@
export const TOPIC_DEVICE_ALARM = '/topic/deviceAlarm'; export const TOPIC_DEVICE_ALARM = '/topic/deviceAlarm';
export const SYNC_CAMERA_STATUS_TOPIC = '/topic/syncCameraStatus';

View File

@@ -5,7 +5,7 @@ function renderIcon(icon: Component): () => VNode {
</script> </script>
<script setup lang="ts"> <script setup lang="ts">
import { SettingsDrawer } from '@/components'; import { SettingsDrawer, SyncCameraResultModal } from '@/components';
import { useStompClient } from '@/composables'; import { useStompClient } from '@/composables';
import { useLineStationsQuery } from '@/composables'; import { useLineStationsQuery } from '@/composables';
import { LINE_STATIONS_QUERY_KEY, LINE_DEVICES_QUERY_KEY, LINE_ALARMS_QUERY_KEY } from '@/constants'; import { LINE_STATIONS_QUERY_KEY, LINE_DEVICES_QUERY_KEY, LINE_ALARMS_QUERY_KEY } from '@/constants';
@@ -29,7 +29,7 @@ import { storeToRefs } from 'pinia';
import { computed, h, onBeforeMount, ref, watch, type Component, type VNode } from 'vue'; import { computed, h, onBeforeMount, ref, watch, type Component, type VNode } from 'vue';
import { RouterLink, useRoute, useRouter } from 'vue-router'; import { RouterLink, useRoute, useRouter } from 'vue-router';
useStompClient(); const { syncCameraResult, afterCheckSyncCamera } = useStompClient();
const userStore = useUserStore(); const userStore = useUserStore();
const { userInfo } = storeToRefs(userStore); const { userInfo } = storeToRefs(userStore);
@@ -205,7 +205,10 @@ const openSettingsDrawer = () => {
</NLayout> </NLayout>
</NLayout> </NLayout>
</NScrollbar> </NScrollbar>
<SettingsDrawer v-model:show="settingsDrawerShow" /> <SettingsDrawer v-model:show="settingsDrawerShow" />
<SyncCameraResultModal :sync-camera-result="syncCameraResult" @after-leave="afterCheckSyncCamera" />
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">

View File

@@ -342,6 +342,7 @@ const onClickQuery = () => {
tablePagination.pageSize = 10; tablePagination.pageSize = 10;
searchFieldsChanged.value = false; searchFieldsChanged.value = false;
} }
realtimeRefresh.value = false;
getTableData(); getTableData();
}; };

View File

@@ -3,7 +3,6 @@ import { syncCameraApi, syncNvrChannelsApi, type Station } from '@/apis';
import { DeviceAlarmDetailModal, DeviceExportModal, DeviceParamsConfigModal, OfflineDeviceDetailModal, RecordCheckExportModal, StationCard } from '@/components'; import { DeviceAlarmDetailModal, DeviceExportModal, DeviceParamsConfigModal, OfflineDeviceDetailModal, RecordCheckExportModal, StationCard } from '@/components';
import { useLineAlarmsQuery, useLineDevicesQuery } from '@/composables'; import { useLineAlarmsQuery, useLineDevicesQuery } from '@/composables';
import { useAlarmStore, useDeviceStore, usePollingStore, useSettingStore, useStationStore } from '@/stores'; import { useAlarmStore, useDeviceStore, usePollingStore, useSettingStore, useStationStore } from '@/stores';
import { sleep } from '@/utils';
import { useMutation } from '@tanstack/vue-query'; import { useMutation } from '@tanstack/vue-query';
import { NGrid, NGi, NScrollbar, NFlex, NButtonGroup, NButton, NCheckbox } from 'naive-ui'; import { NGrid, NGi, NScrollbar, NFlex, NButtonGroup, NButton, NCheckbox } from 'naive-ui';
import { storeToRefs } from 'pinia'; import { storeToRefs } from 'pinia';
@@ -38,9 +37,9 @@ const selectedAction = ref<Action>(null);
const showOperation = ref(false); const showOperation = ref(false);
const stationSelectable = ref(false); const stationSelectable = ref(false);
const stationSelection = ref<Record<Station['code'], boolean>>({}); const stationSelection = ref<Record<Station['code'], boolean>>({});
// TODO: 后期导出设备也会支持选择车站而不是目前的Modal交互
const showIcmpExportModal = ref(false); const showIcmpExportModal = ref(false);
const showRecordCheckExportModal = ref(false); const showRecordCheckExportModal = ref(false);
const onToggleSelectAll = (checked: boolean) => { const onToggleSelectAll = (checked: boolean) => {
if (!checked) { if (!checked) {
stationSelection.value = {}; stationSelection.value = {};
@@ -48,37 +47,51 @@ const onToggleSelectAll = (checked: boolean) => {
stationSelection.value = Object.fromEntries(stationList.value.map((station) => [station.code, true])); stationSelection.value = Object.fromEntries(stationList.value.map((station) => [station.code, true]));
} }
}; };
const onAction = (action: Action) => { const onAction = (action: Action) => {
selectedAction.value = action; selectedAction.value = action;
if (action === 'export-icmp') { if (action === null) return;
showIcmpExportModal.value = true; showOperation.value = true;
} else if (action === 'export-record') { stationSelectable.value = true;
showOperation.value = true;
stationSelectable.value = true;
} else if (action === 'sync-camera') {
showOperation.value = true;
stationSelectable.value = true;
} else if (action === 'sync-nvr') {
showOperation.value = true;
stationSelectable.value = true;
} else {
return;
}
}; };
const onCancel = () => {
selectedAction.value = null;
showOperation.value = false;
stationSelectable.value = false;
stationSelection.value = {};
};
const onFinish = onCancel;
const { mutate: syncCamera, isPending: cameraSyncing } = useMutation({ const { mutate: syncCamera, isPending: cameraSyncing } = useMutation({
mutationFn: async () => { mutationFn: async () => {
const stationCodes = Object.entries(stationSelection.value) const stationCodes = Object.entries(stationSelection.value)
.filter(([, selected]) => selected) .filter(([, selected]) => selected)
.map(([code]) => code); .map(([code]) => code);
for (const stationCode of stationCodes) { const results = await Promise.allSettled(stationCodes.map((stationCode) => syncCameraApi({ stationCode })));
await syncCameraApi({ stationCode }); return results.map((result, index) => ({ ...result, stationCode: stationCodes[index] }));
await sleep(5000);
}
}, },
onSuccess: () => { onSuccess: (results) => {
window.$message.success('摄像机同步成功'); const successCount = results.filter((result) => result.status === 'fulfilled').length;
pollingStore.disablePolling(); const failures = results.filter((result) => result.status === 'rejected');
pollingStore.enablePolling(); const failureCount = failures.length;
if (failureCount > 0) {
const failedStations = failures.map((f) => stationList.value.find((s) => s.code === f.stationCode)?.name).join('、');
if (successCount === 0) {
window.$message.error('摄像机同步全部失败');
window.$message.error(`${failedStations}`);
} else {
window.$message.warning(`摄像机同步完成:成功${successCount}个车站,失败${failureCount}个车站`);
window.$message.warning(`${failedStations}`);
}
} else {
window.$message.success('摄像机同步成功');
}
if (successCount > 0) {
pollingStore.disablePolling();
pollingStore.enablePolling();
}
onFinish(); onFinish();
}, },
onError: (error) => { onError: (error) => {
@@ -87,17 +100,31 @@ const { mutate: syncCamera, isPending: cameraSyncing } = useMutation({
onCancel(); onCancel();
}, },
}); });
const { mutate: syncNvrChannels, isPending: nvrChannelsSyncing } = useMutation({ const { mutate: syncNvrChannels, isPending: nvrChannelsSyncing } = useMutation({
mutationFn: async () => { mutationFn: async () => {
const stationCodes = Object.entries(stationSelection.value) const stationCodes = Object.entries(stationSelection.value)
.filter(([, selected]) => selected) .filter(([, selected]) => selected)
.map(([code]) => code); .map(([code]) => code);
for (const stationCode of stationCodes) { const results = await Promise.allSettled(stationCodes.map((stationCode) => syncNvrChannelsApi({ stationCode })));
await syncNvrChannelsApi({ stationCode }); return results.map((result, index) => ({ ...result, stationCode: stationCodes[index] }));
}
}, },
onSuccess: () => { onSuccess: (results) => {
window.$message.info('正在同步录像机通道,可能需要一些时间'); const successCount = results.filter((result) => result.status === 'fulfilled').length;
const failures = results.filter((result) => result.status === 'rejected');
const failureCount = failures.length;
if (failureCount > 0) {
const failedStations = failures.map((f) => stationList.value.find((s) => s.code === f.stationCode)?.name).join('、');
if (successCount === 0) {
window.$message.error('录像机通道同步全部失败');
window.$message.error(`${failedStations}`);
} else {
window.$message.warning(`录像机通道同步完成:成功${successCount}个车站,失败${failureCount}个车站`);
window.$message.warning(`${failedStations}`);
}
} else {
window.$message.success('录像机通道同步成功');
}
onFinish(); onFinish();
}, },
onError: (error) => { onError: (error) => {
@@ -106,23 +133,31 @@ const { mutate: syncNvrChannels, isPending: nvrChannelsSyncing } = useMutation({
onCancel(); onCancel();
}, },
}); });
const confirming = computed(() => cameraSyncing.value || nvrChannelsSyncing.value); const confirming = computed(() => cameraSyncing.value || nvrChannelsSyncing.value);
const onConfirm = async () => { const onConfirm = async () => {
const noStationSelected = !Object.values(stationSelection.value).some((selected) => selected);
if (selectedAction.value === 'export-icmp') { if (selectedAction.value === 'export-icmp') {
if (noStationSelected) {
window.$message.warning('请选择要导出设备状态的车站');
return;
}
showIcmpExportModal.value = true;
} else if (selectedAction.value === 'export-record') { } else if (selectedAction.value === 'export-record') {
if (!Object.values(stationSelection.value).some((selected) => selected)) { if (noStationSelected) {
window.$message.warning('请选择要导出录像诊断的车站'); window.$message.warning('请选择要导出录像诊断的车站');
return; return;
} }
showRecordCheckExportModal.value = true; showRecordCheckExportModal.value = true;
} else if (selectedAction.value === 'sync-camera') { } else if (selectedAction.value === 'sync-camera') {
if (!Object.values(stationSelection.value).some((selected) => selected)) { if (noStationSelected) {
window.$message.warning('请选择要同步摄像机的车站'); window.$message.warning('请选择要同步摄像机的车站');
return; return;
} }
syncCamera(); syncCamera();
} else if (selectedAction.value === 'sync-nvr') { } else if (selectedAction.value === 'sync-nvr') {
if (!Object.values(stationSelection.value).some((selected) => selected)) { if (noStationSelected) {
window.$message.warning('请选择要同步录像机通道的车站'); window.$message.warning('请选择要同步录像机通道的车站');
return; return;
} }
@@ -131,13 +166,6 @@ const onConfirm = async () => {
return; return;
} }
}; };
const onCancel = () => {
selectedAction.value = null;
showOperation.value = false;
stationSelectable.value = false;
stationSelection.value = {};
};
const onFinish = onCancel;
// 车站卡片的事件 // 车站卡片的事件
const selectedStation = ref<Station>(); const selectedStation = ref<Station>();
@@ -198,7 +226,7 @@ const openDeviceParamsConfigModal = (station: Station) => {
<!-- 设备配置面板对话框 --> <!-- 设备配置面板对话框 -->
<DeviceParamsConfigModal v-model:show="showDeviceParamsConfigModal" :station="selectedStation" /> <DeviceParamsConfigModal v-model:show="showDeviceParamsConfigModal" :station="selectedStation" />
<!-- 设备状态导出对话框 --> <!-- 设备状态导出对话框 -->
<DeviceExportModal v-model:show="showIcmpExportModal" @after-leave="onFinish" /> <DeviceExportModal v-model:show="showIcmpExportModal" :station-list="stationList.filter((station) => stationSelection[station.code])" @after-leave="onFinish" />
<!-- 录像诊断导出对话框 --> <!-- 录像诊断导出对话框 -->
<RecordCheckExportModal v-model:show="showRecordCheckExportModal" :stations="stationList.filter((station) => stationSelection[station.code])" @after-leave="onFinish" /> <RecordCheckExportModal v-model:show="showRecordCheckExportModal" :stations="stationList.filter((station) => stationSelection[station.code])" @after-leave="onFinish" />
</template> </template>

View File

@@ -11,6 +11,36 @@ type ProxyItem = {
rewrite?: [string, string]; rewrite?: [string, string];
}; };
const line04ApiProxyList: ProxyItem[] = [
{ key: '/minio', target: 'http://10.15.128.10:9000', rewrite: ['/minio', ''] },
{ key: '/api', target: 'http://10.15.128.10:18760' },
{ key: '/0475/api', target: 'http://10.15.128.10:18760', rewrite: ['/0475/api', '/api'] },
{ key: '/0401/api', target: 'http://10.15.129.10:18760', rewrite: ['/0401/api', '/api'] },
{ key: '/0402/api', target: 'http://10.15.131.10:18760', rewrite: ['/0402/api', '/api'] },
{ key: '/0403/api', target: 'http://10.15.133.10:18760', rewrite: ['/0403/api', '/api'] },
{ key: '/0404/api', target: 'http://10.15.135.10:18760', rewrite: ['/0404/api', '/api'] },
{ key: '/0405/api', target: 'http://10.15.137.10:18760', rewrite: ['/0405/api', '/api'] },
{ key: '/0406/api', target: 'http://10.15.139.10:18760', rewrite: ['/0406/api', '/api'] },
{ key: '/0407/api', target: 'http://10.15.141.10:18760', rewrite: ['/0407/api', '/api'] },
{ key: '/0408/api', target: 'http://10.15.143.10:18760', rewrite: ['/0408/api', '/api'] },
{ key: '/0409/api', target: 'http://10.15.145.10:18760', rewrite: ['/0409/api', '/api'] },
{ key: '/0410/api', target: 'http://10.15.147.10:18760', rewrite: ['/0410/api', '/api'] },
{ key: '/0411/api', target: 'http://10.15.149.10:18760', rewrite: ['/0411/api', '/api'] },
{ key: '/0412/api', target: 'http://10.15.151.10:18760', rewrite: ['/0412/api', '/api'] },
{ key: '/0413/api', target: 'http://10.15.153.10:18760', rewrite: ['/0413/api', '/api'] },
{ key: '/0414/api', target: 'http://10.15.155.10:18760', rewrite: ['/0414/api', '/api'] },
{ key: '/0415/api', target: 'http://10.15.157.10:18760', rewrite: ['/0415/api', '/api'] },
{ key: '/0416/api', target: 'http://10.15.159.10:18760', rewrite: ['/0416/api', '/api'] },
{ key: '/0417/api', target: 'http://10.15.161.10:18760', rewrite: ['/0417/api', '/api'] },
{ key: '/0418/api', target: 'http://10.15.163.10:18760', rewrite: ['/0418/api', '/api'] },
{ key: '/0419/api', target: 'http://10.15.165.10:18760', rewrite: ['/0419/api', '/api'] },
{ key: '/0420/api', target: 'http://10.15.167.10:18760', rewrite: ['/0420/api', '/api'] },
];
const line10ApiProxyList: ProxyItem[] = [ const line10ApiProxyList: ProxyItem[] = [
{ key: '/minio', target: 'http://10.18.128.10:9000', rewrite: ['/minio', ''] }, { key: '/minio', target: 'http://10.18.128.10:9000', rewrite: ['/minio', ''] },
@@ -54,12 +84,14 @@ const line10ApiProxyList: ProxyItem[] = [
{ key: '/1031/api', target: 'http://10.18.189.10:18760', rewrite: ['/1031/api', '/api'] }, { key: '/1031/api', target: 'http://10.18.189.10:18760', rewrite: ['/1031/api', '/api'] },
{ key: '/1032/api', target: 'http://10.18.244.10:18760', rewrite: ['/1032/api', '/api'] }, { key: '/1032/api', target: 'http://10.18.244.10:18760', rewrite: ['/1032/api', '/api'] },
]; ];
const apiProxyList: ProxyItem[] = [ const apiProxyList: ProxyItem[] = [
// // ...line04ApiProxyList,
...line10ApiProxyList, ...line10ApiProxyList,
]; ];
const wsProxyList: ProxyItem[] = [ const wsProxyList: ProxyItem[] = [
// //
// { key: '/ws', target: 'ws://10.15.128.10:18103' },
{ key: '/ws', target: 'ws://10.18.128.10:18103' }, { key: '/ws', target: 'ws://10.18.128.10:18103' },
]; ];