From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop
---
src/components/devices/device-hms/DeviceHmsDrawer.vue | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/components/devices/device-hms/DeviceHmsDrawer.vue b/src/components/devices/device-hms/DeviceHmsDrawer.vue
index a553ef7..808b7cb 100644
--- a/src/components/devices/device-hms/DeviceHmsDrawer.vue
+++ b/src/components/devices/device-hms/DeviceHmsDrawer.vue
@@ -67,7 +67,12 @@
</template>
<template v-for="col in ['code', 'message']" #[col]="{ text }" :key="col">
<a-tooltip :title="text">
- <span>{{ text }}</span>
+ <div >{{ text }}</div>
+ </a-tooltip>
+ </template>
+ <template #domain="{text}">
+ <a-tooltip :title="EDeviceTypeName[text]">
+ <div >{{ EDeviceTypeName[text] }}</div>
</a-tooltip>
</template>
</a-table>
@@ -77,7 +82,7 @@
<!-- 暂时只抽取该组件 -->
<script lang="ts" setup>
-import { watchEffect, reactive, ref, defineProps, defineEmits } from 'vue'
+import { watchEffect, reactive, ref, defineProps, defineEmits, watch } from 'vue'
import { getDeviceHms, HmsQueryBody } from '/@/api/manage'
import moment, { Moment } from 'moment'
import { ColumnProps, TableState } from 'ant-design-vue/lib/table/interface'
@@ -95,7 +100,7 @@
// 健康状态
const sVisible = ref(false)
-watchEffect(() => {
+watch(props, () => {
sVisible.value = props.visible
// 显示弹框时，获取设备hms信息
if (props.visible) {
@@ -117,9 +122,10 @@
const hmsColumns: ColumnProps[] = [
{ title: 'Alarm Begin | End Time', dataIndex: 'create_time', width: '25%', className: 'titleStyle', slots: { customRender: 'time' } },
{ title: 'Level', dataIndex: 'level', width: '120px', className: 'titleStyle', slots: { customRender: 'level' } },
- { title: 'Device', dataIndex: 'domain', width: '12%', className: 'titleStyle' },
- { title: 'Error Code', dataIndex: 'key', width: '20%', className: 'titleStyle', slots: { customRender: 'code' } },
+ { title: 'Device', dataIndex: 'domain', width: '12%', className: 'titleStyle', slots: { customRender: 'domain' } },
+ { title: 'Error Code', dataIndex: 'key', width: '20%', className: 'titleStyle', ellipsis: true, slots: { customRender: 'code' } },
{ title: 'Hms Message', dataIndex: 'message_en', className: 'titleStyle', ellipsis: true, slots: { customRender: 'message' } },
+ { title: 'Hms Message', dataIndex: 'message_zh', className: 'titleStyle', ellipsis: true, slots: { customRender: 'message' } },
]
interface DeviceHmsData {
@@ -174,7 +180,7 @@
language: 'en',
begin_time: new Date(new Date().setDate(new Date().getDate() - 7)).setHours(0, 0, 0, 0),
end_time: new Date().setHours(23, 59, 59, 999),
- domain: '',
+ domain: -1,
level: '',
message: ''
})
@@ -198,12 +204,12 @@
const deviceTypes = [
{
label: 'All',
- value: ''
+ value: -1
}, {
- label: EDeviceTypeName.Aircraft,
+ label: EDeviceTypeName[EDeviceTypeName.Aircraft],
value: EDeviceTypeName.Aircraft
}, {
- label: EDeviceTypeName.Dock,
+ label: EDeviceTypeName[EDeviceTypeName.Dock],
value: EDeviceTypeName.Dock
}
]
@@ -250,7 +256,7 @@
getHms()
}
-function onDeviceTypeSelect (val: string) {
+function onDeviceTypeSelect (val: number) {
param.sns = [param.device_sn, param.children_sn]
if (val === EDeviceTypeName.Dock) {
param.sns = [param.device_sn, '']
--
Gitblit v1.9.3