From eb8d00e8c068a2a091edb3e1219768bee4094f05 Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Tue, 27 Sep 2022 13:59:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=93=8D=E4=BD=9C=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/alarm/data.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/app/lib/controllers/alarm/data.js b/api/app/lib/controllers/alarm/data.js
index 5253bad..dea6b1a 100644
--- a/api/app/lib/controllers/alarm/data.js
+++ b/api/app/lib/controllers/alarm/data.js
@@ -41,10 +41,10 @@ async function list (ctx) {
       })
       let whereOption = []
       // TODO: 1 开发临时增加
-      if (anxinStruc.length) {
+      if (anxinStruc.length || 1) {
          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})`)

From fb0038e83fabcb4527d4191124344c0f82456b7d Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Tue, 27 Sep 2022 13:59:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/problem/containers/dataAlarm.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/client/src/sections/problem/containers/dataAlarm.jsx b/web/client/src/sections/problem/containers/dataAlarm.jsx
index cb8ebc9..f43d282 100644
--- a/web/client/src/sections/problem/containers/dataAlarm.jsx
+++ b/web/client/src/sections/problem/containers/dataAlarm.jsx
@@ -295,7 +295,6 @@ const DataAlarm = ({ match, dispatch, actions, user, loading, socket }) => {
                   {r.confirmTime ? <Button theme='borderless' disabled>已确认</Button> :
                      <Button theme='borderless' onClick={() => (setConfirm(true), setSelected([r.id]))}>确认</Button>
                   }
-                  {<Button theme='borderless' disabled>已派单</Button>}
                   {route ? ['dataLnterrupt', 'dataAbnormal', 'strategyHit'].includes(route) ? <>
                      <Button theme='borderless' disabled>已派单</Button>
                      <Button theme='borderless' onClick={() => (setCheckPop(true))}>查看</Button>

From 37fe74937f821a5d70b3900f7684935f661c386d Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Tue, 27 Sep 2022 14:01:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?api=E6=95=B0=E6=8D=AE=E5=B1=95=E7=8E=B0?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/alarm/data.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/app/lib/controllers/alarm/data.js b/api/app/lib/controllers/alarm/data.js
index dea6b1a..5253bad 100644
--- a/api/app/lib/controllers/alarm/data.js
+++ b/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})`)