Merge branch 'master' of http://124.70.43.205:3000/sunzehao/fd_dwgz_zhyw_nx

src/components/alarm-badge/index.vue

@@ -140,10 +140,14 @@ export default {
   },
   computed: {
     warnLength() {
-      return this.$store.state.warnList.length;
+      return this.$store.state.warnList.filter((it) => {
+        return !it.endts > 0;
+      }).length;
     },
     warnList() {
-      return this.$store.state.warnList;
+      return this.$store.state.warnList.filter((it) => {
+        return !it.endts > 0;
+      });
     },
     isLogined() {
       return this.$store.state.user?.loginState;

src/components/deligoAlarmList/index.vue

@@ -193,9 +193,8 @@ export default {
       }
     },
     init(list) {
-      this.warnList = list.filter((it) => {
-        return !it.endts > 0;
-      });
+      this.warnList = list;
+      //   this.warnList = list;
     },
     tableRowClassName({ row }) {
       if (row.isClose) {