master: Fixed 修复报警归档

.eslintignore

@@ -1,5 +1,5 @@
 /*.json
 /*.js
-src/assets
+src/assets/**/*
 node_modules
 dist

src/views/preview-list/components/alarm-all.vue

@@ -103,7 +103,7 @@
                 background:
                   record.AlarmArchiving == '0'
                     ? '#ffb65d80'
-                    : record.AlarmArchiving == '0'
+                    : record.AlarmArchiving == '1'
                     ? '#4cd26380'
                     : '#7e2d2d80',
               })

src/views/preview-list/components/view-alarm.vue

@@ -63,6 +63,7 @@
 
   const props = defineProps<{
     data: DataProps;
+    guid: any;
     isShowCl: boolean;
   }>();
   const emits = defineEmits(['alarmArchiving']);
@@ -170,13 +171,20 @@
     },
   ]);
   watch(alarmArchiving, async (Archived) => {
-    await getSetArchived({
-      AlarmID: props.data.Id,
-      Archived,
-    });
+    if (Archived === props.data.AlarmArchiving) return;
     emits('alarmArchiving', Archived);
+    await getSetArchived(
+      {
+        AlarmID: props.data.Id,
+        Archived,
+      },
+      { GUID: props.guid }
+    );
+  });
+  onMounted(() => {
+    alarmArchiving.value = props.data.AlarmArchiving;
+    init();
   });
-  onMounted(() => init());
   onUnmounted(() => {
     viewer.value?.destroy();
     URL.revokeObjectURL(url);

src/views/preview-list/components/view-drawer.vue

@@ -13,6 +13,7 @@
     <template #title>{{ $t('previewList.tpck') }}</template>
     <ViewAlarm
       :data="viewData"
+      :guid="guid"
       :is-show-cl="isShowCl"
       @alarm-archiving="(v) => (alarmArchiving = v)"
     />
@@ -52,11 +53,12 @@
     emits('update:viewData', {
       ...props.viewData,
       isRead: true,
-      AlarmArchiving: alarmArchiving,
+      AlarmArchiving: alarmArchiving.value,
     });
     close();
   };
   const handleCancel = () => {
+    handleOk();
     close();
   };
   const handleCl = async () => {
@@ -73,7 +75,7 @@
       ...props.viewData,
       isRead: true,
       status: 1,
-      AlarmArchiving: alarmArchiving,
+      AlarmArchiving: alarmArchiving.value,
     });
     close();
   };

src/views/preview-list/index.vue

@@ -614,8 +614,7 @@
                         vc.style.height = 'auto';
                       }
                     }, 0);
-                  },
-                  JSON.stringify(res.data)
+                  }
                 );
               }
             );