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

Master 500 dev ztq1



See merge request !760

@@ -96,11 +96,12 @@ layui.define(['commonDetail', 'common', 'sessions'], function (exports) {
                                         kpiId:Object.keys(keys).join(','),
                                         kpiId:Object.keys(keys).join(','),
                                         resId:resId,
                                         resId:resId,
                                         batchNo:batchNo,
                                         batchNo:batchNo,
-                                        tableName:item.name
+                                        tableName:item.name,
+                                        flagPrefix:item.flagPrefix
                                     }
                                     }
                                     // 点击下载的方法
                                     // 点击下载的方法
                                     $(`#snapshot_wkinfoDownload_${index}`).unbind('click').on('click',()=>{
                                     $(`#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}`
+                                        let url = `${common.domainName}/api-web/snapshot/info/download?kpiId=${params.kpiId}&resId=${params.resId}&batchNo=${params.batchNo}&tableName=${params.tableName}&flagPrefix=${params.flagPrefix}&access_token=${sessions.getToken().access_token}`
                                         window.open(url)
                                         window.open(url)
                                     })
                                     })
                                     // 点击更多的方法
                                     // 点击更多的方法

@@ -13,6 +13,7 @@ layui.define(['table', 'admin', 'layer', 'common', 'commonDetail'], function (ex
         var resId = data.resId;
         var resId = data.resId;
         var kpiId = data.kpiId;
         var kpiId = data.kpiId;
         var batchNo = data.batchNo;
         var batchNo = data.batchNo;
+        var flagPrefix = data.flagPrefix;
         var page = '1';
         var page = '1';
         var limit = "10";
         var limit = "10";
         let cols = [];
         let cols = [];
@@ -24,6 +25,7 @@ layui.define(['table', 'admin', 'layer', 'common', 'commonDetail'], function (ex
                 resId,
                 resId,
                 kpiId,
                 kpiId,
                 batchNo,
                 batchNo,
+                flagPrefix,
                 page,
                 page,
                 limit,
                 limit,
             },
             },
@@ -66,6 +68,7 @@ layui.define(['table', 'admin', 'layer', 'common', 'commonDetail'], function (ex
                 resId,
                 resId,
                 kpiId,
                 kpiId,
                 batchNo,
                 batchNo,
+                flagPrefix,
             }
             }
             , id: 'detail_more_snapshot'
             , id: 'detail_more_snapshot'
             , page: {
             , page: {