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

feat: 资源类型 接口参数错误



See merge request !1139

+//更多列表
+layui.define(['table', 'admin', 'layer', 'common', 'commonDetail'], function (exports) {
+    var $ = layui.$;
+    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);
+        var commonDetail = layui.commonDetail;
+        var resId = data.resId;
+        var kpiId = data.kpiId;
+        var batchNo = data.batchNo;
+        var flagPrefix = data.flagPrefix;
+        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,
+                flagPrefix,
+                page,
+                limit,
+            },
+            type: 'get',
+            async: false,
+            success:(res)=>{
+                console.log(res.object.header);
+                cols = res.object.header.map(item=>{
+                    if (item.unit){
+                        return {
+                            field:item.id,title:item.name+'('+item.unit+')',sort:true,align:"center",
+                        }
+                    }else {
+                        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
+            , cols: [cols]
+            , where:{
+                resId,
+                kpiId,
+                batchNo,
+                flagPrefix,
+            }
+            , id: 'detail_more_snapshot'
+            , page: {
+                layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
+                , theme: '#1E9FFF'
+            }
+            , height: 'full-300'
+            , limit: common.limit
+            , limits: common.limits
+            , done(){
+
+            }
+            ,error(){
+
+            }
+        })
+    })
+});

+<title>快照更多展示</title>
+<article class="page-container">
+    <div class="page-panel">
+        <div class="main">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <table id="detail_more_snapshot" lay-filter="detail_more_snapshot"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</article>
+
+<script>
+    layui.use('snapshot_detail_more', function (fn) {
+        fn({{ d }});
+    });
+</script>