skycurtain/ndm-web-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: tryGetDeviceTypeVal

Browse Source
This commit is contained in:
yangsy
2025-09-30 15:09:12 +08:00
parent 97bf9855c7
commit d0adb869da
11 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/dashboard-page/device-alarm-detail-modal.vue
View File

@@ -5,7 +5,7 @@ import { ndmDeviceAlarmLogDefaultExportByTemplate, postNdmDeviceAlarmLogPage } f
import type { StationAlarmCounts } from '@/composables/query';
import { FaultLevel } from '@/enums/fault-level';
import { AlarmType } from '@/enums/alarm-type';
import { DeviceType, DeviceTypeCode, DeviceTypeName, getDeviceTypeVal, type DeviceTypeVal } from '@/enums/device-type';
import { DeviceType, DeviceTypeCode, DeviceTypeName, tryGetDeviceTypeVal, type DeviceTypeVal } from '@/enums/device-type';
import { useQueryControlStore } from '@/stores/query-control';
import { downloadByData } from '@/utils/download';
import { useMutation } from '@tanstack/vue-query';
@@ -57,7 +57,9 @@ const tableColumns: DataTableColumns<NdmDeviceAlarmLogResultVO> = [
title: '设备类型',
key: 'deviceType',
render: (rowData) => {
return DeviceTypeName[getDeviceTypeVal(rowData.deviceType)];
const deviceTypeVal = tryGetDeviceTypeVal(rowData.deviceType);
if (!deviceTypeVal) return '-';
return DeviceTypeName[deviceTypeVal];
},
filter: true,
filterMultiple: true,

6
src/components/dashboard-page/offline-device-detail-modal.vue
View File

@@ -2,7 +2,7 @@
import type { Station } from '@/apis/domains';
import type { NdmDeviceVO } from '@/apis/models';
import type { StationDevices } from '@/composables/query';
import { DeviceType, DeviceTypeName, getDeviceTypeVal } from '@/enums/device-type';
import { DeviceType, DeviceTypeName, tryGetDeviceTypeVal } from '@/enums/device-type';
import { useQueryControlStore } from '@/stores/query-control';
import { NButton, NCol, NInput, NModal, NRow, NStatistic, NTree } from 'naive-ui';
import type { TreeOption, TreeOverrideNodeClickBehavior, TreeProps } from 'naive-ui';
@@ -83,7 +83,7 @@ const treeData = computed<TreeOption[]>(() => {
path: '/device',
query: {
stationCode: station.value?.code,
deviceType: getDeviceTypeVal(dev.deviceType),
deviceType: tryGetDeviceTypeVal(dev.deviceType),
deviceDBId: dev.id,
from: route.path,
},
@@ -117,7 +117,7 @@ const nodeProps: TreeProps['nodeProps'] = ({ option }) => {
path: '/device',
query: {
stationCode: station.value?.code,
deviceType: getDeviceTypeVal(device.deviceType),
deviceType: tryGetDeviceTypeVal(device.deviceType),
deviceDBId: device.id,
from: route.path,
},

11
src/components/device-page/device-card/current-diag-card/device-header-card.vue
View File

@@ -1,6 +1,6 @@
<script setup lang="ts">
import type { NdmDeviceResultVO } from '@/apis/models';
import { DeviceType, DeviceTypeName, getDeviceTypeVal, type DeviceTypeVal } from '@/enums/device-type';
import { DeviceType, DeviceTypeName, tryGetDeviceTypeVal, type DeviceTypeVal } from '@/enums/device-type';
import { NButton, NCard, NFlex, NTag } from 'naive-ui';
import { computed, toRefs } from 'vue';
@@ -12,7 +12,11 @@ const props = defineProps<{
const { device } = toRefs(props);
const type = computed(() => DeviceTypeName[getDeviceTypeVal(device.value.deviceType)]);
const type = computed(() => {
const deviceTypeVal = tryGetDeviceTypeVal(device.value.deviceType);
if (!deviceTypeVal) return '-';
return DeviceTypeName[deviceTypeVal];
});
const name = computed(() => device.value.name ?? '-');
const ipAddr = computed(() => device.value.ipAddress ?? '-');
const gbCode = computed(() => Reflect.get(device.value, 'gbCode') as string | undefined);
@@ -20,7 +24,8 @@ const status = computed(() => device.value.deviceStatus);
const canOpenMgmtPage = computed(() => {
const mgmtableDeviceTypes: DeviceTypeVal[] = [DeviceType['Camera'], DeviceType['Decoder'], DeviceType['Switch']];
return mgmtableDeviceTypes.includes(getDeviceTypeVal(device.value.deviceType));
const deviceTypeVal = tryGetDeviceTypeVal(device.value.deviceType);
return deviceTypeVal && mgmtableDeviceTypes.includes(deviceTypeVal);
});
const onClickOpenMgmtPage = () => {

6
src/components/device-page/device-card/history-diag-card/device-alarm-history-diag-card.vue
View File

@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { NdmDeviceAlarmLogResultVO, NdmDeviceResultVO, NdmNvrResultVO, PageParams } from '@/apis/models';
import { postNdmDeviceAlarmLogPage } from '@/apis/requests';
import { DeviceType, getDeviceTypeVal } from '@/enums/device-type';
import { DeviceType, tryGetDeviceTypeVal } from '@/enums/device-type';
import { useMutation } from '@tanstack/vue-query';
import dayjs from 'dayjs';
import { NButton, NCard, NDataTable, NPopover, NScrollbar, type DataTableColumns, type DataTableRowData, type DatePickerProps, type PaginationProps } from 'naive-ui';
@@ -33,7 +33,9 @@ const tableColumns: DataTableColumns<NdmDeviceAlarmLogResultVO> = [
key: 'faultDescription',
render: (rowData) => {
const isNvrCluster = (ndmDevice: NdmDeviceResultVO) => {
const isNvr = getDeviceTypeVal(ndmDevice.deviceType) === DeviceType.Nvr;
const deviceTypeVal = tryGetDeviceTypeVal(ndmDevice.deviceType);
if (!deviceTypeVal) return false;
const isNvr = deviceTypeVal === DeviceType.Nvr;
if (!isNvr) return false;
const maybeNvrCluster = ndmDevice as NdmNvrResultVO;
return !!maybeNvrCluster.clusterList?.trim() && maybeNvrCluster.clusterList !== maybeNvrCluster.ipAddress;

6
src/components/device-page/device-renderer.vue
View File

@@ -1,6 +1,6 @@
<script setup lang="ts">
import type { NdmDeviceResultVO } from '@/apis/models';
import { DeviceType, getDeviceTypeVal, type DeviceTypeVal } from '@/enums/device-type';
import { DeviceType, tryGetDeviceTypeVal, type DeviceTypeVal } from '@/enums/device-type';
import { computed, toRefs } from 'vue';
import CameraCard from './device-card/camera-card.vue';
@@ -18,7 +18,7 @@ const props = defineProps<{
const { stationCode, device } = toRefs(props);
const deviceTypeVal = computed(() => getDeviceTypeVal(device.value.deviceType));
const deviceTypeVal = computed(() => tryGetDeviceTypeVal(device.value.deviceType));
</script>
<template>
@@ -37,7 +37,7 @@ const deviceTypeVal = computed(() => getDeviceTypeVal(device.value.deviceType));
<template v-if="deviceTypeVal === DeviceType.SecurityBox">
<SecurityBoxCard :station-code="stationCode" :ndm-security-box="device" />
</template>
<template v-if="([DeviceType.MediaServer, DeviceType.VideoServer] as DeviceTypeVal[]).includes(deviceTypeVal)">
<template v-if="!!deviceTypeVal && ([DeviceType.MediaServer, DeviceType.VideoServer] as DeviceTypeVal[]).includes(deviceTypeVal)">
<ServerCard :station-code="stationCode" :ndm-server="device" />
</template>
<template v-if="deviceTypeVal === DeviceType.Switch">

7
src/components/device-page/device-tree.vue
View File

@@ -12,7 +12,7 @@ const deviceTabPanes = Object.keys(DeviceType).map((key) => {
import type { Station } from '@/apis/domains';
import type { NdmDeviceResultVO, NdmNvrResultVO } from '@/apis/models';
import type { LineDevices } from '@/composables/query';
import { DeviceType, DeviceTypeName, getDeviceTypeVal, type DeviceTypeKey, type DeviceTypeVal } from '@/enums/device-type';
import { DeviceType, DeviceTypeName, tryGetDeviceTypeVal, type DeviceTypeKey, type DeviceTypeVal } from '@/enums/device-type';
import { destr } from 'destr';
import {
NButton,
@@ -216,8 +216,9 @@ const onClickLocateDeviceTree = () => {
const stationCode = selectedStationCode.value;
const device = selectedDevice.value;
if (!stationCode || !device?.id) return;
if (device.deviceType) {
activeTab.value = getDeviceTypeVal(device.deviceType);
const deviceTypeVal = tryGetDeviceTypeVal(device.deviceType);
if (!!deviceTypeVal) {
activeTab.value = deviceTypeVal;
}
const expanded = [stationCode];