diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java index f1d34c9..20c0c64 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java @@ -163,4 +163,13 @@ public class BaseLocationInfoController extends BaseController { return toAjax(baseLocationInfoService.deleteBaseLocationInfoByObjids(ids)); } + + @RequiresPermissions("system:baselocationinfo:view") + @GetMapping("/importTemplate") + @ResponseBody + public AjaxResult importTemplate() + { + ExcelUtil util = new ExcelUtil<>(BaseLocationInfo.class); + return util.importTemplateExcel("用户数据"); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index bb994f6..e479602 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -42,7 +42,7 @@ public class CommonController * @param fileName 文件名称 * @param delete 是否删除 */ - @GetMapping("common/download") + @GetMapping("/common/download") public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) { try diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index f077bbb..34a9131 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -389,6 +389,9 @@ var table = { // 下载模板 importTemplate: function() { $.get(activeWindow().table.options.importTemplateUrl, function(result) { + console.log(result.code) + console.log(web_status.SUCCESS) + if (result.code == web_status.SUCCESS) { window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; } else if (result.code == web_status.WARNING) { @@ -398,6 +401,7 @@ var table = { } }); }, + // 导入数据 importExcel: function(formId, width, height) { table.set(); diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 1e9f781..b4780fe 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -32,7 +32,7 @@ diff --git a/ruoyi-admin/src/main/resources/templates/register.html b/ruoyi-admin/src/main/resources/templates/register.html index f2c8f0a..ba5ddec 100644 --- a/ruoyi-admin/src/main/resources/templates/register.html +++ b/ruoyi-admin/src/main/resources/templates/register.html @@ -22,9 +22,9 @@