Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-09-27 b082da73a1e0259738ccb33ebf7d80cad3dc3a10

 ruoyi-ui/src/views/monitor/logininfor/index.vue

@@ -123,7 +123,7 @@
</template>

<script>
import { list, delLogininfor, cleanLogininfor, exportLogininfor } from "@/api/monitor/logininfor";
import { list, delLogininfor, cleanLogininfor } from "@/api/monitor/logininfor";

export default {
  name: "Logininfor",
@@ -216,14 +216,7 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      const queryParams = this.queryParams;
      this.$modal.confirm('是否确认导出所有操作日志数据项？').then(() => {
        this.exportLoading = true;
        return exportLogininfor(queryParams);
      }).then(response => {
        this.download(response.msg);
        this.exportLoading = false;
      }).catch(() => {});
      this.$download.excel('/monitor/logininfor/export', this.queryParams);
    }
  }
};