Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.4

src/views/core/reportForms/intrusionTestReport.vue

@@ -119,6 +119,7 @@
           title: "",
           // 是否显示弹出层
           open: false,
+          orgName:null,
           // 查询参数
           queryParams: {
             pageNum: 1,
@@ -192,9 +193,9 @@
           );
         },
         handleExport() {
-      this.download('core/safetyInspectReport/export', {
+      this.download('core/resumptionReport/intrusionTestExport', {
         ...this.queryParams
-      }, `${'【'+this.orgName+'】'+'-检查统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+      }, `${'【'+this.orgName+'】'+'-报警测试报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
     },
 
 
@@ -203,7 +204,7 @@
           listIntrusionTestReport(this.queryParams).then(response => {
             this.checkList = response.data;
             this.title=response.title;
-            // this.total = response.data.total;
+        this.orgName=response.orgName;
             this.loading = false;
           });
         },

src/views/core/reportForms/monitorAccessReport.vue

@@ -115,6 +115,7 @@
           title: "",
           // 是否显示弹出层
           open: false,
+          orgName:null,
           // 查询参数
           queryParams: {
             pageNum: 1,

src/views/core/reportForms/resumptionReport.vue

@@ -146,6 +146,7 @@
           title: "",
           // 是否显示弹出层
           open: false,
+          orgName:null,
           // 查询参数
           queryParams: {
             pageNum: 1,
@@ -231,7 +232,7 @@
           listReport(this.queryParams).then(response => {
             this.checkList = response.data;
             this.title=response.title;
-            // this.total = response.data.total;
+            this.orgName=response.orgName;
             this.loading = false;
           });
         },

src/views/core/reportForms/serviceBankReport.vue

@@ -137,6 +137,7 @@
             orgId: null,
             searchTime:new Date()
           },
+          orgName:null,
           // 表单参数
           form: {},
           // 表单校验
@@ -212,7 +213,7 @@
           listServiceBankReport(this.queryParams).then(response => {
             this.checkList = response.data;
             this.title=response.title;
-            // this.total = response.data.total;
+            this.orgName=response.orgName;
             this.loading = false;
           });
         },

src/views/core/reportForms/standbyPowerReport.vue

@@ -132,6 +132,7 @@
             orgId: null,
             searchTime:new Date()
           },
+          orgName:null,
           // 表单参数
           form: {},
           // 表单校验
@@ -226,9 +227,9 @@
           );
         },
         handleExport() {
-      this.download('core/safetyInspectReport/export', {
+      this.download('core/resumptionReport/standbyPowerExport', {
         ...this.queryParams
-      }, `${'【'+this.orgName+'】'+'-检查统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+      }, `${'【'+this.orgName+'】'+'-备用电源维护报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
     },
 
 
@@ -237,6 +238,7 @@
           listStandbyPowerReport(this.queryParams).then(response => {
             this.checkList = response.data;
             this.title=response.title;
+            this.orgName=response.orgName;
             this.loading = false;
           });
         },