Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

Conflicts: ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java ruoyi-generator/src/main/resources/vm/java/controller.java.vm ruoyi-generator/src/main/resources/vm/vue/index.vue.vm ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java ruoyi-ui/package.json ruoyi-ui/src/api/monitor/logininfor.js ruoyi-ui/src/api/monitor/operlog.js ruoyi-ui/src/api/system/config.js ruoyi-ui/src/api/system/dict/data.js ruoyi-ui/src/api/system/dict/type.js ruoyi-ui/src/api/system/post.js ruoyi-ui/src/api/system/role.js ruoyi-ui/src/api/system/user.js ruoyi-ui/src/main.js ruoyi-ui/src/utils/request.js ruoyi-ui/src/views/monitor/job/index.vue ruoyi-ui/src/views/monitor/job/log.vue ruoyi-ui/src/views/monitor/logininfor/index.vue ruoyi-ui/src/views/monitor/operlog/index.vue ruoyi-ui/src/views/system/config/index.vue ruoyi-ui/src/views/system/dict/data.vue ruoyi-ui/src/views/system/dict/index.vue ruoyi-ui/src/views/system/post/index.vue ruoyi-ui/src/views/system/role/index.vue ruoyi-ui/src/views/system/user/index.vue
2025-09-24 07:19:46 +08:00 · 2021-11-17 19:14:03 +08:00
parent eb844e3260 cedd2d1daf
commit 64add90edd
19 changed files with 130 additions and 110 deletions
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/ruoyi-ui/src/views/system/config/index.vue
@ -88,7 +88,6 @@
          plain
          icon="el-icon-download"
          size="mini"
-          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:config:export']"
        >导出</el-button>
@ -194,8 +193,6 @@ export default {
    return {
      // 遮罩层
      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -334,7 +331,9 @@ export default {
    },
    /** 导出按钮操作 */
    handleExport() {
-      this.$download.excel('/system/config/export', this.queryParams);
+      this.download('system/config/export', {
+        ...this.queryParams
+      }, `config_${new Date().getTime()}.xlsx`)
    },
    /** 刷新缓存按钮操作 */
    handleRefreshCache() {
--- a/ruoyi-ui/src/views/system/dict/data.vue
+++ b/ruoyi-ui/src/views/system/dict/data.vue
@ -75,7 +75,6 @@
          plain
          icon="el-icon-download"
          size="mini"
-          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:dict:export']"
        >导出</el-button>
@ -193,8 +192,6 @@ export default {
    return {
      // 遮罩层
      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -380,8 +377,10 @@ export default {
    },
    /** 导出按钮操作 */
    handleExport() {
-      this.$download.excel('/system/dict/data/export', this.queryParams);
+      this.download('system/dict/data/export', {
+        ...this.queryParams
+      }, `data_${new Date().getTime()}.xlsx`)
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/dict/index.vue
+++ b/ruoyi-ui/src/views/system/dict/index.vue
@ -94,7 +94,6 @@
          plain
          icon="el-icon-download"
          size="mini"
-          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:dict:export']"
        >导出</el-button>
@ -202,8 +201,6 @@ export default {
    return {
      // 遮罩层
      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -338,7 +335,9 @@ export default {
    },
    /** 导出按钮操作 */
    handleExport() {
-      this.$download.excel('/system/dict/type/export', this.queryParams);
+      this.download('system/dict/type/export', {
+        ...this.queryParams
+      }, `type_${new Date().getTime()}.xlsx`)
    },
    /** 刷新缓存按钮操作 */
    handleRefreshCache() {
@ -348,4 +347,4 @@ export default {
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/post/index.vue
+++ b/ruoyi-ui/src/views/system/post/index.vue
@ -74,7 +74,6 @@
          plain
          icon="el-icon-download"
          size="mini"
-          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:post:export']"
        >导出</el-button>
@ -169,8 +168,6 @@ export default {
    return {
      // 遮罩层
      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -305,7 +302,9 @@ export default {
    },
    /** 导出按钮操作 */
    handleExport() {
-      this.$download.excel('/system/post/export', this.queryParams);
+      this.download('system/post/export', {
+        ...this.queryParams
+      }, `post_${new Date().getTime()}.xlsx`)
    }
  }
 };
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@ -94,7 +94,6 @@
          plain
          icon="el-icon-download"
          size="mini"
-          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['system:role:export']"
        >导出</el-button>
@ -270,8 +269,6 @@ export default {
    return {
      // 遮罩层
      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -613,8 +610,10 @@ export default {
    },
    /** 导出按钮操作 */
    handleExport() {
-      this.$download.excel('/system/role/export', this.queryParams);
+      this.download('system/role/export', {
+        ...this.queryParams
+      }, `role_${new Date().getTime()}.xlsx`)
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@ -131,7 +131,6 @@
              plain
              icon="el-icon-download"
              size="mini"
-              :loading="exportLoading"
              @click="handleExport"
              v-hasPermi="['system:user:export']"
            >导出</el-button>
@ -360,8 +359,6 @@ export default {
    return {
      // 遮罩层
      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -643,7 +640,9 @@ export default {
    },
    /** 导出按钮操作 */
    handleExport() {
-      this.$download.excel('/system/user/export', this.queryParams);
+      this.download('system/user/export', {
+        ...this.queryParams
+      }, `user_${new Date().getTime()}.xlsx`)
    },
    /** 导入按钮操作 */
    handleImport() {
@ -652,7 +651,9 @@ export default {
    },
    /** 下载模板操作 */
    importTemplate() {
-      this.$download.excel('/system/user/importTemplate');
+      this.download('system/user/importTemplate', {
+        ...this.queryParams
+      }, `user_template_${new Date().getTime()}.xlsx`)
    },
    // 文件上传中处理
    handleFileUploadProgress(event, file, fileList) {
@ -672,4 +673,4 @@ export default {
    }
  }
 };
-</script>
+</script>