新兴上传

HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewController.cs

@@ -19,6 +19,8 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
     /// 描 述：历史趋势控制器类
     /// </summary>
     [Area("PenMeiReportManage")]
+    [HandlerLogin(needLogin: false)]
+    [HandlerAuthorize(needAuth: false)]
     public class PenMeiHistoryAlarmNewController :  BaseController
     {
         public HistoryAlarmService _historyAlarmService { get;set;}

HT.Cloud.Web/Areas/PenMeiReportManage/Controllers/PenMeiHistoryAlarmNewNewController.cs

@@ -21,6 +21,8 @@ namespace HT.Cloud.Web.Areas.ReportManage.Controllers
     /// 描 述：历史趋势控制器类
     /// </summary>
     [Area("PenMeiReportManage")]
+    [HandlerLogin(needLogin: false)]
+    [HandlerAuthorize(needAuth: false)]
     public class PenMeiHistoryAlarmNewNewController :  BaseController
     {
         public HistoryAlarmService _historyAlarmService { get;set;}

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

@@ -1055,6 +1055,9 @@
                 //async: false,
                 data: DownLaodPara,
                 success:function (downRes) {
+
+                    notify.success("导出报表数据完成，请查看浏览器或下载目录查看报表文件", "vcenter");
+
                     var ddfileName = JSON.parse(downRes);
 
                     var fileNewDownloadUrl = "/report/" + ddfileName;

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

@@ -691,8 +691,9 @@
 		// group.add(line13_name);
 
 
-
+		var dev0att = devlist.filter(item => item.DeviceName === "dev0")[0];
 		const image_exchange = new LeaferUI.Image({
+			id: "dev0",
 			x: 800,
 			y: 250 + 75,
 			url: '/imagesnet/交换机.png',
@@ -705,7 +706,7 @@
 			y: 250 + 75 + 160 + 10,
 			width: 134,
 			fill: fill_top_name,
-			text: '交换机',
+			text: dev0att.DeviceDESCRIPTION,
 			textAlign: 'center',
 			verticalAlign: 'middle',
 			textWrap: 'none',
@@ -718,7 +719,7 @@
 			y: 250 + 75 + 160 + 25,
 			width: 134,
 			fill: fill_top_name,
-			text: '192.168.100.1',
+			text: dev0att.DeviceIP,
 			textAlign: 'center',
 			verticalAlign: 'middle',
 			textWrap: 'none',