Merge remote-tracking branch 'origin/V0.0.4' into V0.0.4

src/views/core/reportForms/monitorAccessReport.vue

@@ -26,9 +26,17 @@
             <el-date-picker  :picker-options="{ firstDayOfWeek: 1 }"  v-model="weeks"  type="week"   format='yyyy 第 WW 周'  placeholder="选择周" @change='setWeekNum'>
              </el-date-picker>
           </el-form-item>
-
+          <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 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:monitorAccessReport:export']">导出
+              </el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    
+          </el-row>
             </el-form-item>
           </el-form>
           <h1 class="title" style="text-align:center;">{{ this.title}}</h1>
@@ -209,9 +217,9 @@
           );
         },
         handleExport() {
-      this.download('core/safetyInspectReport/export', {
+      this.download('core/monitorAccessReport/export', {
         ...this.queryParams
-      }, `${'【'+this.orgName+'】'+'-检查统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+      }, `${'【'+this.orgName+'】'+'-监控调阅报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
     },
 
         getList() {

src/views/core/reportForms/resumptionReport.vue

@@ -42,7 +42,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>
@@ -210,9 +213,9 @@
           );
         },
         handleExport() {
-      this.download('core/safetyInspectReport/export', {
+      this.download('core/resumptionReport/export', {
         ...this.queryParams
-      }, `${'【'+this.orgName+'】'+'-检查统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+      }, `${'【'+this.orgName+'】'+'-履职报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
     },
 
 

src/views/core/reportForms/serviceBankReport.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>
@@ -189,9 +192,9 @@
           );
         },
         handleExport() {
-      this.download('core/safetyInspectReport/export', {
+      this.download('core/resumptionReport/serviceBankExport', {
         ...this.queryParams
-      }, `${'【'+this.orgName+'】'+'-检查统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+      }, `${'【'+this.orgName+'】'+'-离行式自助银行巡检报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
     },