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

一波细节优化

Browse Source
This commit is contained in:
RuoYi
2018-08-23 17:06:31 +08:00
parent 58f21c0350
commit 1a5e3606d2
53 changed files with 285 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,7 @@
<label class="col-sm-3 control-label">性别：</label>
<div class="col-sm-8">
<select id="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
@@ -105,12 +105,11 @@
dataType: "json",
data: {
name : function() {
return $.trim($("#loginName").val());
return $.common.trim($("#loginName").val());
}
},
dataFilter: function(data, type) {
if (data == "0") return true;
else return false;
return $.validate.unique(data);
}
}
},
@@ -134,12 +133,11 @@
dataType: "json",
data: {
name: function () {
return $.trim($("#email").val());
return $.common.trim($("#email").val());
}
},
dataFilter: function (data, type) {
if (data == "0") return true;
else return false;
return $.validate.unique(data);
}
}
},
@@ -152,12 +150,11 @@
dataType: "json",
data: {
name: function () {
return $.trim($("#phonenumber").val());
return $.common.trim($("#phonenumber").val());
}
},
dataFilter: function (data, type) {
if (data == "0") return true;
else return false;
return $.validate.unique(data);
}
}
},

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

@@ -42,7 +42,7 @@
<label class="col-sm-3 control-label">性别：</label>
<div class="col-sm-8">
<select id="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}" th:field="*{sex}"></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{sex}"></option>
</select>
</div>
</div>
@@ -105,15 +105,14 @@
dataType: "json",
data: {
"userId": function() {
return $("input[name='userId']").val();
return $("#userId").val();
},
"email": function() {
return $("input[name='email']").val();
return $.common.trim($("#email").val());
}
},
dataFilter: function (data, type) {
if (data == "0") return true;
else return false;
return $.validate.unique(data);
}
}
},
@@ -126,15 +125,14 @@
dataType: "json",
data: {
"userId": function() {
return $("input[name='userId']").val();
return $("#userId").val();
},
"phonenumber": function() {
return $("input[name='phonenumber']").val();
return $.common.trim($("#phonenumber").val());
}
},
dataFilter: function (data, type) {
if (data == "0") return true;
else return false;
return $.validate.unique(data);
}
}
},

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

@@ -74,15 +74,14 @@
dataType: "json",
data: {
"userId": function() {
return $("input[name='userId']").val();
return $("#userId").val();
},
"email": function() {
return $("input[name='email']").val();
return $.common.trim($("#email").val());
}
},
dataFilter: function (data, type) {
if (data == "0") return true;
else return false;
return $.validate.unique(data);
}
}
},
@@ -95,15 +94,14 @@
dataType: "json",
data: {
"userId": function() {
return $("input[name='userId']").val();
return $("#userId").val();
},
"phonenumber": function() {
return $("input[name='phonenumber']").val();
return $.common.trim($("#phonenumber").val());
}
},
dataFilter: function (data, type) {
if (data == "0") return true;
else return false;
return $.validate.unique(data);
}
}
},

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

@@ -28,6 +28,7 @@
<label class="col-sm-3 control-label">再次确认：</label>
<div class="col-sm-8">
<input class="form-control" type="password" name="confirm" id="confirm">
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 请再次输入您的密码</span>
</div>
</div>
<div class="form-group">

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

@@ -45,10 +45,10 @@
<li>
用户状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li class="time">
<li class="select-time">
<label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
@@ -67,12 +67,12 @@
<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
<i class="fa fa-plus"></i> 新增
</a>
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="system:user:remove">
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
<i class="fa fa-trash-o"></i> 删除
</a>
</div>
<div class="col-sm-12 select-info table-striped">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table>
</div>
</div>