注释开发时筛选条件

api/app/lib/controllers/alarm/data.js

@@ -41,10 +41,10 @@ async function list (ctx) {
       })
       let whereOption = []
       // TODO: 1 开发临时增加
-      if (anxinStruc.length || 1) {
+      if (anxinStruc.length) {
          const anxinStrucIds = anxinStruc.map(a => a.strucId)
          // TODO: 开发临时注释
-         // whereOption.push(`alarms.StructureId IN (${anxinStrucIds.join(",")})`)
+         whereOption.push(`alarms.StructureId IN (${anxinStrucIds.join(",")})`)
 
          if (groupId) {
             whereOption.push(`alarms.AlarmGroup IN (${groupId})`)
@@ -125,7 +125,7 @@ async function list (ctx) {
 
          const confirmedAlarm = alarmRes
             // TODO: 开发临时注释
-            // .filter(ar => ar.State && ar.State > 2)
+            .filter(ar => ar.State && ar.State > 2)
             .map(ar => "'" + ar.AlarmId + "'")
          const confirmedAlarmDetailMax = confirmedAlarm.length ?
             await clickHouse.dataAlarm.query(`
@@ -159,13 +159,13 @@ async function list (ctx) {
             {
                pepProject: [
                   // TODO: 开发临时添加
-                  {
-                     id: 999,
-                     projectName: '这是假的开发の数据，看到请拨打110',
-                     isdelete: 0,
-                     constructionStatusId: 1,
-                     constructionStatus: '建设中',
-                  }
+                  // {
+                  //    id: 999,
+                  //    projectName: '这是假的开发の数据，看到请拨打110',
+                  //    isdelete: 0,
+                  //    constructionStatusId: 1,
+                  //    constructionStatus: '建设中',
+                  // }
                ]
             }).pepProject