From 581a1c0ebf94eaea3763311d9097cbc0d11d95da Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 14 Jan 2026 15:03:20 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/views/recordManage/alarmRecords/index.vue | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/applications/drone-command/src/views/recordManage/alarmRecords/index.vue b/applications/drone-command/src/views/recordManage/alarmRecords/index.vue
index f730a95..ce8dda2 100644
--- a/applications/drone-command/src/views/recordManage/alarmRecords/index.vue
+++ b/applications/drone-command/src/views/recordManage/alarmRecords/index.vue
@@ -64,10 +64,10 @@
{{ getDeviceTypeName(row.droneType) }}
</template>
</el-table-column>
- <el-table-column prop="deviceCode" label="设备编码" />
+ <el-table-column prop="deviceSn" label="设备编码" />
<el-table-column label="设备状态">
<template v-slot="{ row }">
- {{ getDeviceStatus(row) }}
+ {{ getDictLabel(row.deviceStatus, dictObj.deviceStatus) }}
</template>
</el-table-column>
</el-table>
@@ -90,7 +90,7 @@
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { exportFwDroneAlarmRecordApi, fwDroneAlarmRecordPageApi } from './fwDroneAlarmRecord'
import FormDiaLog from './FormDiaLog.vue'
-import { blobDownload, dateRangeFormat } from '@ztzf/utils'
+import { blobDownload, dateRangeFormat, getDictLabel } from '@ztzf/utils'
const initSearchParams = () => ({
droneName: '', // 无人机名称
@@ -145,11 +145,6 @@
getList()
}
-// 查看
-function handleView(row) {
- dialogRef.value?.open({ mode: 'view', row: { ...row } })
-}
-
function exportFile() {
exportLoading.value = true
exportFwDroneAlarmRecordApi()
@@ -161,17 +156,13 @@
})
}
-function getDeviceStatus(row) {
- return row.deviceStatus ?? row.status ?? '-'
-}
-
function getDeviceTypeName(value) {
return deviceTypeMap.value.get(value) || value || '-'
}
// 获取字典
function getDictList() {
- getDictionaryByCode('deviceType').then(res => {
+ getDictionaryByCode('deviceType,deviceStatus').then(res => {
dictObj.value = res.data.data
})
}
--
Gitblit v1.9.3