Merge branch 'main_dev' into 'main'

Main dev

See merge request yunteng/thingskit-scada!240

@@ -40,5 +40,7 @@ export interface AlarmListItemType {
   organizationId: string
   organizationId: string
   organizationName: string
   organizationName: string
   deviceAlias: string
   deviceAlias: string
+  acknowledged: boolean
+  cleared: boolean
 }
 }
 
 

@@ -44,13 +44,13 @@ const initFetchAlarmList = async () => {
   const { startTime, endTime, deviceId, interval, autoPlay, polling }
   const { startTime, endTime, deviceId, interval, autoPlay, polling }
     = alarmListOption
     = alarmListOption
 
 
-  const resp = (await fetchAlarmList({
+  const resp = await fetchAlarmList({
     startTime,
     startTime,
     endTime,
     endTime,
     deviceIds: deviceId,
     deviceIds: deviceId,
     page: 1,
     page: 1,
     pageSize: 30,
     pageSize: 30,
-  }))
+  })
 
 
   initOptions.alarmList = resp.items || []
   initOptions.alarmList = resp.items || []
   initOptions.interval = interval * 1000 || 0
   initOptions.interval = interval * 1000 || 0
@@ -81,16 +81,55 @@ onMounted(async () => {
     })
     })
   }
   }
 })
 })
+
+/**
+ * 之前返回的有status，是通过status判断告警级别的
+ * 现在没有返回此字段，是通过acknowledged和cleared来判断告警级别
+ */
+const formatAlarmStatusName = (acknowledged: boolean, cleared: boolean) => {
+  const value = {
+    text: '',
+    color: '',
+  }
+  if (!acknowledged && !cleared) {
+    value.text = AlarmStatusNameEnum.ACTIVE_UNACK
+    value.color = AlarmStatusColorEnum.ACTIVE_UNACK
+  }
+  else if (!acknowledged && cleared) {
+    value.text = AlarmStatusNameEnum.CLEARED_UNACK
+    value.color = AlarmStatusColorEnum.CLEARED_UNACK
+  }
+  else if (acknowledged && cleared) {
+    value.text = AlarmStatusNameEnum.CLEARED_ACK
+    value.color = AlarmStatusColorEnum.CLEARED_ACK
+  }
+  else {
+    value.text = AlarmStatusNameEnum.ACTIVE_ACK
+    value.color = AlarmStatusColorEnum.ACTIVE_ACK
+  }
+  return value
+}
+//
 </script>
 </script>
 
 
 <template>
 <template>
-  <div class="seamless-scroll w-full h-full flex justify-center items-center overflow-y-scroll">
+  <div
+    class="seamless-scroll w-full h-full flex justify-center items-center overflow-y-scroll"
+  >
     <ScrollList
     <ScrollList
       v-if="initOptions.alarmList.length"
       v-if="initOptions.alarmList.length"
-      v-model="initOptions.scroll" :single-wait-time="initOptions.interval" :single-height="58" :list="initOptions.alarmList"
-      :delay="10" hover
+      v-model="initOptions.scroll"
+      :single-wait-time="initOptions.interval"
+      :single-height="58"
+      :list="initOptions.alarmList"
+      :delay="10"
+      hover
     >
     >
-      <div v-for="(item, index) in initOptions.alarmList" :key="index" class="flex flex-col items-start p-2 border-gray-600 border-t border-solid border-b-transparent border-l-transparent border-r-transparent">
+      <div
+        v-for="(item, index) in initOptions.alarmList"
+        :key="index"
+        class="flex flex-col items-start p-2 border-gray-600 border-t border-solid border-b-transparent border-l-transparent border-r-transparent"
+      >
         <div class="text-xs mb-2">
         <div class="text-xs mb-2">
           <span>设备:</span>
           <span>设备:</span>
           <span class="ml-1">{{ item.deviceAlias || item.deviceName }}</span>
           <span class="ml-1">{{ item.deviceAlias || item.deviceName }}</span>
@@ -98,8 +137,13 @@ onMounted(async () => {
         <div class="flex items-center justify-between -mt-2 text-xs">
         <div class="flex items-center justify-between -mt-2 text-xs">
           <span>时间:</span>
           <span>时间:</span>
           <span class="ml-1">{{ item.startTs }}</span>
           <span class="ml-1">{{ item.startTs }}</span>
-          <Tag class="ml-2" :color="AlarmStatusColorEnum[item.status]">
-            {{ AlarmStatusNameEnum[item.status] }}
+          <Tag
+            class="ml-2"
+            :color="
+              formatAlarmStatusName(item.acknowledged, item.cleared)?.color
+            "
+          >
+            {{ formatAlarmStatusName(item.acknowledged, item.cleared)?.text }}
           </Tag>
           </Tag>
         </div>
         </div>
       </div>
       </div>
@@ -110,10 +154,8 @@ onMounted(async () => {
 
 
 <style scoped lang="less">
 <style scoped lang="less">
 .seamless-scroll {
 .seamless-scroll {
-
   ::-webkit-scrollbar {
   ::-webkit-scrollbar {
     display: none;
     display: none;
-
   }
   }
 }
 }
 </style>
 </style>