1、陕西建龙打包版本

2、drawio导入SFC
3、多系统并存修改

HT.Cloud.Web/Areas/PenMeiReportManage/Views/PenMeiHistoryReport/Index.cshtml

@@ -226,6 +226,7 @@
                     iconPicker = layui.iconPicker,
                     cron = layui.cron,
                     labelGeneration = layui.labelGeneration;
+                
                 form.on('select(quickTime)', function (data) {
                     var selectValue = data.value;
 
@@ -604,7 +605,7 @@
         }
 
         //loadinghelper
-
+        var SystemName = '@ViewData["SystemName"]';
         var filepath = "";
         // 文件普通操作
         var handler = {};
@@ -863,7 +864,7 @@
             debugger;
             //showLoading();
             var datapa = {
-                "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval
+                "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval, "SystemName": SystemName,
             };
             DownLaodPara = datapa;
             //var datapa = { "StartTime": datetimestart, "EndTime": datetimeend, "Interval": timeInterval };
@@ -893,7 +894,7 @@
                 type: "GET",
                 //dataType: "json",
                 //async: false,
-                //data: datapa,
+                data: { SystemName: SystemName },
                 success: function (refirst) {
                     first = JSON.parse(refirst);
                     debugger;
@@ -905,7 +906,7 @@
                 type: "GET",
                 //dataType: "json",
                 //async: false,
-                //data: datapa,
+                data: { SystemName: SystemName },
                 success: function (resecond) {
                     second = JSON.parse(resecond);
                     debugger;
@@ -955,7 +956,7 @@
                 id: 'result',
                 height: 'full-140',
                 url: '/PenMeiReportManage/PenMeiHistoryReport/GetReportNewPage',
-                where: { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval/*, "GroupName": groupname */},
+                where: { "StartTime": Date.parse(new Date(datetimestart)), "EndTime": Date.parse(new Date(datetimeend)), "Interval": timeInterval, "SystemName": '@ViewData["SystemName"]' },
                 page: true,
                 limit: 13,
                 //even: true,