github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

修正别字

pull/337/head
网游之鱼 2021-10-16 06:49:37 +00:00 committed by Gitee
parent 51251331cf
commit 774cff9c52
12 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
View File

@ -102,7 +102,7 @@ public class SysIndexController extends BaseController
SysUser user = getSysUser(); SysUser user = getSysUser();
if (StringUtils.isNull(user)) if (StringUtils.isNull(user))
{ {
return AjaxResult.error("服务器超时，请重新登陆"); return AjaxResult.error("服务器超时，请重新登录");
} }
if (passwordService.matches(user, password)) if (passwordService.matches(user, password))
{ {

6
ruoyi-admin/src/main/resources/static/ruoyi/index.js
View File

@ -309,7 +309,7 @@ $(function() {
var str1 = '<iframe class="RuoYi_iframe" name="iframe' + dataIndex + '" width="100%" height="100%" src="' + dataUrl + '" frameborder="0" data-id="' + dataUrl + '" seamless></iframe>'; var str1 = '<iframe class="RuoYi_iframe" name="iframe' + dataIndex + '" width="100%" height="100%" src="' + dataUrl + '" frameborder="0" data-id="' + dataUrl + '" seamless></iframe>';
$('.mainContent').find('iframe.RuoYi_iframe').hide().parents('.mainContent').append(str1); $('.mainContent').find('iframe.RuoYi_iframe').hide().parents('.mainContent').append(str1);
$.modal.loading("数据加载中，请稍后..."); $.modal.loading("数据加载中，请稍候...");
$('.mainContent iframe:visible').on('load', function() { $('.mainContent iframe:visible').on('load', function() {
$.modal.closeLoading(); $.modal.closeLoading();
@ -630,7 +630,7 @@ $(function() {
setActiveTab(this); setActiveTab(this);
var target = $('.RuoYi_iframe[data-id="' + this.data('id') + '"]'); var target = $('.RuoYi_iframe[data-id="' + this.data('id') + '"]');
var url = target.attr('src'); var url = target.attr('src');
$.modal.loading("数据加载中，请稍后..."); $.modal.loading("数据加载中，请稍候...");
target.attr('src', url).on('load', function() { target.attr('src', url).on('load', function() {
$.modal.closeLoading(); $.modal.closeLoading();
}); });
@ -645,5 +645,5 @@ $(function() {
} }
}, },
} }
}) });
}); });

2
ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
View File

