Merge branch 'master-500-dev-xwx' into 'master-500-dev'

获取快照详情信



See merge request !748

@@ -2172,28 +2172,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
             });
             });
         },
         },
 
 
-        /**
-         * 动态渲染表格
-         * @param tableId 表格所在区域ID
-         * @param page 是否分页 true/false
-         * @param resId 资源Id
-         * @param batchNo 指标Id,多个id，以逗号隔开
-         * 2022/07/13 zhangtianqi
-         */
-         renderSnapshotTable(tableId,resId,batchNo,page,pageNum,pageSize){
-            let statusF = false;//是否为状态信息
-            let url = `/api-web/snapshot/info?resId=${resId}&batchNo=${batchNo}`;
-            // 分页获取
-            if (page){
-                url = `/api-web/snapshot/info?resId=${resId}&kpiId=${batchNo}`
-            }
-
-            admin.req({
-                url: common.domainName + url
-            }).done((res)=>{
-
-            })
-         },
 
 
 
 
         /**
         /**

@@ -6,17 +6,16 @@ layui.define(['commonDetail', 'common', 'sessions'], function (exports) {
         var common = layui.common;
         var common = layui.common;
         var sessions = layui.sessions;
         var sessions = layui.sessions;
         var resId = '';
         var resId = '';
-        var resType = '';
+        var batchNo = '';
         var showFlag = common.getUrlParam("show");
         var showFlag = common.getUrlParam("show");
         if (showFlag && showFlag == '0') {
         if (showFlag && showFlag == '0') {
             resId = common.getUrlParam("resId");
             resId = common.getUrlParam("resId");
-            resType = common.getUrlParam("resType");
+            batchNo = common.getUrlParam("batchNo");
         } else {
         } else {
             resId = data.resId;
             resId = data.resId;
-            resType = data.resType;
+            batchNo = data.batchNo;
         }
         }
-        //获取小型机分区中安装的oracle数据库的resId
-        var oracleRelationByResId = findOracleRelationByResId();
+        findAllSnapshot();
 
 
         commonDetail.bindTips();
         commonDetail.bindTips();
         /*//基本信息
         /*//基本信息
@@ -99,31 +98,22 @@ layui.define(['commonDetail', 'common', 'sessions'], function (exports) {
             commonDetail.renderStoreAlarms('hostminicomputerpartition_store', resId);*/
             commonDetail.renderStoreAlarms('hostminicomputerpartition_store', resId);*/
         }
         }
 
 
-        function findOracleRelationByResId() {
-            let leftUrl = common.domainName + '/api-web/detail/findRelationGroupByResId';
-            let oracleResId = '';
+        function findAllSnapshot() {
+            let url = common.domainName + '/api-web/snapshot/info?resId='+ resId + '&batchNo='+batchNo +'&access_token='+sessions.getToken().access_token;
             $.ajax({
             $.ajax({
-                url: leftUrl,
+                url: url,
                 type: 'get',
                 type: 'get',
                 async: false,
                 async: false,
-                headers: {
-                    "Authorization": "Bearer " + sessions.getToken().access_token + ""
-                },
-                data: {resId: resId},
                 success: function (res) {
                 success: function (res) {
-                    if (res && res.success && res.map) {
-                        let relation = res.map['relation-installreverse'];
-                        if (relation && relation.length > 0) {
-                            for (let object of relation) {
-                                if (object.targetType === 'DATABASE_ORACLE') {
-                                    oracleResId = object.targetId;
-                                }
-                            }
-                        }
+                    if (res.success){
+
+                    }else {
+                        layer.msg(res.msg, {
+                            icon: 7, time: 2000
+                        });
                     }
                     }
                 }
                 }
             })
             })
-            return oracleResId;
         }
         }
 
 
         //定时任务
         //定时任务

@@ -389,7 +389,7 @@ export default {
         }
         }
         //快照详情
         //快照详情
         let handleDetail = (row)=>{
         let handleDetail = (row)=>{
-            proxy.$global.openNewWin('template/detail/snapshot_detail', "快照详情", {resId:row.resId},false);
+            proxy.$global.openNewWin('template/detail/snapshot_detail', "快照详情", {resId:row.resId,batchNo:row.batchNo},false);
         }
         }
 
 
         //查看资源详情
         //查看资源详情