提交

.env.development

@@ -15,9 +15,9 @@ ENV = 'development'
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 #景远超
 # VUE_APP_BASE_API = 'http://10.87.11.173:8080'
-VUE_APP_BASE_API = 'http://localhost:8080'
+#VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
-# VUE_APP_BASE_API = 'http://10.87.21.107:8080'
+ VUE_APP_BASE_API = 'http://10.87.21.107:8080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

src/views/core/reportForms/intrusionTestReport.vue

@@ -26,7 +26,10 @@
               </el-form-item>
 
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+              <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
+                         v-hasPermi="['core:resumptionReport:export']">导出
+              </el-button>
             </el-form-item>
           </el-form>
           <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
@@ -116,6 +119,7 @@
           title: "",
           // 是否显示弹出层
           open: false,
+          orgName:null,
           // 查询参数
           queryParams: {
             pageNum: 1,
@@ -189,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`)
     },
 
 
@@ -200,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

@@ -139,6 +139,7 @@
           title: "",
           // 是否显示弹出层
           open: false,
+          orgName:null,
           // 查询参数
           queryParams: {
             pageNum: 1,
@@ -224,7 +225,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/selfInspectReport.vue

@@ -43,14 +43,16 @@
     </el-date-picker>
         </el-form-item>
 
-            <el-form-item>
+            <!-- <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
+            </el-form-item> -->
           </el-form>
 
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
               <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
                          v-hasPermi="['core:safetyInspectReport:export']">导出
               </el-button>
@@ -213,9 +215,9 @@
           );
         },
         handleExport() {
-      this.download('core/safetyInspectReport/export', {
+      this.download('core/safetyInspectReport/selfInspectExport', {
         ...this.queryParams
-      }, `${'【'+this.orgName+'】'+'-检查统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+      }, `${'【'+this.orgName+'】'+'-网点负责人自查报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
     },
 
 

src/views/core/reportForms/serviceBankReport.vue

@@ -128,6 +128,7 @@
             orgId: null,
             searchTime:new Date()
           },
+          orgName:null,
           // 表单参数
           form: {},
           // 表单校验
@@ -203,7 +204,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

@@ -26,7 +26,10 @@
               </el-form-item> 
 
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+              <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
+                         v-hasPermi="['core:resumptionReport:export']">导出
+              </el-button>
             </el-form-item>
           </el-form>
           <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
@@ -133,6 +136,7 @@
             orgId: null,
             searchTime:new Date()
           },
+          orgName:null,
           // 表单参数
           form: {},
           // 表单校验
@@ -227,9 +231,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`)
     },
     
      
@@ -238,6 +242,7 @@
           listStandbyPowerReport(this.queryParams).then(response => {
             this.checkList = response.data;
             this.title=response.title;
+            this.orgName=response.orgName;
             this.loading = false;
           });
         },