Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fgqyxxlr
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yaru
fgqyxxlr
Commits
311118d3
Commit
311118d3
authored
Apr 26, 2018
by
RuoYi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitee.com/y_project/RuoYi
parents
cda62b32
1cfb9c4a
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
52 additions
and
73 deletions
+52
-73
doc/若依环境使用手册v1.0.docx
+0
-0
sql/quartz.sql
+0
-0
sql/ruoyi.html
+0
-0
sql/ruoyi.pdm
+0
-0
sql/ry_20180423.sql
+0
-0
src/main/resources/mybatis/tool/GenMapper.xml
+1
-1
src/main/resources/static/ruoyi/js/common.js
+1
-18
src/main/resources/static/ruoyi/js/ry-ui.js
+1
-1
src/main/resources/static/ruoyi/monitor/job/job.js
+8
-8
src/main/resources/static/ruoyi/monitor/job/jobLog.js
+4
-4
src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js
+2
-2
src/main/resources/static/ruoyi/monitor/online/online.js
+4
-4
src/main/resources/static/ruoyi/monitor/operlog/operlog.js
+2
-2
src/main/resources/static/ruoyi/system/dict/data/data.js
+4
-4
src/main/resources/static/ruoyi/system/dict/type/type.js
+4
-4
src/main/resources/static/ruoyi/system/post/post.js
+4
-4
src/main/resources/static/ruoyi/system/role/role.js
+4
-4
src/main/resources/static/ruoyi/system/user/user.js
+4
-4
src/main/resources/static/ruoyi/tool/gen/gen.js
+3
-8
src/main/resources/templates/vm/js/add.js.vm
+2
-1
src/main/resources/templates/vm/js/list.js.vm
+4
-4
No files found.
doc/若依环境使用手册v1.0.docx
0 → 100644
View file @
311118d3
File added
doc
/quartz.sql
→
sql
/quartz.sql
View file @
311118d3
File moved
doc/ruoyi矢量图
.html
→
sql/ruoyi
.html
View file @
311118d3
File moved
doc
/ruoyi.pdm
→
sql
/ruoyi.pdm
View file @
311118d3
File moved
doc
/ry_20180423.sql
→
sql
/ry_20180423.sql
View file @
311118d3
File moved
src/main/resources/mybatis/tool/GenMapper.xml
View file @
311118d3
...
...
@@ -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>
...
...
src/main/resources/static/ruoyi/js/common.js
View file @
311118d3
...
...
@@ -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
);
...
...
src/main/resources/static/ruoyi/js/ry-ui.js
View file @
311118d3
...
...
@@ -51,7 +51,7 @@ $(function(){
},
function
()
{
callBack
(
true
);
},
function
()
{
callBack
(
false
)
//
callBack(false)
});
}
// 关闭窗体
...
...
src/main/resources/static/ruoyi/monitor/job/job.js
View file @
311118d3
...
...
@@ -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"
);
});
}
...
...
src/main/resources/static/ruoyi/monitor/job/jobLog.js
View file @
311118d3
...
...
@@ -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"
);
});
}
src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js
View file @
311118d3
...
...
@@ -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"
);
});
}
src/main/resources/static/ruoyi/monitor/online/online.js
View file @
311118d3
...
...
@@ -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"
);
});
}
src/main/resources/static/ruoyi/monitor/operlog/operlog.js
View file @
311118d3
...
...
@@ -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"
);
});
}
src/main/resources/static/ruoyi/system/dict/data/data.js
View file @
311118d3
...
...
@@ -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"
);
});
}
src/main/resources/static/ruoyi/system/dict/type/type.js
View file @
311118d3
...
...
@@ -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"
);
});
}
src/main/resources/static/ruoyi/system/post/post.js
View file @
311118d3
...
...
@@ -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"
);
});
}
src/main/resources/static/ruoyi/system/role/role.js
View file @
311118d3
...
...
@@ -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"
);
});
}
src/main/resources/static/ruoyi/system/user/user.js
View file @
311118d3
...
...
@@ -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"
);
});
}
src/main/resources/static/ruoyi/tool/gen/gen.js
View file @
311118d3
...
...
@@ -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
);
});
}
src/main/resources/templates/vm/js/add.js.vm
View file @
311118d3
...
...
@@ -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());
}
\ No newline at end of file
src/main/resources/templates/vm/js/list.js.vm
View file @
311118d3
...
...
@@ -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");
});
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment