From 774cff9c52807b7511cd8cb38fee6f4958331468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=91=E6=B8=B8=E4=B9=8B=E9=B1=BC?= Date: Sat, 16 Oct 2021 06:49:37 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=AB=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/system/SysIndexController.java | 2 +- ruoyi-admin/src/main/resources/static/ruoyi/index.js | 6 +++--- .../src/main/resources/static/ruoyi/js/common.js | 2 +- .../src/main/resources/static/ruoyi/js/ry-ui.js | 12 ++++++------ .../main/resources/templates/demo/modal/layer.html | 2 +- .../main/resources/templates/demo/operate/other.html | 2 +- .../templates/demo/table/dynamicColumns.html | 2 +- ruoyi-admin/src/main/resources/templates/lock.html | 4 ++-- ruoyi-admin/src/main/resources/templates/login.html | 2 +- .../src/main/resources/templates/register.html | 2 +- .../templates/system/user/profile/avatar.html | 4 ++-- .../src/main/resources/templates/tool/gen/gen.html | 6 +++--- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java index 2b7a46a24..10da47fb4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -102,7 +102,7 @@ public class SysIndexController extends BaseController SysUser user = getSysUser(); if (StringUtils.isNull(user)) { - return AjaxResult.error("服务器超时，请重新登陆"); + return AjaxResult.error("服务器超时，请重新登录"); } if (passwordService.matches(user, password)) { diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/index.js b/ruoyi-admin/src/main/resources/static/ruoyi/index.js index b058ae931..54e2abb2b 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/index.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/index.js @@ -309,7 +309,7 @@ $(function() { var str1 = ''; $('.mainContent').find('iframe.RuoYi_iframe').hide().parents('.mainContent').append(str1); - $.modal.loading("数据加载中，请稍后..."); + $.modal.loading("数据加载中，请稍候..."); $('.mainContent iframe:visible').on('load', function() { $.modal.closeLoading(); @@ -630,7 +630,7 @@ $(function() { setActiveTab(this); var target = $('.RuoYi_iframe[data-id="' + this.data('id') + '"]'); var url = target.attr('src'); - $.modal.loading("数据加载中，请稍后..."); + $.modal.loading("数据加载中，请稍候..."); target.attr('src', url).on('load', function() { $.modal.closeLoading(); }); @@ -645,5 +645,5 @@ $(function() { } }, } - }) + }); }); diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js index 96d613313..90bcc1b6c 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js @@ -289,7 +289,7 @@ function createMenuItem(dataUrl, menuName, isRefresh) { var str1 = ''; $('.mainContent', topWindow).find('iframe.RuoYi_iframe').hide().parents('.mainContent').append(str1); - window.parent.$.modal.loading("数据加载中，请稍后..."); + window.parent.$.modal.loading("数据加载中，请稍候..."); $('.mainContent iframe:visible', topWindow).on('load', function() { window.parent.$.modal.closeLoading(); }); 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 9704d2507..9ba44cbe8 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 @@ -73,7 +73,7 @@ var table = { fixedNumber: 0, fixedRightNumber: 0, queryParams: $.table.queryParams, - rowStyle: undefined, + rowStyle: undefined }; var options = $.extend(defaults, options); table.options = options; @@ -373,7 +373,7 @@ var table = { var dataParam = $("#" + currentId).serializeArray(); dataParam.push({ "name": "orderByColumn", "value": params.sortName }); dataParam.push({ "name": "isAsc", "value": params.sortOrder }); - $.modal.loading("正在导出数据，请稍后..."); + $.modal.loading("正在导出数据，请稍候..."); $.post(table.options.exportUrl, dataParam, function(result) { if (result.code == web_status.SUCCESS) { window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; @@ -1004,7 +1004,7 @@ var table = { dataType: dataType, data: data, beforeSend: function () { - $.modal.loading("正在处理中，请稍后..."); + $.modal.loading("正在处理中，请稍候..."); }, success: function(result) { if (typeof callback == "function") { @@ -1179,7 +1179,7 @@ var table = { dataType: "json", data: data, beforeSend: function () { - $.modal.loading("正在处理中，请稍后..."); + $.modal.loading("正在处理中，请稍候..."); $.modal.disable(); }, success: function(result) { @@ -1199,7 +1199,7 @@ var table = { dataType: "json", data: data, beforeSend: function () { - $.modal.loading("正在处理中，请稍后..."); + $.modal.loading("正在处理中，请稍候..."); }, success: function(result) { if (typeof callback == "function") { @@ -1225,7 +1225,7 @@ var table = { dataType: "json", data: data, beforeSend: function () { - $.modal.loading("正在处理中，请稍后..."); + $.modal.loading("正在处理中，请稍候..."); }, success: function(result) { if (typeof callback == "function") { diff --git a/ruoyi-admin/src/main/resources/templates/demo/modal/layer.html b/ruoyi-admin/src/main/resources/templates/demo/modal/layer.html index aeba630ef..c2f3f5ddb 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/modal/layer.html +++ b/ruoyi-admin/src/main/resources/templates/demo/modal/layer.html @@ -147,7 +147,7 @@ }) $("#button-msgReload").click(function(){ - $.modal.msgReload("保存成功,正在刷新数据请稍后……", modal_status.SUCCESS); + $.modal.msgReload("保存成功,正在刷新数据请稍候……", modal_status.SUCCESS); }) $("#button-open-1").click(function(){ diff --git a/ruoyi-admin/src/main/resources/templates/demo/operate/other.html b/ruoyi-admin/src/main/resources/templates/demo/operate/other.html index 94269650c..19da6b355 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/operate/other.html +++ b/ruoyi-admin/src/main/resources/templates/demo/operate/other.html @@ -59,7 +59,7 @@ type: "post", success: function(result) { if (result.code == web_status.SUCCESS) { - layer.msg("保存成功,正在刷新数据请稍后……", { + layer.msg("保存成功,正在刷新数据请稍候……", { icon: 1, time: 500, shade: [0.1, '#8F8F8F'] diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/dynamicColumns.html b/ruoyi-admin/src/main/resources/templates/demo/table/dynamicColumns.html index 626a27835..9338d2fa9 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/table/dynamicColumns.html +++ b/ruoyi-admin/src/main/resources/templates/demo/table/dynamicColumns.html @@ -42,7 +42,7 @@ function ajaxColumns() { var url = prefix + "/ajaxColumns"; var dataParam = $.common.formToJSON("table-form"); - $.modal.loading("正在查询中，请稍后..."); + $.modal.loading("正在查询中，请稍候..."); $.post(url, dataParam, function(result) { if (result.code == web_status.SUCCESS) { setColumns(result.data); diff --git a/ruoyi-admin/src/main/resources/templates/lock.html b/ruoyi-admin/src/main/resources/templates/lock.html index cf76e7181..ea32e7af2 100644 --- a/ruoyi-admin/src/main/resources/templates/lock.html +++ b/ruoyi-admin/src/main/resources/templates/lock.html @@ -29,9 +29,9 @@ -
系统锁屏,请输入密码登陆!
+
系统锁屏,请输入密码登录!
- 退出重新登陆 + 退出重新登录
diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index 586f3dcde..04ad28409 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -59,7 +59,7 @@
- + diff --git a/ruoyi-admin/src/main/resources/templates/register.html b/ruoyi-admin/src/main/resources/templates/register.html index e320bbf53..01b89ce34 100644 --- a/ruoyi-admin/src/main/resources/templates/register.html +++ b/ruoyi-admin/src/main/resources/templates/register.html @@ -58,7 +58,7 @@ 使用条款 - + diff --git a/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html b/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html index 6e16d8750..f64b96f28 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html @@ -198,7 +198,7 @@ $(window).on('load', function() { $('.btn-custom').on('click',function (e) { if (!croppable) { - $.modal.alertWarning("裁剪框加载中,请稍后..."); + $.modal.alertWarning("裁剪框加载中,请稍候..."); return; } var data = { @@ -214,7 +214,7 @@ $(window).on('load', function() { function submitHandler() { if (!croppable) { - $.modal.alertWarning("裁剪框加载中,请稍后..."); + $.modal.alertWarning("裁剪框加载中,请稍候..."); return } cropper.getCroppedCanvas().toBlob(function(img) { diff --git a/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html b/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html index 4175ae160..ab33c3b4f 100644 --- a/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html +++ b/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html @@ -141,7 +141,7 @@ // 预览代码 function preview(tableId) { var preViewUrl = prefix + "/preview/" + tableId; - $.modal.loading("正在加载数据，请稍后..."); + $.modal.loading("正在加载数据，请稍候..."); $.get(preViewUrl, function(result) { if (result.code == web_status.SUCCESS) { var items = []; @@ -175,7 +175,7 @@ $.modal.confirm("确定要生成" + tableName + "表代码吗？", function() { if(genType === "0") { location.href = prefix + "/download/" + tableName; - layer.msg('执行成功,正在生成代码请稍后…', { icon: 1 }); + layer.msg('执行成功,正在生成代码请稍候…', { icon: 1 }); } else if(genType === "1") { $.operate.get(prefix + "/genCode/" + tableName); } @@ -198,7 +198,7 @@ } $.modal.confirm("确认要生成选中的" + rows.length + "条数据吗?", function() { location.href = prefix + "/batchGenCode?tables=" + rows; - layer.msg('执行成功,正在生成代码请稍后…', { icon: 1 }); + layer.msg('执行成功,正在生成代码请稍候…', { icon: 1 }); }); }