hhyykk/RuoYi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

若依开源 1.1.5发布

Browse Source
This commit is contained in:
RuoYi
2018-05-26 14:27:56 +08:00
parent 548f3c2867
commit 595b0312f5
87 changed files with 466 additions and 1467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/resources/templates/system/user/add.html
View File

@@ -47,11 +47,10 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">性别：</label>
<div class="col-sm-8" th:with="datas=${@dictService.selectDictData('sys_user_sex')}">
<div th:each="dict : ${datas}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="sex" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
</div>
<div class="col-sm-8">
<select id="sex" class="form-control m-b" th:with="type=${@dictService.selectDictData('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
</select>
</div>
</div>
<div class="form-group">

9
src/main/resources/templates/system/user/edit.html
View File

@@ -42,11 +42,10 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">性别：</label>
<div class="col-sm-8" th:with="datas=${@dictService.selectDictData('sys_user_sex')}">
<div th:each="dict : ${datas}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="sex" th:value="${dict['dictValue']}" th:field="*{user.sex}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
</div>
<div class="col-sm-8">
<select id="sex" class="form-control m-b" th:with="type=${@dictService.selectDictData('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}" th:field="*{user.sex}"></option>
</select>
</div>
</div>
<div class="form-group">

2
src/main/resources/templates/system/user/profile/profile.html
View File

@@ -46,7 +46,7 @@
<p><i class="fa fa-group"></i> [[${user.dept.deptName}]] / [[${#strings.defaultString(postGroup,'无岗位')}]]</p>
<p><i class="fa fa-transgender"></i> [[${user.sex}]]</p>
<p><i class="fa fa-envelope-o"></i> [[${user.email}]]</p>
<p><i class="fa fa-calendar"></i> [[${#dates.format(user.loginDate, 'yyyy-MM-dd HH:mm:ss')}]]</p>
<p><i class="fa fa-calendar"></i> [[${user.createTimeStr}]]</p>
</div>
<div class="clearfix"></div>
</a>

2
src/main/resources/templates/system/user/user.html
View File

@@ -29,7 +29,7 @@
</div>
<div class="wrapper wrapper-content ui-layout-center">
<div class="btn-group hidden-xs" id="tableToolbar" role="group">
<div class="btn-group hidden-xs" id="toolbar" role="group">
<button class="btn btn-outline btn-default" onclick="javascript:add()" shiro:hasPermission="system:user:add">
<i class="fa fa-plus"></i> 新增
</button>