OMC/fe.ems.vue3
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 告警Severity字典显示

Browse Source
This commit is contained in:
TsMask
2023-11-21 15:16:09 +08:00
parent 3bc4fafde7
commit 129c9085d5
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/faultManage/active-alarm/index.vue
View File

@@ -5,7 +5,6 @@ import { message, Modal } from 'ant-design-vue/lib';
import { SizeType } from 'ant-design-vue/lib/config-provider'; import { SizeType } from 'ant-design-vue/lib/config-provider';
import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface'; import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
import { ColumnsType } from 'ant-design-vue/lib/table'; import { ColumnsType } from 'ant-design-vue/lib/table';
import useUserStore from '@/store/modules/user';
import { import {
listAct, listAct,
updateConfirm, updateConfirm,
@@ -699,7 +698,6 @@ function fnGetList(pageNum?: number) {
}); });
} }
const profile = useUserStore().profile;
onMounted(() => { onMounted(() => {
// 初始字典数据 // 初始字典数据
Promise.allSettled([ Promise.allSettled([
@@ -956,9 +954,10 @@ onMounted(() => {
> >
<template #bodyCell="{ column, record }"> <template #bodyCell="{ column, record }">
<template v-if="column.key === 'origSeverity'"> <template v-if="column.key === 'origSeverity'">
<a-tag :color="profile.color[record.origSeverity.toLowerCase()]"> <DictTag
{{ record.origSeverity }} :options="dict.activeAlarmSeverity"
</a-tag> :value="record.origSeverity"
/>
</template> </template>
<template v-if="column.key === 'alarmType'"> <template v-if="column.key === 'alarmType'">
<DictTag <DictTag

15
src/views/faultManage/history-alarm/index.vue
View File

@@ -5,7 +5,6 @@ import { message, Modal } from 'ant-design-vue/lib';
import { SizeType } from 'ant-design-vue/lib/config-provider'; import { SizeType } from 'ant-design-vue/lib/config-provider';
import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface'; import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
import { ColumnsType } from 'ant-design-vue/lib/table'; import { ColumnsType } from 'ant-design-vue/lib/table';
import useUserStore from '@/store/modules/user';
import { import {
listAct, listAct,
updateConfirm, updateConfirm,
@@ -171,7 +170,7 @@ let tableColumns: ColumnsType = [
title: t('views.faultManage.activeAlarm.alarmType'), title: t('views.faultManage.activeAlarm.alarmType'),
dataIndex: 'alarmType', dataIndex: 'alarmType',
key: 'alarmType', key: 'alarmType',
align: 'left', align: 'left',
width: 5, width: 5,
}, },
{ {
@@ -190,7 +189,7 @@ let tableColumns: ColumnsType = [
title: t('views.faultManage.activeAlarm.clearType'), title: t('views.faultManage.activeAlarm.clearType'),
dataIndex: 'clearType', dataIndex: 'clearType',
key: 'clearType', key: 'clearType',
align: 'left', align: 'left',
width: 5, width: 5,
}, },
{ {
@@ -204,7 +203,7 @@ let tableColumns: ColumnsType = [
title: t('views.faultManage.activeAlarm.ackState'), title: t('views.faultManage.activeAlarm.ackState'),
dataIndex: 'ackState', dataIndex: 'ackState',
key: 'ackState', key: 'ackState',
align: 'left', align: 'left',
width: 5, width: 5,
}, },
{ {
@@ -492,7 +491,6 @@ function fnGetList(pageNum?: number) {
}); });
} }
const profile = useUserStore().profile;
onMounted(() => { onMounted(() => {
// 初始字典数据 // 初始字典数据
Promise.allSettled([ Promise.allSettled([
@@ -730,9 +728,10 @@ onMounted(() => {
> >
<template #bodyCell="{ column, record }"> <template #bodyCell="{ column, record }">
<template v-if="column.key === 'origSeverity'"> <template v-if="column.key === 'origSeverity'">
<a-tag :color="profile.color[record.origSeverity.toLowerCase()]"> <DictTag
{{ record.origSeverity }} :options="dict.activeAlarmSeverity"
</a-tag> :value="record.origSeverity"
/>
</template> </template>
<template v-if="column.key === 'alarmType'"> <template v-if="column.key === 'alarmType'">
<DictTag <DictTag