From e6ddca6eb0d94899bcea57f4995ebe3398c58624 Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Tue, 8 Nov 2022 14:29:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8A=E6=97=A5=E6=96=B0=E5=A2=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/control/toolLink.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/api/app/lib/controllers/control/toolLink.js b/api/app/lib/controllers/control/toolLink.js
index 4d827dc..0f878b2 100644
--- a/api/app/lib/controllers/control/toolLink.js
+++ b/api/app/lib/controllers/control/toolLink.js
@@ -164,8 +164,6 @@ async function count (ctx) {
           alarms.StructureId IN (${anxinStrucIds.join(",")})
           AND
           StartTime BETWEEN '${moment().startOf('day').format('YYYY-MM-DD HH:mm:ss')}' AND '${moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')}'
-          AND
-          State < 3
           GROUP BY AlarmGroup
      `).toPromise()
          //今日新增数据告警
@@ -228,7 +226,7 @@ async function count (ctx) {
 
          let dataAfter = new moment();  //验证后时间
          let dataduration = moment.duration(dataAfter.diff(dataFront))._data.milliseconds
-         console.log('数据',dataduration);
+         console.log('数据', dataduration);
 
          let yingyongFront = new moment(); //验证前时间
 
@@ -250,7 +248,7 @@ async function count (ctx) {
 
          let yingyongAfter = new moment();  //验证后时间
          let yingyongduration = moment.duration(yingyongAfter.diff(yingyongFront))._data.milliseconds
-         console.log('应用',yingyongduration);
+         console.log('应用', yingyongduration);
 
          let videoFront = new moment(); //验证前时间
 
@@ -364,7 +362,7 @@ async function count (ctx) {
 
          let videoAfter = new moment();  //验证后时间
          let videoduration = moment.duration(videoAfter.diff(videoFront))._data.milliseconds
-         console.log('视频',videoduration);
+         console.log('视频', videoduration);
 
 
          let findOptions = {
@@ -403,7 +401,7 @@ async function count (ctx) {
             p.dataValues.pepProjectIsDelete = corPro.isdelete
 
          }
-        
+
 
          ctx.status = 200;
          ctx.body = {