From 8c4adc1def910279fae190dd05a966e717100774 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Mon, 10 Oct 2022 16:02:27 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A=20DeviceStatus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/api/app/lib/controllers/alarm/data.js b/api/app/lib/controllers/alarm/data.js
index d763b7c..25944ac 100644
--- a/api/app/lib/controllers/alarm/data.js
+++ b/api/app/lib/controllers/alarm/data.js
@@ -90,8 +90,9 @@ async function list (ctx) {
          let alarmQueryOptionStr = `
             FROM 
                alarms 
-            LEFT JOIN DeviceStatus
-               ON DeviceStatus.DeviceId = alarms.SourceId
+           ${//LEFT JOIN DeviceStatus
+               //ON DeviceStatus.DeviceId = alarms.SourceId
+            ''}
             LEFT JOIN ${anxinyun}.t_structure 
                ON ${anxinyun}.t_structure.id = alarms.StructureId
             LEFT JOIN ${anxinyun}.t_alarm_code
@@ -109,7 +110,8 @@ async function list (ctx) {
                SourceTypeId, 
                AlarmAdviceProblem, AlarmGroup, AlarmGroupUnit, AlarmAdviceProblem,
                alarms.StructureId AS StructureId,
-               DeviceStatus.Status AS DeviceStatus,
+               ${//`DeviceStatus.Status AS DeviceStatus,`
+            ''}
                ${anxinyun}.t_structure.name AS StructureName,
                ${anxinyun}.t_structure.longitude AS StructureLongitude,
                ${anxinyun}.t_structure.latitude AS StructureLatitude,

From 0716541298fa8eb947876210c4a10ff039b532a8 Mon Sep 17 00:00:00 2001
From: deartibers <947466799@qq.com>
Date: Mon, 10 Oct 2022 16:20:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/layout/containers/layout/index.jsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/web/client/src/layout/containers/layout/index.jsx b/web/client/src/layout/containers/layout/index.jsx
index 28a7f90..0fb8441 100644
--- a/web/client/src/layout/containers/layout/index.jsx
+++ b/web/client/src/layout/containers/layout/index.jsx
@@ -140,6 +140,11 @@ const LayoutContainer = props => {
 
     useEffect(() => {
         let pathnameArr = location.pathname.split('/')
+        if (location.pathname == '/userCenter') {
+            localStorage.setItem('poms_open_sider', JSON.stringify([]))
+            localStorage.removeItem('poms_selected_sider')
+            setLeftShow(false)
+        }
         let openArr = []
         for (let i = 0; i < allItems.length; i++) {
             if (allItems[i].items) {

From ccae145498ea14f6f0aa0ae41d94f229a261ea05 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Mon, 10 Oct 2022 16:27:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?clockhouse=20=E4=B8=8D=E5=86=8D=20debug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/service/clickHouseClient.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/app/lib/service/clickHouseClient.js b/api/app/lib/service/clickHouseClient.js
index 998033a..f688681 100644
--- a/api/app/lib/service/clickHouseClient.js
+++ b/api/app/lib/service/clickHouseClient.js
@@ -11,7 +11,7 @@ function factory (app, opts) {
                app.fs.clickHouse[d.name] = new ClickHouse({
                   url: url,
                   port: port,
-                  debug: true || opts.dev,
+                  debug: opts.dev,
                   format: "json",
                   basicAuth: user && password ? {
                      username: user,