From 74445e76c337fb83469a8af23d9a2d76026e8bbb Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 29 Sep 2020 17:48:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BC=B9=E5=87=BA=E7=AA=97=E4=BD=93=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=AE=BD=E9=AB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 858e519e..79af461e 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 @@ -383,12 +383,14 @@ var table = { }); }, // 导入数据 - importExcel: function(formId) { + importExcel: function(formId, width, height) { table.set(); var currentId = $.common.isEmpty(formId) ? 'importTpl' : formId; + var _width = $.common.isEmpty(width) ? "400" : width; + var _height = $.common.isEmpty(height) ? "230" : height; layer.open({ type: 1, - area: ['400px', '230px'], + area: [_width + 'px', _height + 'px'], fix: false, //不固定 maxmin: true,