diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/snapshot_detail.js b/hg-monitor-web-base/src/main/resources/static/src/controller/snapshot_detail.js index 10e1d89..0a08862 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/snapshot_detail.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/snapshot_detail.js @@ -80,15 +80,24 @@ layui.define(['commonDetail', 'common', 'sessions'], function (exports) { ,data: datas ,cols: [cols] ,done(response, curr, count){ - console.log(response); + delete response.data[0].LAY_TABLE_INDEX // + let keys = response.data[0] let params = { - kpiId:"", + kpiId:Object.keys(keys).join(','), resId:resId, - batchNo:batchNo + batchNo:batchNo, + tableName:item.name } // 点击下载的方法 $(`#snapshot_wkinfoDownload_${index}`).unbind('click').on('click',()=>{ - + $.ajax({ + url:common.domainName+"/api-web/snapshot/info/download?access_token="+sessions.getToken().access_token, + data:params, + type:"get", + success:(res)=>{ + console.log(res); + } + }) }) // 点击更多的方法 $(`#snapshot_wkinfoMore_${index}`).unbind('click').on('click',()=>{ diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/snapshot_detail_more.js b/hg-monitor-web-base/src/main/resources/static/src/controller/snapshot_detail_more.js index 76c48ed..3a68702 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/snapshot_detail_more.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/snapshot_detail_more.js @@ -4,37 +4,73 @@ layui.define(['table', 'admin', 'layer', 'common', 'commonDetail'], function (ex var admin = layui.admin; var table = layui.table; var common = layui.common; + var sessions = layui.sessions; var commonDetail = layui.commonDetail; //对外暴露的接口 exports('snapshot_detail_more', function (data) { - console.log(data); + // console.log(data); var commonDetail = layui.commonDetail; var resId = data.resId; var kpiId = data.kpiId; - var flag = data.flag; - var sortBy = data.sortBy; - var order = data.order; - var colWidth = data.colWidth; - var url = "/api-web/snapshot/info/page"; + var batchNo = data.batchNo; + var page = '1'; + var limit = "10"; + // var flag = data.flag; + // var sortBy = data.sortBy; + // var order = data.order; + // var colWidth = data.colWidth; + // var url = "/api-web/snapshot/info/page"; + let url = common.domainName + '/api-web/snapshot/info/page?access_token='+sessions.getToken().access_token; + $.ajax({ + url: url, + data:{ + resId, + batchNo, + kpiId, + page, + limit, + }, + type: 'get', + async: false, + success:(res)=>{ + console.log(res.object); + let tableArr = res.object; + let datas = []; + let cols = []; + tableArr.header.map((headerItem,headerIndex)=>{ + cols.push({ + field:headerItem.id,title:headerItem.name,sort:true,align:"center", + }) + }) + tableArr.content.map((contItem,contIndex)=>{ + let obj = {}; + contItem.map((v,i)=>{ + obj[v.kpiId] = v.kpiValue + }) + datas.push(obj) + }) + table.render({ + elem: '#detail_more_snapshot' + , data : datas + , cols: [cols] + , id: 'detail_more_snapshot' + , page: { + layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] + , theme: '#1E9FFF' + } + , height: 'full-300' + , limit: common.limit + , limits: common.limits + , done(){ - table.render({ - elem: '#detail_more_snapshot' - , url : url - , id: 'detail_more_snapshot' - , cols: [] - , even: true - , page: { - layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] - , theme: '#1E9FFF' - } - , height: 'full-300' - , limit: common.limit - , limits: common.limits - , done(){ + } + ,error(){ - } - ,error(){ + } + }) + }, + error:(err)=>{ } })