ruoyi/RuoYi
1
0
Fork 0
mirror of https://github.com/yangzongzhuan/RuoYi.git synced 2025-10-18 11:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

若依2.2版本发布

Browse Source
This commit is contained in:
RuoYi
2018-07-22 23:05:50 +08:00
parent 9e8d80a699
commit cc9c67cdfb
115 changed files with 1579 additions and 1216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/templates/monitor/job/add.html
View File

@@ -46,7 +46,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_job_status')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_job_status')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@@ -85,7 +85,7 @@
},
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-job-add').serialize());
$.operate.save(prefix + "/add", $('#form-job-add').serialize());
}
});
</script>

4
src/main/resources/templates/monitor/job/edit.html
View File

@@ -47,7 +47,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_job_status')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_job_status')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@@ -86,7 +86,7 @@
},
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-job-edit').serialize());
$.operate.save(prefix + "/edit", $('#form-job-edit').serialize());
}
});
</script>

15
src/main/resources/templates/monitor/job/job.html
View File

@@ -18,7 +18,7 @@
方法名称：<input type="text" name="methodName"/>
</li>
<li>
任务状态：<select name="status" th:with="type=${@dictService.selectDictData('sys_job_status')}">
任务状态：<select name="status" th:with="type=${@dict.getType('sys_job_status')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@@ -51,9 +51,10 @@
</div>
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('monitor:job:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('monitor:job:remove')}]];
var statusFlag = [[${@permissionService.hasPermi('monitor:job:changeStatus')}]];
var editFlag = [[${@permission.hasPermi('monitor:job:edit')}]];
var removeFlag = [[${@permission.hasPermi('monitor:job:remove')}]];
var statusFlag = [[${@permission.hasPermi('monitor:job:changeStatus')}]];
var datas = [[${@dict.getType('sys_job_status')}]];
var prefix = ctx + "monitor/job"
$(function() {
@@ -102,11 +103,7 @@
title: '任务状态',
align: 'center',
formatter: function(value, row, index) {
if (value == 0) {
return '<span class="badge badge-primary">正常</span>';
} else if (value == 1) {
return '<span class="badge badge-danger">暂停</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{

11
src/main/resources/templates/monitor/job/jobLog.html
View File

@@ -18,7 +18,7 @@
<label>方法名称：</label><input type="text" name="methodName"/>
</li>
<li>
<label>执行状态：</label><select name="status" th:with="type=${@dictService.selectDictData('sys_common_status')}">
<label>执行状态：</label><select name="status" th:with="type=${@dict.getType('sys_common_status')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@@ -51,7 +51,8 @@
</div>
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var removeFlag = [[${@permissionService.hasPermi('monitor:job:remove')}]];
var removeFlag = [[${@permission.hasPermi('monitor:job:remove')}]];
var datas = [[${@dict.getType('sys_job_status')}]];
var prefix = ctx + "monitor/jobLog"
$(function() {
@@ -98,11 +99,7 @@
title: '状态',
align: 'center',
formatter: function(value, row, index) {
if (value == 0) {
return '<span class="badge badge-primary">正常</span>';
} else if (value == 1) {
return '<span class="badge badge-danger">失败</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{

11
src/main/resources/templates/monitor/logininfor/logininfor.html
View File

@@ -18,7 +18,7 @@
<label>登录名称：</label><input type="text" name="loginName"/>
</li>
<li>
<label>登录状态：</label><select name="status" th:with="type=${@dictService.selectDictData('sys_common_status')}">
<label>登录状态：</label><select name="status" th:with="type=${@dict.getType('sys_common_status')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@@ -51,7 +51,8 @@
</div>
<div th:include="include :: footer"></div>
<script type="text/javascript">
<script th:inline="javascript">
var datas = [[${@dict.getType('sys_common_status')}]];
var prefix = ctx + "monitor/logininfor"
$(function() {
@@ -96,11 +97,7 @@
title: '登录状态',
align: 'center',
formatter: function(value, row, index) {
if (value == 0) {
return '<span class="badge badge-primary">成功</span>';
} else if (value == 1) {
return '<span class="badge badge-danger">失败</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{

2
src/main/resources/templates/monitor/online/online.html
View File

@@ -38,7 +38,7 @@
</div>
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var forceFlag = [[${@permissionService.hasPermi('monitor:online:forceLogout')}]];
var forceFlag = [[${@permission.hasPermi('monitor:online:forceLogout')}]];
var prefix = ctx + "monitor/online"
$(function() {

2
src/main/resources/templates/monitor/operlog/detail.html
View File

@@ -8,7 +8,7 @@
<form class="form-horizontal m-t" id="signupForm">
<div class="form-group">
<label class="col-sm-2 control-label">操作模块：</label>
<div class="form-control-static" th:text="${operLog.title} + ' / ' + ${operLog.action}">
<div class="form-control-static" th:text="${operLog.title} + ' / ' + ${@dict.getLabel('sys_oper_type',operLog.action)}">
</div>
</div>
<div class="form-group">

27
src/main/resources/templates/monitor/operlog/operlog.html
View File

@@ -18,7 +18,7 @@
<label>操作人员： </label><input type="text" name="operName"/>
</li>
<li>
<label>操作类型： </label><select name="action" th:with="type=${@dictService.selectDictData('sys_oper_type')}">
<label>操作类型： </label><select name="action" th:with="type=${@dict.getType('sys_oper_type')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@@ -52,7 +52,8 @@
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var detailFlag = [[${@permissionService.hasPermi('monitor:operlog:detail')}]];
var detailFlag = [[${@permission.hasPermi('monitor:operlog:detail')}]];
var datas = [[${@dict.getType('sys_oper_type')}]];
var prefix = ctx + "monitor/operlog"
$(function() {
@@ -80,27 +81,7 @@
title: '操作类型',
align: 'center',
formatter: function(value, row, index) {
if (value == 1) {
return '<span class="badge badge-primary">新增</span>';
} else if (value == 2) {
return '<span class="badge badge-primary">修改</span>';
} else if (value == 3) {
return '<span class="badge badge-warning">保存</span>';
} else if (value == 4) {
return '<span class="badge badge-danger">删除</span>';
} else if (value == 5) {
return '<span class="badge badge-primary">授权</span>';
} else if (value == 6) {
return '<span class="badge badge-warning">导出</span>';
} else if (value == 7) {
return '<span class="badge badge-warning">导入</span>';
} else if (value == 8) {
return '<span class="badge badge-danger">强退</span>';
} else if (value == 9) {
return '<span class="badge badge-danger">禁止访问</span>';
} else if (value == 10) {
return '<span class="badge badge-warning">生成代码</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{