@ -289,7 +289,7 @@ function createMenuItem(dataUrl, menuName, isRefresh) {
var str1 = '<iframe class="RuoYi_iframe" name="iframe' + dataIndex + '" width="100%" height="100%" src="' + dataUrl + '" frameborder="0" data-id="' + dataUrl + '" data-panel="' + panelUrl + '" seamless></iframe>'; var str1 = '<iframe class="RuoYi_iframe" name="iframe' + dataIndex + '" width="100%" height="100%" src="' + dataUrl + '" frameborder="0" data-id="' + dataUrl + '" data-panel="' + panelUrl + '" seamless></iframe>';
$('.mainContent', topWindow).find('iframe.RuoYi_iframe').hide().parents('.mainContent').append(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() { $('.mainContent iframe:visible', topWindow).on('load', function() {
window.parent.$.modal.closeLoading(); window.parent.$.modal.closeLoading();
}); });

12
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -73,7 +73,7 @@ var table = {
fixedNumber: 0, fixedNumber: 0,
fixedRightNumber: 0, fixedRightNumber: 0,
queryParams: $.table.queryParams, queryParams: $.table.queryParams,
rowStyle: undefined, rowStyle: undefined
}; };
var options = $.extend(defaults, options); var options = $.extend(defaults, options);
table.options = options; table.options = options;
@ -373,7 +373,7 @@ var table = {
var dataParam = $("#" + currentId).serializeArray(); var dataParam = $("#" + currentId).serializeArray();
dataParam.push({ "name": "orderByColumn", "value": params.sortName }); dataParam.push({ "name": "orderByColumn", "value": params.sortName });
dataParam.push({ "name": "isAsc", "value": params.sortOrder }); dataParam.push({ "name": "isAsc", "value": params.sortOrder });
$.modal.loading("正在导出数据，请稍后..."); $.modal.loading("正在导出数据，请稍候...");
$.post(table.options.exportUrl, dataParam, function(result) { $.post(table.options.exportUrl, dataParam, function(result) {
if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
@ -1004,7 +1004,7 @@ var table = {
dataType: dataType, dataType: dataType,
data: data, data: data,
beforeSend: function () { beforeSend: function () {
$.modal.loading("正在处理中，请稍后..."); $.modal.loading("正在处理中，请稍候...");
}, },
success: function(result) { success: function(result) {
if (typeof callback == "function") { if (typeof callback == "function") {
@ -1179,7 +1179,7 @@ var table = {
dataType: "json", dataType: "json",
data: data, data: data,
beforeSend: function () { beforeSend: function () {
$.modal.loading("正在处理中，请稍后..."); $.modal.loading("正在处理中，请稍候...");
$.modal.disable(); $.modal.disable();
}, },
success: function(result) { success: function(result) {
@ -1199,7 +1199,7 @@ var table = {
dataType: "json", dataType: "json",
data: data, data: data,
beforeSend: function () { beforeSend: function () {
$.modal.loading("正在处理中，请稍后..."); $.modal.loading("正在处理中，请稍候...");
}, },
success: function(result) { success: function(result) {
if (typeof callback == "function") { if (typeof callback == "function") {
@ -1225,7 +1225,7 @@ var table = {
dataType: "json", dataType: "json",
data: data, data: data,
beforeSend: function () { beforeSend: function () {
$.modal.loading("正在处理中，请稍后..."); $.modal.loading("正在处理中，请稍候...");
}, },
success: function(result) { success: function(result) {
if (typeof callback == "function") { if (typeof callback == "function") {

2
ruoyi-admin/src/main/resources/templates/demo/modal/layer.html
View File

@ -147,7 +147,7 @@
}) })
$("#button-msgReload").click(function(){ $("#button-msgReload").click(function(){
$.modal.msgReload("保存成功,正在刷新数据请稍后……", modal_status.SUCCESS); $.modal.msgReload("保存成功,正在刷新数据请稍候……", modal_status.SUCCESS);
}) })
$("#button-open-1").click(function(){ $("#button-open-1").click(function(){

2
ruoyi-admin/src/main/resources/templates/demo/operate/other.html
View File

@ -59,7 +59,7 @@
type: "post", type: "post",
success: function(result) { success: function(result) {
if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
layer.msg("保存成功,正在刷新数据请稍后……", { layer.msg("保存成功,正在刷新数据请稍候……", {
icon: 1, icon: 1,
time: 500, time: 500,
shade: [0.1, '#8F8F8F'] shade: [0.1, '#8F8F8F']

2
ruoyi-admin/src/main/resources/templates/demo/table/dynamicColumns.html
View File

@ -42,7 +42,7 @@
function ajaxColumns() { function ajaxColumns() {
var url = prefix + "/ajaxColumns"; var url = prefix + "/ajaxColumns";
var dataParam = $.common.formToJSON("table-form"); var dataParam = $.common.formToJSON("table-form");
$.modal.loading("正在查询中，请稍后..."); $.modal.loading("正在查询中，请稍候...");
$.post(url, dataParam, function(result) { $.post(url, dataParam, function(result) {
if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
setColumns(result.data); setColumns(result.data);

4
ruoyi-admin/src/main/resources/templates/lock.html
View File

@ -29,9 +29,9 @@
</form> </form>
</div> </div>
<div class="help-block text-center" style="margin-top: 50px;">系统锁屏,请输入密码登陆!</div> <div class="help-block text-center" style="margin-top: 50px;">系统锁屏,请输入密码登录!</div>
<div class="text-center"> <div class="text-center">
<a th:href="@{logout}">退出重新登陆</a> <a th:href="@{logout}">退出重新登录</a>
</div> </div>
</div> </div>
<script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script> <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>

2
ruoyi-admin/src/main/resources/templates/login.html
View File

@ -59,7 +59,7 @@
<div class="checkbox-custom" th:if="${isRemembered}" th:classappend="${captchaEnabled==false} ? 'm-t'"> <div class="checkbox-custom" th:if="${isRemembered}" th:classappend="${captchaEnabled==false} ? 'm-t'">
<input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label> <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>
</div> </div>
<button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍后...">登录</button> <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍候...">登录</button>
</form> </form>
</div> </div>
</div> </div>

2
ruoyi-admin/src/main/resources/templates/register.html
View File

@ -58,7 +58,7 @@
<input type="checkbox" id="acceptTerm" name="acceptTerm"> <label for="acceptTerm">我已阅读并同意</label> <input type="checkbox" id="acceptTerm" name="acceptTerm"> <label for="acceptTerm">我已阅读并同意</label>
<a href="https://gitee.com/y_project/RuoYi/blob/master/README.md" target="_blank">使用条款</a> <a href="https://gitee.com/y_project/RuoYi/blob/master/README.md" target="_blank">使用条款</a>
</div> </div>
<button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证注册，请稍后...">注册</button> <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证注册，请稍候...">注册</button>
</form> </form>
</div> </div>
</div> </div>

4
ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html
View File

@ -198,7 +198,7 @@ $(window).on('load', function() {
$('.btn-custom').on('click',function (e) { $('.btn-custom').on('click',function (e) {
if (!croppable) { if (!croppable) {
$.modal.alertWarning("裁剪框加载中,请稍后..."); $.modal.alertWarning("裁剪框加载中,请稍候...");
return; return;
} }
var data = { var data = {
@ -214,7 +214,7 @@ $(window).on('load', function() {
function submitHandler() { function submitHandler() {
if (!croppable) { if (!croppable) {
$.modal.alertWarning("裁剪框加载中,请稍后..."); $.modal.alertWarning("裁剪框加载中,请稍候...");
return return
} }
cropper.getCroppedCanvas().toBlob(function(img) { cropper.getCroppedCanvas().toBlob(function(img) {

6
ruoyi-generator/src/main/resources/templates/tool/gen/gen.html
View File

@ -141,7 +141,7 @@
// 预览代码 // 预览代码
function preview(tableId) { function preview(tableId) {
var preViewUrl = prefix + "/preview/" + tableId; var preViewUrl = prefix + "/preview/" + tableId;
$.modal.loading("正在加载数据，请稍后..."); $.modal.loading("正在加载数据，请稍候...");
$.get(preViewUrl, function(result) { $.get(preViewUrl, function(result) {
if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
var items = []; var items = [];
@ -175,7 +175,7 @@
$.modal.confirm("确定要生成" + tableName + "表代码吗？", function() { $.modal.confirm("确定要生成" + tableName + "表代码吗？", function() {
if(genType === "0") { if(genType === "0") {
location.href = prefix + "/download/" + tableName; location.href = prefix + "/download/" + tableName;
layer.msg('执行成功,正在生成代码请稍后…', { icon: 1 }); layer.msg('执行成功,正在生成代码请稍候…', { icon: 1 });
} else if(genType === "1") { } else if(genType === "1") {
$.operate.get(prefix + "/genCode/" + tableName); $.operate.get(prefix + "/genCode/" + tableName);
} }
@ -198,7 +198,7 @@
} }
$.modal.confirm("确认要生成选中的" + rows.length + "条数据吗?", function() { $.modal.confirm("确认要生成选中的" + rows.length + "条数据吗?", function() {
location.href = prefix + "/batchGenCode?tables=" + rows; location.href = prefix + "/batchGenCode?tables=" + rows;
layer.msg('执行成功,正在生成代码请稍后…', { icon: 1 }); layer.msg('执行成功,正在生成代码请稍候…', { icon: 1 });
}); });
} }