root
/
boot-security
mirror of https://gitee.com/zhang_1334717033/boot-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

!3 dict 

Merge pull request !3 from zwzw1219/dict
master
zwzw1219 2017-11-18 21:33:50 +08:00
parent 3e72e48d09
commit 644cfd085b
17 changed files with 630 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
doc/db/boot_security.sql
View File

@ -277,7 +277,10 @@ INSERT INTO `sys_permission` VALUES ('33', '30', '删除', '', '', '2', 'job:del
INSERT INTO `sys_permission` VALUES ('34', '0', 'excel导出', 'fa-arrow-circle-down', 'pages/excel/sql.html', '1', '', '16');
INSERT INTO `sys_permission` VALUES ('35', '34', '导出', '', '', '2', 'excel:down', '100');
INSERT INTO `sys_permission` VALUES ('36', '34', '页面显示数据', '', '', '2', 'excel:show:datas', '100');
INSERT INTO `sys_permission` VALUES ('37', '0', '字典管理', 'fa-reddit', 'pages/dict/dictList.html', '1', '', '17');
INSERT INTO `sys_permission` VALUES ('38', '37', '查询', '', '', '2', 'dict:query', '100');
INSERT INTO `sys_permission` VALUES ('39', '37', '新增', '', '', '2', 'dict:add', '100');
INSERT INTO `sys_permission` VALUES ('40', '37', '删除', '', '', '2', 'dict:del', '100');
-- ----------------------------
-- Table structure for sys_role
-- ----------------------------
@ -346,6 +349,10 @@ INSERT INTO `sys_role_permission` VALUES ('1', '33');
INSERT INTO `sys_role_permission` VALUES ('1', '34');
INSERT INTO `sys_role_permission` VALUES ('1', '35');
INSERT INTO `sys_role_permission` VALUES ('1', '36');
INSERT INTO `sys_role_permission` VALUES ('1', '37');
INSERT INTO `sys_role_permission` VALUES ('1', '38');
INSERT INTO `sys_role_permission` VALUES ('1', '39');
INSERT INTO `sys_role_permission` VALUES ('1', '40');
INSERT INTO `sys_role_permission` VALUES ('2', '1');
INSERT INTO `sys_role_permission` VALUES ('2', '2');
INSERT INTO `sys_role_permission` VALUES ('2', '3');
@ -419,6 +426,33 @@ CREATE TABLE `sys_user` (
INSERT INTO `sys_user` VALUES ('1', 'admin', '$2a$10$iYM/H7TrSaLs7XyIWQdGwe1xf4cdmt3nwMja6RT0wxG5YY1RjN0EK', '管理员', null, '', '', '', '1998-07-01', '0', '1', '2017-04-10 15:21:38', '2017-07-06 09:20:19');
INSERT INTO `sys_user` VALUES ('2', 'user', '$2a$10$ooGb4wjT7Hg3zgU2RhZp6eVu3jvG29i/U4L6VRwiZZ4.DZ0OOEAHu', '用户', null, '', '', '', null, '1', '1', '2017-08-01 21:47:18', '2017-08-01 21:47:18');
-- ----------------------------
-- Table structure for t_dict
-- ----------------------------
DROP TABLE IF EXISTS `t_dict`;
CREATE TABLE `t_dict` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`type` varchar(16) NOT NULL,
`k` varchar(16) NOT NULL,
`val` varchar(64) NOT NULL,
`createTime` datetime NOT NULL,
`updateTime` datetime NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `type` (`type`,`k`)
) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4;
-- ----------------------------
-- Records of t_dict
-- ----------------------------
INSERT INTO `t_dict` VALUES ('1', 'sex', '0', '女', '2017-11-17 09:58:24', '2017-11-18 14:21:05');
INSERT INTO `t_dict` VALUES ('2', 'sex', '1', '男', '2017-11-17 10:03:46', '2017-11-17 10:03:46');
INSERT INTO `t_dict` VALUES ('3', 'userStatus', '0', '无效', '2017-11-17 16:26:06', '2017-11-17 16:26:09');
INSERT INTO `t_dict` VALUES ('4', 'userStatus', '1', '正常', '2017-11-17 16:26:06', '2017-11-17 16:26:09');
INSERT INTO `t_dict` VALUES ('5', 'userStatus', '2', '锁定', '2017-11-17 16:26:06', '2017-11-17 16:26:09');
INSERT INTO `t_dict` VALUES ('6', 'noticeStatus', '0', '草稿', '2017-11-17 16:26:06', '2017-11-17 16:26:09');
INSERT INTO `t_dict` VALUES ('7', 'noticeStatus', '1', '发布', '2017-11-17 16:26:06', '2017-11-17 16:26:09');
INSERT INTO `t_dict` VALUES ('8', 'isRead', '0', '未读', '2017-11-17 16:26:06', '2017-11-17 16:26:09');
INSERT INTO `t_dict` VALUES ('9', 'isRead', '1', '已读', '2017-11-17 16:26:06', '2017-11-17 16:26:09');
-- ----------------------------
-- Table structure for t_job
-- ----------------------------

91
src/main/java/com/boot/security/server/controller/DictController.java Normal file
View File

@ -0,0 +1,91 @@
package com.boot.security.server.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.boot.security.server.dao.DictDao;
import com.boot.security.server.model.Dict;
import com.boot.security.server.page.table.PageTableHandler;
import com.boot.security.server.page.table.PageTableHandler.CountHandler;
import com.boot.security.server.page.table.PageTableHandler.ListHandler;
import com.boot.security.server.page.table.PageTableRequest;
import com.boot.security.server.page.table.PageTableResponse;
import io.swagger.annotations.ApiOperation;
@RestController
@RequestMapping("/dicts")
public class DictController {
@Autowired
private DictDao dictDao;
@PreAuthorize("hasAuthority('dict:add')")
@PostMapping
@ApiOperation(value = "保存")
public Dict save(@RequestBody Dict dict) {
Dict d = dictDao.getByTypeAndK(dict.getType(), dict.getK());
if (d != null) {
throw new IllegalArgumentException("类型和key已存在");
}
dictDao.save(dict);
return dict;
}
@GetMapping("/{id}")
@ApiOperation(value = "根据id获取")
public Dict get(@PathVariable Long id) {
return dictDao.getById(id);
}
@PreAuthorize("hasAuthority('dict:add')")
@PutMapping
@ApiOperation(value = "修改")
public Dict update(@RequestBody Dict dict) {
dictDao.update(dict);
return dict;
}
@PreAuthorize("hasAuthority('dict:query')")
@GetMapping(params = { "start", "length" })
@ApiOperation(value = "列表")
public PageTableResponse list(PageTableRequest request) {
return new PageTableHandler(new CountHandler() {
@Override
public int count(PageTableRequest request) {
return dictDao.count(request.getParams());
}
}, new ListHandler() {
@Override
public List<Dict> list(PageTableRequest request) {
return dictDao.list(request.getParams(), request.getOffset(), request.getLimit());
}
}).handle(request);
}
@PreAuthorize("hasAuthority('dict:del')")
@DeleteMapping("/{id}")
@ApiOperation(value = "删除")
public void delete(@PathVariable Long id) {
dictDao.delete(id);
}
@GetMapping(params = "type")
public List<Dict> listByType(String type) {
return dictDao.listByType(type);
}
}

40
src/main/java/com/boot/security/server/dao/DictDao.java Normal file
View File

@ -0,0 +1,40 @@
package com.boot.security.server.dao;
import java.util.List;
import java.util.Map;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Options;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.boot.security.server.model.Dict;
@Mapper
public interface DictDao {
@Select("select * from t_dict t where t.id = #{id}")
Dict getById(Long id);
@Delete("delete from t_dict where id = #{id}")
int delete(Long id);
int update(Dict dict);
@Options(useGeneratedKeys = true, keyProperty = "id")
@Insert("insert into t_dict(type, k, val, createTime, updateTime) values(#{type}, #{k}, #{val}, now(), now())")
int save(Dict dict);
int count(@Param("params") Map<String, Object> params);
List<Dict> list(@Param("params") Map<String, Object> params, @Param("offset") Integer offset,
@Param("limit") Integer limit);
@Select("select * from t_dict t where t.type = #{type} and k = #{k}")
Dict getByTypeAndK(@Param("type") String type, @Param("k") String k);
@Select("select * from t_dict t where t.type = #{type}")
List<Dict> listByType(String type);
}

34
src/main/java/com/boot/security/server/model/Dict.java Normal file
View File

@ -0,0 +1,34 @@
package com.boot.security.server.model;
public class Dict extends BaseEntity<Long> {
private static final long serialVersionUID = -2431140186410912787L;
private String type;
private String k;
private String val;
public String getType() {
return type;
}
public String setType() {
return type;
}
public String getK() {
return k;
}
public String setK() {
return k;
}
public String getVal() {
return val;
}
public String setVal() {
return val;
}
}

55
src/main/resources/mybatis-mappers/DictMapper.xml Normal file
View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.boot.security.server.dao.DictDao">
<sql id="where">
<where>
<if test="params.id != null and params.id != ''">
and id = #{params.id}
</if>
<if test="params.type != null and params.type != ''">
and type = #{params.type}
</if>
<if test="params.k != null and params.k != ''">
and k = #{params.k}
</if>
<if test="params.val != null and params.val != ''">
and val = #{params.val}
</if>
</where>
</sql>
<select id="count" resultType="int">
select count(1) from t_dict t
<include refid="where" />
</select>
<select id="list" resultType="Dict">
select * from t_dict t
<include refid="where" />
${params.orderBy}
limit #{offset}, #{limit}
</select>
<update id="update">
update t_dict t
<set>
<if test="type != null">
type = #{type},
</if>
<if test="k != null">
k = #{k},
</if>
<if test="val != null">
val = #{val},
</if>
updateTime = now()
</set>
where t.id = #{id}
</update>
</mapper>

36
src/main/resources/static/js/dict.js Normal file
View File

@ -0,0 +1,36 @@
function showDictSelect(id, type, all) {
var data = getDict(type);
var select = $("#" + id);
select.empty();
if (all != undefined || all) {
select.append("<option value=''>全部</option>");
}
$.each(data, function(k, v) {
select.append("<option value ='" + k + "'>" + v + "</option>");
});
return data;
}
function getDict(type) {
var v = sessionStorage[type];
if (v == null || v == "") {
$.ajax({
type : 'get',
url : '/dicts?type=' + type,
async : false,
success : function(data) {
v = {};
$.each(data, function(i, d) {
v[d.k] = d.val;
});
sessionStorage[type] = JSON.stringify(v);
}
});
}
return JSON.parse(sessionStorage[type]);
}

78
src/main/resources/static/pages/dict/addDict.html Normal file
View File

@ -0,0 +1,78 @@
<!DOCTYPE html>
<html>
<head>
<link rel="stylesheet" type="text/css" media="screen" href="../../css/bootstrap.min.css">
</head>
<body>
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<form class="form-horizontal" onsubmit="return false" id="form">
<fieldset>
<div class='form-group'>
<label class='col-md-2 control-label'>type</label>
<div class='col-md-10'>
<input class='form-control' placeholder='type' type='text' name='type' id='type' data-bv-notempty='true' data-bv-notempty-message='type 不能为空'>
</div>
</div>
<div class='form-group'>
<label class='col-md-2 control-label'>k</label>
<div class='col-md-10'>
<input class='form-control' placeholder='k' type='text' name='k' id='k' data-bv-notempty='true' data-bv-notempty-message='k 不能为空'>
</div>
</div>
<div class='form-group'>
<label class='col-md-2 control-label'>val</label>
<div class='col-md-10'>
<input class='form-control' placeholder='val' type='text' name='val' id='val' data-bv-notempty='true' data-bv-notempty-message='val 不能为空'>
</div>
</div>
<div class="form-actions">
<div class="row" align="center">
<div class="col-md-12">
<button class="btn btn-primary" onclick="location.href='dictList.html'">返回</button>
<button class="btn btn-primary" type="submit" onclick="add()">
<i class="fa fa-save"></i> 保存
</button>
</div>
</div>
</div>
</fieldset>
</form>
</div>
<script type="text/javascript" src="../../js/libs/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="../../js/jq.js"></script>
<script type="text/javascript" src="../../js/plugin/bootstrapvalidator/bootstrapValidator.min.js"></script>
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../layui/layui.js"></script>
<script type="text/javascript">
layui.use(['layer','laydate'], function(){
var layer = layui.layer;
});
function add() {
$('#form').bootstrapValidator();
var bootstrapValidator = $("#form").data('bootstrapValidator');
bootstrapValidator.validate();
if(!bootstrapValidator.isValid()){
return;
}
var formdata = $("#form").serializeObject();
$.ajax({
type : 'post',
url : '/dicts',
contentType: "application/json; charset=utf-8",
data : JSON.stringify(formdata),
success : function(data) {
layer.msg("添加成功", {shift: -1, time: 1000}, function(){
location.href = "dictList.html";
});
}
});
}
</script>
</body>
</html>

138
src/main/resources/static/pages/dict/dictList.html Normal file
View File

@ -0,0 +1,138 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Insert title here</title>
<link rel="stylesheet" type="text/css" media="screen" href="../../css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" media="screen" href="../../css/dataTables.bootstrap.min.css">
<link rel="stylesheet" href="../../layui/css/layui.css" media="all" />
</head>
<body>
<div>
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<div>
<header style="height: 100%">
<div align="left">
<table style="width: 100%">
<tr>
<td>
<form class="form-inline" onsubmit="return false">
<div class="form-group">
type：
<input id="type" type="text" class="form-control" placeholder="type">
<button id="searchBt" class="layui-btn layui-btn-sm" permission="dict:query"><i class="layui-icon">&#xe615;</i>搜索</button>
</div>
</form>
</td>
<td align="right">
<button class="layui-btn layui-btn-sm" onclick="location.href='addDict.html'" permission="dict:add">
<i class="layui-icon">&#xe608;</i> 添加
</button>
</td>
</tr>
</table>
</div>
</header>
<div>
<div class="widget-body no-padding">
<table id="dt-table" class="table table-striped table-bordered table-hover" style="width:100%">
<thead>
<tr>
</tr>
<tr>
<th>id</th>
<th>type</th>
<th>k</th>
<th>val</th>
<th>createTime</th>
<th>updateTime</th>
<th>操作</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
<script type="text/javascript" src="../../js/libs/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="../../js/jq.js"></script>
<script type="text/javascript" src="../../js/plugin/datatables/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="../../js/plugin/datatables/dataTables.bootstrap.min.js"></script>
<script type="text/javascript" src="../../layui/layui.js"></script>
<script type="text/javascript" src="../../js/my/permission.js"></script>
<script type="text/javascript">
var pers = checkPermission();
var example;
function init(){
example =
$('#dt-table').DataTable({
"searching": false,
"processing": false,
"serverSide" : true,
"ajax": {
"url" : "/dicts",
"type":"get",
"data":function(d){
d.type = $("#type").val();
}
},
"dom": "<'dt-toolbar'r>t<'dt-toolbar-footer'<'col-sm-10 col-xs-12 hidden-xs'i><'col-xs-12 col-sm-10' p v>>",
"columns": [
{"data" : "id", "defaultContent" : ""},
{"data" : "type", "defaultContent" : ""},
{"data" : "k", "defaultContent" : ""},
{"data" : "val", "defaultContent" : ""},
{"data" : "createTime", "defaultContent" : ""},
{"data" : "updateTime", "defaultContent" : ""},
{
"data": "",
"defaultContent": "",
"render": function (data, type, row) {
var id = row['id'];
var href = "updateDict.html?id=" + id;
var edit = buttonEdit(href, "dict:add", pers);
var del = buttonDel(id, "dict:del", pers);
return edit + del;
}
},
],
"order": [[ 0, "asc" ]]
} );
}
layui.use('layer', function(){
var layer = layui.layer;
});
function del(id){
layer.confirm('确定要删除吗？', {
btn : [ '确定', '取消' ]
}, function() {
$.ajax({
type : 'delete',
url : '/dicts/'+id,
success : function(data) {
example.ajax.reload();
layer.msg("删除成功");
}
});
layer.close(1);
});
}
$("#searchBt").click(function(){
example.ajax.reload();
});
init();
</script>

99
src/main/resources/static/pages/dict/updateDict.html Normal file
View File

@ -0,0 +1,99 @@
<!DOCTYPE html>
<html>
<head>
<link rel="stylesheet" type="text/css" media="screen" href="../../css/bootstrap.min.css">
</head>
<body>
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<form class="form-horizontal" onsubmit="return false" id="form">
<fieldset>
<input type="hidden" id="id" name="id">
<div class='form-group'>
<label class='col-md-2 control-label'>type</label>
<div class='col-md-10'>
<input class='form-control' placeholder='type' type='text' name='type' id='type' readonly="readonly">
</div>
</div>
<div class='form-group'>
<label class='col-md-2 control-label'>k</label>
<div class='col-md-10'>
<input class='form-control' placeholder='k' type='text' name='k' id='k' readonly="readonly">
</div>
</div>
<div class='form-group'>
<label class='col-md-2 control-label'>val</label>
<div class='col-md-10'>
<input class='form-control' placeholder='val' type='text' name='val' id='val' data-bv-notempty='true' data-bv-notempty-message='val 不能为空'>
</div>
</div>
<div class="form-actions">
<div class="row" align="center">
<div class="col-md-12">
<button class="btn btn-primary" onclick="location.href='dictList.html'">返回</button>
<button class="btn btn-primary" type="submit" onclick="update()">
<i class="fa fa-save"></i> 保存
</button>
</div>
</div>
</div>
</fieldset>
</form>
</div>
<script type="text/javascript" src="../../js/libs/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="../../js/jq.js"></script>
<script type="text/javascript" src="../../js/plugin/bootstrapvalidator/bootstrapValidator.min.js"></script>
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../layui/layui.js"></script>
<script type="text/javascript">
layui.use(['layer','laydate'], function(){
var layer = layui.layer;
});
initData();
function initData(){
var id = getUrlParam("id");
if(id != ""){
$.ajax({
type : 'get',
url : '/dicts/'+id,
async : false,
success : function(data) {
$('#id').val(data.id);
$('#type').val(data.type);
$('#k').val(data.k);
$('#val').val(data.val);
}
});
}
}
function update() {
$('#form').bootstrapValidator();
var bootstrapValidator = $("#form").data('bootstrapValidator');
bootstrapValidator.validate();
if(!bootstrapValidator.isValid()){
return;
}
var formdata = $("#form").serializeObject();
$.ajax({
type : 'put',
url : '/dicts',
contentType: "application/json; charset=utf-8",
data : JSON.stringify(formdata),
success : function(data) {
layer.msg("修改成功", {shift: -1, time: 1000}, function(){
location.href = "dictList.html";
});
}
});
}
</script>
</body>
</html>

5
src/main/resources/static/pages/notice/addNotice.html
View File

@ -25,8 +25,6 @@
<label class="col-md-2 control-label">状态</label>
<div class="col-md-10" style="width: 100px">
<select class="form-control input-sm" name="status" id="status">
<option value="0">草稿</option>
<option value="1">发布</option>
</select>
</div>
</div>
@ -49,7 +47,10 @@
<script type="text/javascript" src="../../js/jq.js"></script>
<script type="text/javascript" src="../../layui/layui.js"></script>
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/dict.js"></script>
<script type="text/javascript">
showDictSelect("status", "noticeStatus");
var pro = window.location.protocol;
var host = window.location.host;
var domain = pro + "//" + host;

12
src/main/resources/static/pages/notice/noticeList.html
View File

@ -72,6 +72,7 @@
<script type="text/javascript" src="../../js/plugin/datatables/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="../../js/plugin/datatables/dataTables.bootstrap.min.js"></script>
<script type="text/javascript" src="../../js/my/permission.js"></script>
<script type="text/javascript" src="../../js/dict.js"></script>
<script type="text/javascript">
var pers = checkPermission();
layui.use(['layer','laydate'], function(){
@ -85,6 +86,8 @@ layui.use(['layer','laydate'], function(){
});
});
var noticeStatus = showDictSelect("status", "noticeStatus", true);
var example;
function init(){
example =
@ -118,14 +121,7 @@ function init(){
"data": "status",
"defaultContent": "",
"render": function (data, type, row) {
var status = row['status'];
var a = "";
if(status == 0){
a = "草稿";
} else if(status == 1){
a = "发布";
}
return a;
return noticeStatus[data];
}
},
{

6
src/main/resources/static/pages/notice/noticePubList.html
View File

@ -24,9 +24,6 @@
<input type="text" class="form-control" placeholder="结束时间" id="endTime">
状态：
<select class="form-control input-sm" id="isRead">
<option value="">全部</option>
<option value="0">未读</option>
<option value="1">已读</option>
</select>
<button id="searchBt" class="layui-btn layui-btn-sm"><i class="layui-icon">&#xe615;</i>搜索</button>
</div>
@ -66,6 +63,7 @@
<script type="text/javascript" src="../../layui/layui.js"></script>
<script type="text/javascript" src="../../js/plugin/datatables/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="../../js/plugin/datatables/dataTables.bootstrap.min.js"></script>
<script type="text/javascript" src="../../js/dict.js"></script>
<script type="text/javascript">
layui.use(['layer','laydate'], function(){
var layer = layui.layer;
@ -78,6 +76,8 @@ layui.use(['layer','laydate'], function(){
});
});
var isRead = showDictSelect("isRead", "isRead", true);
var example;
function init(){
example =

5
src/main/resources/static/pages/notice/updateNotice.html
View File

@ -26,8 +26,6 @@
<label class="col-md-2 control-label">状态</label>
<div class="col-md-10" style="width: 100px">
<select class="form-control input-sm" name="status" id="status">
<option value="0">草稿</option>
<option value="1">发布</option>
</select>
</div>
</div>
@ -50,8 +48,9 @@
<script type="text/javascript" src="../../js/jq.js"></script>
<script type="text/javascript" src="../../layui/layui.js"></script>
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/dict.js"></script>
<script type="text/javascript">
showDictSelect("status", "noticeStatus");
initData();
function initData(){

6
src/main/resources/static/pages/user/addUser.html
View File

@ -57,9 +57,7 @@
<div class="form-group">
<label class="col-md-2 control-label">性别</label>
<div class="col-md-10" style="width: 100px">
<select class="form-control input-sm" name="sex">
<option value="1">男</option>
<option value="0">女</option>
<select class="form-control input-sm" name="sex" id="sex">
</select>
</div>
</div>
@ -89,6 +87,7 @@
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/my/roles/role.js"></script>
<script type="text/javascript" src="../../layui/layui.js"></script>
<script type="text/javascript" src="../../js/dict.js"></script>
<script type="text/javascript">
layui.use(['layer','laydate'], function(){
var layer = layui.layer;
@ -98,6 +97,7 @@
});
});
showDictSelect("sex", "sex");
initRoles();
$('#form').bootstrapValidator();

4
src/main/resources/static/pages/user/updateMyself.html
View File

@ -51,8 +51,6 @@
<label class="col-md-2 control-label">性别</label>
<div class="col-md-10" style="width: 100px">
<select class="form-control input-sm" name="sex" id="sex">
<option value="1">男</option>
<option value="0">女</option>
</select>
</div>
</div>
@ -76,7 +74,9 @@
<script type="text/javascript" src="../../layui/layui.js"></script>
<script type="text/javascript" src="../../js/plugin/bootstrapvalidator/bootstrapValidator.min.js"></script>
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/dict.js"></script>
<script type="text/javascript">
showDictSelect("sex", "sex");
initData();
function initData(){

9
src/main/resources/static/pages/user/updateUser.html
View File

@ -48,8 +48,6 @@
<label class="col-md-2 control-label">性别</label>
<div class="col-md-10" style="width: 100px">
<select class="form-control input-sm" name="sex" id="sex">
<option value="1">男</option>
<option value="0">女</option>
</select>
</div>
</div>
@ -57,9 +55,6 @@
<label class="col-md-2 control-label">状态</label>
<div class="col-md-10" style="width: 100px">
<select class="form-control input-sm" name="status" id="status">
<option value="1">正常</option>
<option value="2">锁定</option>
<option value="0">无效</option>
</select>
</div>
</div>
@ -89,6 +84,7 @@
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/my/roles/role.js"></script>
<script type="text/javascript" src="../../layui/layui.js"></script>
<script type="text/javascript" src="../../js/dict.js"></script>
<script type="text/javascript">
layui.use(['layer','laydate'], function(){
var layer = layui.layer;
@ -98,6 +94,9 @@
});
});
showDictSelect("sex", "sex");
showDictSelect("status", "userStatus");
initRoles();
initData();

17
src/main/resources/static/pages/user/userList.html
View File

@ -23,10 +23,6 @@
<input id="nickname" type="text" class="form-control" placeholder="昵称">
状态：
<select class="form-control input-sm" id="status">
<option value="">全部</option>
<option value="1">正常</option>
<option value="2">锁定</option>
<option value="0">无效</option>
</select>
<button id="searchBt" class="layui-btn layui-btn-sm" permission="sys:user:query"><i class="layui-icon">&#xe615;</i>搜索</button>
</div>
@ -73,10 +69,12 @@
<script type="text/javascript" src="../../js/plugin/datatables/dataTables.bootstrap.min.js"></script>
<script type="text/javascript" src="../../js/my/permission.js"></script>
<script type="text/javascript" src="../../layui/layui.js"></script>
<script type="text/javascript" src="../../js/dict.js"></script>
<script type="text/javascript">
layui.use([ 'layer' ], function() {
var layer = layui.layer;
});
var userStatus = showDictSelect("status", "userStatus", true);
var pers = checkPermission();
@ -113,16 +111,7 @@ function init(){
"data": "status",
"defaultContent": "",
"render": function (data, type, row) {
var status = row['status'];
var a = "";
if(status == 0){
a = "无效";
} else if(status == 1){
a = "正常";
} else {
a = "<span style='color:red'>锁定</span>";
}
return a;
return userStatus[data];
}
},
{