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

Merge branch 'master' of https://gitee.com/y_project/RuoYi

pull/2/head
RuoYi 2018-04-26 16:04:19 +08:00
parent cda62b328c 1cfb9c4a44
commit 311118d37e
21 changed files with 51 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/若依环境使用手册v1.0.docx Normal file
View File

Binary file not shown.

0
doc/quartz.sql → sql/quartz.sql
View File

0
doc/ruoyi矢量图.html → sql/ruoyi.html
View File

0
doc/ruoyi.pdm → sql/ruoyi.pdm
View File

0
doc/ry_20180423.sql → sql/ry_20180423.sql
View File

2
src/main/resources/mybatis/tool/GenMapper.xml
View File

@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTableByName" parameterType="String" resultMap="TableInfoResult">
select table_name, table_comment, create_time, update_time
from information_schema.tables
where table_name like 'sys_%' and table_schema = (select database())
where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
and table_name = #{tableName}
</select>

19
src/main/resources/static/ruoyi/js/common.js
View File

@ -65,10 +65,7 @@ _ajax_save = function(url, data) {
};
//对jquery的ajax方法再次封装
_ajax = function(url, data, type, r) {
if (!r) {
return;
}
_ajax = function(url, data, type) {
var config = {
url: url,
type: type,
@ -102,20 +99,6 @@ function handleSuccess(result) {
}
}
$(document).ready(function() {
$(".onoffswitch-checkbox").on('click', function(){
clickSwitch()
});
var clickSwitch = function() {
if ($(".onoffswitch-checkbox").is(':checked')) {
alert("在ON的状态下");
} else {
alert("在OFF的状态下");
}
};
});
/** 时间格式化 */
function formatDate(_date, _pattern) {
var date = new Date(_date);

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

@ -51,7 +51,7 @@ $(function(){
}, function () {
callBack(true);
}, function () {
callBack(false)
// callBack(false)
});
}
// 关闭窗体

16
src/main/resources/static/ruoyi/monitor/job/job.js
View File

@ -69,15 +69,15 @@ function statusTools(row) {
/*调度任务-停用*/
function stop(obj, jobId) {
$.modalConfirm("确认要停用吗？", function(r) {
_ajax(prefix + "/changeStatus/", { "jobId": jobId, "status": 1 }, "post", r);
$.modalConfirm("确认要停用吗？", function() {
_ajax(prefix + "/changeStatus/", { "jobId": jobId, "status": 1 }, "post");
})
}
/*调度任务-启用*/
function start(obj, jobId) {
$.modalConfirm("确认要启用吗？", function(r) {
_ajax(prefix + "/changeStatus/", { "jobId": jobId, "status": 0 }, "post", r);
$.modalConfirm("确认要启用吗？", function() {
_ajax(prefix + "/changeStatus/", { "jobId": jobId, "status": 0 }, "post");
})
}
@ -95,8 +95,8 @@ function edit(jobId) {
// 单条删除
function remove(id) {
$.modalConfirm("确定要删除选中调度任务吗？", function(r) {
_ajax(prefix + "/remove/" + id, "", "post", r);
$.modalConfirm("确定要删除选中调度任务吗？", function() {
_ajax(prefix + "/remove/" + id, "", "post");
})
}
@ -107,8 +107,8 @@ function batchRemove() {
$.modalMsg("请选择要删除的数据", "warning");
return;
}
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function(r) {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post", r);
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post");
});
}

8
src/main/resources/static/ruoyi/monitor/job/jobLog.js
View File

@ -59,8 +59,8 @@ $(function() {
// 单条删除
function remove(jobLogId) {
$.modalConfirm("确定要删除选中岗位吗？", function(r) {
_ajax(prefix + "/remove/" + jobLogId, "", "post", r);
$.modalConfirm("确定要删除选中岗位吗？", function() {
_ajax(prefix + "/remove/" + jobLogId, "", "post");
})
}
@ -71,7 +71,7 @@ function batchRemove() {
$.modalMsg("请选择要删除的数据", "warning");
return;
}
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function(r) {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post", r);
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post");
});
}

4
src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js
View File

@ -55,7 +55,7 @@ function batchRemove() {
$.modalMsg("请选择要删除的数据", "warning");
return;
}
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function(r) {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post", r);
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post");
});
}

8
src/main/resources/static/ruoyi/monitor/online/online.js
View File

@ -62,8 +62,8 @@ $(function() {
// 单条强退
function forceLogout(id) {
$.modalConfirm("确定要强制选中用户下线吗？", function(r) {
_ajax(prefix + "/forceLogout/" + id, "", "post", r);
$.modalConfirm("确定要强制选中用户下线吗？", function() {
_ajax(prefix + "/forceLogout/" + id, "", "post");
})
}
@ -74,7 +74,7 @@ function batchForceLogout() {
$.modalMsg("请选择要删除的数据", "warning");
return;
}
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function(r) {
_ajax(prefix + '/batchForceLogout', { "ids": rows }, "post", r);
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
_ajax(prefix + '/batchForceLogout', { "ids": rows }, "post");
});
}

4
src/main/resources/static/ruoyi/monitor/operlog/operlog.js
View File

@ -70,7 +70,7 @@ function batchRemove() {
$.modalMsg("请选择要删除的数据", "warning");
return;
}
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function(r) {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post", r);
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post");
});
}

8
src/main/resources/static/ruoyi/system/dict/data/data.js
View File

@ -73,8 +73,8 @@ function detail(id) {
//单条删除
function remove(id) {
$.modalConfirm("确定要删除选中字典数据吗？", function(r) {
_ajax(prefix + "/remove/" + id, "", "post", r);
$.modalConfirm("确定要删除选中字典数据吗？", function() {
_ajax(prefix + "/remove/" + id, "", "post");
})
}
@ -85,7 +85,7 @@ function batchRemove() {
$.modalMsg("请选择要删除的数据", "warning");
return;
}
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function(r) {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post", r);
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post");
});
}

8
src/main/resources/static/ruoyi/system/dict/type/type.js
View File

@ -71,8 +71,8 @@ function detail(dictId) {
//单条删除
function remove(id) {
$.modalConfirm("确定要删除选中字典吗？", function(r) {
_ajax(prefix + "/remove/" + id, "", "post", r);
$.modalConfirm("确定要删除选中字典吗？", function() {
_ajax(prefix + "/remove/" + id, "", "post");
})
}
@ -83,7 +83,7 @@ function batchRemove() {
$.modalMsg("请选择要删除的数据", "warning");
return;
}
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function(r) {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post", r);
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post");
});
}

8
src/main/resources/static/ruoyi/system/post/post.js
View File

@ -64,8 +64,8 @@ function edit(postId) {
// 单条删除
function remove(id) {
$.modalConfirm("确定要删除选中岗位吗？", function(r) {
_ajax(prefix + "/remove/" + id, "", "post", r);
$.modalConfirm("确定要删除选中岗位吗？", function() {
_ajax(prefix + "/remove/" + id, "", "post");
})
}
@ -76,7 +76,7 @@ function batchRemove() {
$.modalMsg("请选择要删除的数据", "warning");
return;
}
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function(r) {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post", r);
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post");
});
}

8
src/main/resources/static/ruoyi/system/role/role.js
View File

@ -64,8 +64,8 @@ function edit(roleId) {
// 单条删除
function remove(id) {
$.modalConfirm("确定要删除选中角色吗？", function(r) {
_ajax(prefix + "/remove/" + id, "", "post", r);
$.modalConfirm("确定要删除选中角色吗？", function() {
_ajax(prefix + "/remove/" + id, "", "post");
})
}
@ -76,7 +76,7 @@ function batchRemove() {
$.modalMsg("请选择要删除的数据", "warning");
return;
}
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function(r) {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post", r);
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post");
});
}

8
src/main/resources/static/ruoyi/system/user/user.js
View File

@ -114,8 +114,8 @@ function dept() {
/*用户管理-删除*/
function remove(userId) {
$.modalConfirm("确定要删除选中用户吗？", function(r) {
_ajax(prefix + "/remove/" + userId, "", "post", r);
$.modalConfirm("确定要删除选中用户吗？", function() {
_ajax(prefix + "/remove/" + userId, "", "post");
})
}
@ -144,7 +144,7 @@ function batchRemove() {
$.modalMsg("请选择要删除的数据", "warning");
return;
}
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function(r) {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post", r);
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post");
});
}

11
src/main/resources/static/ruoyi/tool/gen/gen.js
View File

@ -34,11 +34,9 @@ $(function() {
// 生成代码
function genCode(tableName) {
$.modalConfirm("确定要生成" + tableName + "表代码吗？", function(r) {
if (!r) {
return;
}
$.modalConfirm("确定要生成" + tableName + "表代码吗？", function() {
location.href = prefix + "/genCode/" + tableName;
layer.msg('执行成功,正在生成代码请稍后…', {icon: 1});
})
}
@ -49,10 +47,7 @@ function batchGenCode() {
$.modalMsg("请选择要生成的数据", "warning");
return;
}
$.modalConfirm("确认要生成选中的" + rows.length + "条数据吗?", function(r) {
if (!r) {
return;
}
$.modalConfirm("确认要生成选中的" + rows.length + "条数据吗?", function() {
location.href = prefix + "/batchGenCode?tables=" + JSON.stringify(rows);
});
}

2
src/main/resources/templates/vm/js/add.js.vm
View File

@ -10,5 +10,5 @@ $("#form-${classname}-add").validate({
});
function add() {
_ajax_post("/${moduleName}/${classname}/save", $('#form-${classname}-add').serialize());
_ajax_save("/${moduleName}/${classname}/save", $('#form-${classname}-add').serialize());
}

8
src/main/resources/templates/vm/js/list.js.vm
View File

@ -38,8 +38,8 @@ function edit(${primaryKey.attrname}) {
// 单条删除
function remove(id) {
$.modalConfirm("确定要删除选中${tableComment}吗？", function(r) {
_ajax(prefix + "/remove/" + id, "", "post", r);
$.modalConfirm("确定要删除选中${tableComment}吗？", function() {
_ajax(prefix + "/remove/" + id, "", "post");
})
}
@ -50,7 +50,7 @@ function batchRemove() {
$.modalMsg("请选择要删除的数据", "warning");
return;
}
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function(r) {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post", r);
$.modalConfirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
_ajax(prefix + '/batchRemove', { "ids": rows }, "post");
});
}