From 129c9085d56050836e3a8ed6c28ba4d63c86c0c2 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 21 Nov 2023 15:16:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=91=8A=E8=AD=A6Severity=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faultManage/active-alarm/index.vue  |  9 ++++-----
 src/views/faultManage/history-alarm/index.vue | 15 +++++++--------
 2 files changed, 11 insertions(+), 13 deletions(-)

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