Merge remote-tracking branch 'origin/master-500-dev' into master-500-dev

@@ -144,7 +144,6 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
             field.client_id = 'webApp';
             field.client_id = 'webApp';
             field.client_secret = 'webApp';
             field.client_secret = 'webApp';
             field.deviceId = uuid;
             field.deviceId = uuid;
-
             if(localStorage.getItem("oldLgn")){
             if(localStorage.getItem("oldLgn")){
                 if (localStorage.getItem("oldLgn") != field.username){
                 if (localStorage.getItem("oldLgn") != field.username){
                     localStorage.setItem("oldLgn",field.username);
                     localStorage.setItem("oldLgn",field.username);
@@ -234,6 +233,9 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
                                         up.map(function (v) {
                                         up.map(function (v) {
                                             sessionStorage.setItem(v.property, v.value);
                                             sessionStorage.setItem(v.property, v.value);
                                         })
                                         })
+                                    } else {
+                                        // 兼容没有用户扩展属性时，清空布局设置
+                                        sessionStorage.setItem("userLayout", '');
                                     }
                                     }
                                     // End Wang 2022/2/8 15:37
                                     // End Wang 2022/2/8 15:37
                                 }
                                 }

@@ -50,7 +50,7 @@ layui.define(['commonDetail','common', 'admin'], function (exports) {
             dataRenderingBase("arms_time_lineChart", resId, "KPI678F9FC3", "响应时间/每分钟", null);
             dataRenderingBase("arms_time_lineChart", resId, "KPI678F9FC3", "响应时间/每分钟", null);
             // Start Wang 2022/2/24 9:29 解决：arms采集结果展示(详情页面开发)
             // Start Wang 2022/2/24 9:29 解决：arms采集结果展示(详情页面开发)
             // 节点详情
             // 节点详情
-            commonDetail.renderTable("arms_node_detail",false,resId,"KPI452C0F78,KPI678F9FC3,KPIFC03301B,KPI4D6871EA,KPI649E288B,KPI5769F327,KPI8B2CCCCF",'节点详情',`detail`);
+            commonDetail.renderTable("arms_node_detail",false,resId,"KPI452C0F78,KPI5769F327,KPI8B2CCCCF,KPI678F9FC3,KPI649E288B,KPI8DC835B1,KPI4D6871EA,KPICC063E40,KPIFC03301B",'节点详情',`detail`,'KPIFC03301B','desc');
             // End Wang 2022/2/24 9:30
             // End Wang 2022/2/24 9:30
             //活动告警
             //活动告警
             commonDetail.renderActiveAlarms("arms_active_alram", resId);
             commonDetail.renderActiveAlarms("arms_active_alram", resId);