Merge branch 'master-v32-ztq' into 'master'

feat: 天津代码迁移（快照历史弹窗无数据问题）



See merge request !1136

@@ -929,6 +929,115 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
         },
 
         /**
+         * 渲染文本，指定列数展示，key、value展示的方式
+         * @param targetId html存放目标id
+         * @param resId 资源id
+         * @param kpiId 指标id,多个指标逗号隔开
+         * @param cols 指定列（一组key value为一列）
+         */
+        anapshotRenderTextCols: function (targetId,data, cols, isBasic) {
+            var flags = "";
+            var kpiIdList = "";
+            if (data.length > 0) {
+                var dataArr = common.splieceGroup(data, cols);
+                var li = "";
+                //先遍历分组后的，在遍历组内的数组
+                $.each(dataArr, function (i, v) {
+                    var span = '';
+                    $.each(v, function (j, ar) {
+                        var valueStr = '';
+                        var titleStr = '';
+                        //end lsq 2022-06-08
+                        if (ar.kpiId == 'KPIE13DD9A3') {
+                            valueStr = laytpl($("#linkStateDetailTpl").html()).render({linkStateList: ar.value});
+                        } else if (ar.value != 'null') {
+                            if (ar.value == 'Infinity%') {
+                                valueStr = ''
+                            } else {
+                                valueStr = ar.kpiValue;
+                            }
+                            titleStr = valueStr;
+                        }
+                        if (ar.kpiId == 'KPIE13DD9A3' || ar.kpiId == 'KPI02786E8D') {
+                            //获取flag
+                            $.each(ar.value, function (i, v) {
+                                flags += v.flag + ",";
+                            });
+                            if (flags != '') {
+                                flags = flags.substring(0, flags.length - 1);
+                            }
+                            //获取kpi
+                            kpiIdList += ar.kpiId + ",";
+                        }
+                        //start lsq 更改下探图标的属性值 2022-06-08
+                        var tips = '<a class="detail_row_menu hide"  data-id=' + ar.kpiId + ' data-flag=' + ar.flag +
+                            ' data-name=' + ar.kpiName + ' data-kpiname=' + ar.kpiName + ' data-iswarning=1 data-ident=1' +
+                            ' data-trend=0 data-unit="" data-hidem="hidem" data-nature="true" ' +
+                            ' data-restype=' + (ar.resType ? ar.resType : "") + '>\n' +
+                            '<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
+                            '</a>'
+                        //end lsq 2022-06-08
+                        var menuId = "";
+                        if (ar.kpiId == 'KPIE13DD9A3' || ar.kpiId == 'KPI02786E8D' ) {
+                            ar.kpiName = ar.kpiName + tips;
+                            menuId = "id=\"" + targetId + "_detail_row_menu\" class='statusMenu'";
+                        }
+                        let unit='';
+                        if(ar.unit != null && ar.kpiValue != null && ar.kpiValue.indexOf('从不过期') == -1){
+                            unit=ar.unit;
+                        }
+                        var $html = addIconByValue(valueStr);
+                        var resStyle = obj.alarmEleMatchStyle(ar.flag, ar.kpiId);
+                        span += ' <span  ' + menuId + '  style="text-align:left;width:40%">' + ar.kpiName + '</span>' +
+                            '<span title="' + titleStr + '" style="width:60%;overflow: hidden !important;text-overflow: ellipsis;white-space: nowrap;' + resStyle + '">'
+                            + $html + valueStr +unit+ '</span>';
+                        //补充空白区域
+                        if (v.length < cols) {
+                            var l = cols - v.length;
+                            var appendSpan = '';
+                            for (var n = 0; n < l; n++) {
+                                appendSpan += "<span></span><span></span>";
+                            }
+                            span += appendSpan;
+                        }
+                    });
+                    li += '<li>' + span + '</li>'
+                });
+                $("ul#" + targetId).html(li);
+            }
+        },
+        snapshotRenderResHealth: function (data){
+            var clas = 'res-state-pie--good';
+            if (data.icon == 'worst') {
+                clas = 'res-state-pie--bad';
+            }
+            if (data.icon == 'worse') {
+                clas = 'res-state-pie--middle';
+            }
+            var reslt = "优", yz = '0', yb = '0', zy = '0';
+            if (data.state) {
+                reslt = data.state;
+            }
+            if (data.yz) {
+                yz = data.yz == 'null' || '' ? 0 : data.yz;
+            }
+            if (data.zy) {
+                zy = data.zy == 'null' || '' ? 0 : data.zy;
+            }
+            if (data.yb) {
+                yb = data.yb == 'null' || '' ? 0 : data.yb;
+            }
+            var html = '<div class="res-state-pie ' + clas + '">' + reslt + '</div>' +
+                '       <ul>' +
+                '           <li>严重告警：' + yz + '</li>' +
+                '           <li>重要告警：' + zy + '</li>' +
+                '           <li>一般告警：' + yb + '</li>' +
+                '       </ul>';
+
+            $("#hostminicomputerpartition_resstate").html(html);
+        },
+
+        /**
          * 资源状态
          * @param targetId 资源状体区域ID
          * @param resId
@@ -3262,6 +3371,47 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
             }
         },
         /**
+         * 活动告警
+         * @param tableId
+         * @param resId
+         */
+        snapshotRenderActiveAlarms: function (title,tableId, data) {
+            //start lsq 状态信息的状态也增加下探 202-06-08
+            let statusF = false;//是否为状态信息
+            //end lsq 2022-06-08
+            $('#' + tableId).prev().text(title)
+            var alarmlist = table.render({
+                elem: '#' + tableId
+                , data: data
+                , cols: [[
+                    {
+                        field: 'LAY_INDEX', title: '序号', align: 'center', width: 100,
+                        templet: function (d) {
+                            return '<span>' + d.LAY_INDEX + '</span>';
+                        }
+                    }
+                    , {
+                        field: 'alarmLevel', title: '告警级别', align: 'center', width: 140, sort: true,
+                        templet: function (d) {
+                            if (d.alarmLevel == 3) {
+                                return '<span class="layui-table-warn" style="width: 100%;">严重</span>';
+                            } else if (d.alarmLevel == 2) {
+                                return '<span class="layui-table-close" style="width: 100%;">重要</span>';
+                            } else if (d.alarmLevel == 1) {
+                                return '<span class="layui-table-normal" style="width: 100%;">一般</span>';
+                            }
+                        }
+                    }
+                    , {field: 'alarmContent', title: '告警内容', align: 'center'}
+                    , {
+                        field: 'kpiName', title: '指标名称', align: 'center', width: '20%',
+                    }
+                    , {field: 'updateTime', title: '告警时间', align: 'center', width: '15%'}
+                ]],
+            });
+
+        },
+        /**
          * 虚拟化虚拟机列表
          * @param tableId
          * @param resId

@@ -64,7 +64,7 @@ export default {
         },
         selectFilterMethod(val) {
             // 下拉框调用tree树筛选
-            this.$refs.kpiTree.filter(val)
+            this.$refs.bizTree.filter(val)
         },
         selectChangeMethod(e) {
             var arrNew = []
@@ -78,7 +78,7 @@ export default {
                 }
             }
             // 设置勾选的值
-            this.$refs.kpiTree.setCheckedNodes(arrNew)
+            this.$refs.bizTree.setCheckedNodes(arrNew)
         },
         filterNode(value, data) {
             if (!value) return true