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

Master 500 dev ztq1



See merge request !753

@@ -91,15 +91,18 @@ 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',()=>{
-
+                                        let url = `${common.domainName}/api-web/snapshot/info/download?kpiId=${params.kpiId}&resId=${params.resId}&batchNo=${params.batchNo}&tableName=${params.tableName}&access_token=${sessions.getToken().access_token}`
+                                        window.open(url)
                                     })
                                     // 点击更多的方法
                                     $(`#snapshot_wkinfoMore_${index}`).unbind('click').on('click',()=>{

@@ -4,26 +4,70 @@ 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";
+        let cols = [];
+
+        let url = `${common.domainName}/api-web/snapshot/info/page?access_token=${sessions.getToken().access_token}`;
+        $.ajax({
+            url: url,
+            data:{
+                resId,
+                kpiId,
+                batchNo,
+                page,
+                limit,
+            },
+            type: 'get',
+            async: false,
+            success:(res)=>{
+                console.log(res.object.header);
+                cols = res.object.header.map(item=>{
+                    return {
+                        field:item.id,title:item.name,sort:true,align:"center",
+                    }
+                })
+                // 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)
+                // })
+            },
+            error:(err)=>{
+
+            }
+        })
 
 
         table.render({
             elem: '#detail_more_snapshot'
-            , url : url
+            ,url:url
+            , cols: [cols]
+            , where:{
+                resId,
+                kpiId,
+                batchNo,
+            }
             , id: 'detail_more_snapshot'
-            , cols: []
-            , even: true
             , page: {
                 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
                 , theme: '#1E9FFF'