Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into joke

@@ -24,6 +24,8 @@ layui.define(['commonDetail','common'], function (exports) {
         var netcardkpi = "KPIFABFD741,KPID339D51B,KPI02062F43";
         //HBA卡
         var hbaKpi = "KPIFABFD741,KPI6BF1F392,KPI5858832B,KPI8BFD7BC7,KPI2EF4F8CD";
+        // LUN信息
+        var lunKpi = "KPID9EE5B18,KPI2D4365CA,KPI06F12BAA,KPI008F0D3A,KPI17B00478";
         reload()
 
         //渲染页面
@@ -58,6 +60,11 @@ layui.define(['commonDetail','common'], function (exports) {
             commonDetail.renderActiveAlarms("vmware_physicshost_alarmlist",resId);
 
             commonDetail.renderVhostTable("vmware_physicshost_vhostlist",'VIRTUALIZATION_VMWARE_VHOST',resId);
+
+            // Start Wang 2022/2/24 9:29 解决：vm宿主机连接的LUN信息没有展示
+            // LUN信息
+            commonDetail.renderTable("vmware_physicshost_lunlist",false,resId,lunKpi,'LUN信息','lun');
+            // End Wang 2022/2/24 9:30
         }
 
         //定时任务
@@ -67,4 +74,4 @@ layui.define(['commonDetail','common'], function (exports) {
         commonDetail.detailTimer.push(timer);
 
     });
-});
\ No newline at end of file
+});

@@ -80,6 +80,14 @@
                             <div id="vmware_physicshost_vhostlist"></div>
                         </div>
                     </div>
+                    <!--Start Wang 2022/2/24 9:29 解决：vm宿主机连接的LUN信息没有展示-->
+                    <div class="lay-row">
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">LUN信息</h5>
+                            <div id="vmware_physicshost_lunlist"></div>
+                        </div>
+                    </div>
+                    <!--End Wang 2022/2/24 9:30-->
                     <div class="lay-row">
                         <div class="lay-row-item">
                             <h5 class="lay-row-title">实时告警动态</h5>
@@ -102,4 +110,4 @@
             fn(JSON.parse(parm));
         }
     });
-</script>
\ No newline at end of file
+</script>