Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

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

@@ -90,8 +90,9 @@ async function list (ctx) {
          let alarmQueryOptionStr = `
             FROM 
                alarms 
-            LEFT JOIN DeviceStatus
+           ${//LEFT JOIN DeviceStatus
-               ON DeviceStatus.DeviceId = alarms.SourceId
+               //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,

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,

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) {