Skip to content

B
bpm
Commit 200d12ad by Java-曹文达
Options

页面修改 页面优化

parent 065a7028
Showing with 75 additions and 41 deletions
src/main/java/com/bbd/bpm/controller/user/UserWebController.java
......@@ -75,14 +75,14 @@ public class UserWebController {
/**
* @Author:cwd
* @Description:进入注册功能
* @Description:进入添加人员功能
* @Date: 2019/04/04
* @Param:
* @return
**/
@RequestMapping(value = "toRegister")
@RequestMapping(value = "addUser")
public String toRegister(){
return "register";
return "user/addUser";
}
......
src/main/java/com/bbd/bpm/dao/UserInfoMapper.xml
......@@ -105,7 +105,8 @@
email,
telephone,
last_time lastTime,
content
content,
DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s') createTime
FROM
`user`
where 1=1
......@@ -121,10 +122,12 @@
username,
password,
email,
telephone
telephone,
content,
create_time
)
VALUES
(#{userUuid},#{username},#{password},#{email},#{telephone})
(#{userUuid},#{username},#{password},#{email},#{telephone},#{content},now())
</insert>
<delete id="deleteUser" parameterType="com.bbd.bpm.domain.User">
......
src/main/java/com/bbd/bpm/domain/User.java
package com.bbd.bpm.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.persistence.*;
import java.util.Date;
/**
* Created by houkang on 2019/1/3.
......@@ -45,9 +47,12 @@ public class User {
@Column(name="last_time")
private String lastTime; //上次登录时间
@Column(name = "content") //角色描述
@Column(name = "content") //
private String content;
@Column(name = "create_time")
private String createTime;
public Integer getId() {
return id;
}
......
src/main/java/com/bbd/bpm/serviceImpl/UserInfoServiceImpl.java
......@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.*;
@Service
......
src/main/resources/static/editor-app/libs/angular_1.2.13/angular.min.js
......@@ -18,8 +18,8 @@ a+"\\:"),c),r(b.querySelectorAll("["+a+"]"),c))});r(d,function(a){if(!e){var b=h
function(a,b,c,d,e){a.$apply(function(){b.data("$injector",d);c(b)(a)})}]);return c},d=/^NG_DEFER_BOOTSTRAP!/;if(C&&!d.test(C.name))return c();C.name=C.name.replace(d,"");Ba.resumeBootstrap=function(b){r(b,function(b){a.push(b)});c()}}function db(b,a){a=a||"_";return b.replace(Vc,function(b,d){return(d?a:"")+b.toLowerCase()})}function yb(b,a,c){if(!b)throw Oa("areq",a||"?",c||"required");return b}function Qa(b,a,c){c&&H(b)&&(b=b[b.length-1]);yb(N(b),a,"not a function, got "+(b&&"object"==typeof b?
b.constructor.name||"Object":typeof b));return b}function wa(b,a){if("hasOwnProperty"===b)throw Oa("badname",a);}function bc(b,a,c){if(!a)return b;a=a.split(".");for(var d,e=b,f=a.length,g=0;g<f;g++)d=a[g],b&&(b=(e=b)[d]);return!c&&N(b)?cb(e,b):b}function zb(b){var a=b[0];b=b[b.length-1];if(a===b)return z(a);var c=[a];do{a=a.nextSibling;if(!a)break;c.push(a)}while(a!==b);return z(c)}function Wc(b){var a=E("$injector"),c=E("ng");b=b.angular||(b.angular={});b.$$minErr=b.$$minErr||E;return b.module||
(b.module=function(){var b={};return function(e,f,g){if("hasOwnProperty"===e)throw c("badname","module");f&&b.hasOwnProperty(e)&&(b[e]=null);return b[e]||(b[e]=function(){function b(a,d,e){return function(){c[e||"push"]([a,d,arguments]);return m}}if(!f)throw a("nomod",e);var c=[],d=[],l=b("$injector","invoke"),m={_invokeQueue:c,_runBlocks:d,requires:f,name:e,provider:b("$provide","provider"),factory:b("$provide","factory"),service:b("$provide","service"),value:b("$provide","value"),constant:b("$provide",
"constant","unshift"),animation:b("$animateProvider","register"),filter:b("$filterProvider","register"),controller:b("$controllerProvider","register"),directive:b("$compileProvider","directive"),config:l,run:function(a){d.push(a);return this}};g&&l(g);return m}())}}())}function Ra(b){return b.replace(Xc,function(a,b,d,e){return e?d.toUpperCase():d}).replace(Yc,"Moz$1")}function Ab(b,a,c,d){function e(b){var e=c&&b?[this.filter(b)]:[this],n=a,k,l,m,p,q,A;if(!d||null!=b)for(;e.length;)for(k=e.shift(),
l=0,m=k.length;l<m;l++)for(p=z(k[l]),n?p.triggerHandler("$destroy"):n=!n,q=0,p=(A=p.children()).length;q<p;q++)e.push(Ca(A[q]));return f.apply(this,arguments)}var f=Ca.fn[b],f=f.$original||f;e.$original=f;Ca.fn[b]=e}function R(b){if(b instanceof R)return b;D(b)&&(b=da(b));if(!(this instanceof R)){if(D(b)&&"<"!=b.charAt(0))throw Bb("nosel");return new R(b)}if(D(b)){var a=T.createElement("div");a.innerHTML="<div>&#160;</div>"+b;a.removeChild(a.firstChild);Cb(this,a.childNodes);z(T.createDocumentFragment()).append(this)}else Cb(this,
"constant","unshift"),animation:b("$animateProvider","templates.user.register"),filter:b("$filterProvider","templates.user.register"),controller:b("$controllerProvider","templates.user.register"),directive:b("$compileProvider","directive"),config:l,run:function(a){d.push(a);return this}};g&&l(g);return m}())}}())}function Ra(b){return b.replace(Xc,function(a, b, d, e){return e?d.toUpperCase():d}).replace(Yc,"Moz$1")}function Ab(b, a, c, d){function e(b){var e=c&&b?[this.filter(b)]:[this],n=a,k,l,m,p,q,A;if(!d||null!=b)for(; e.length;)for(k=e.shift(),
l=0,m=k.length; l<m; l++)for(p=z(k[l]),n?p.triggerHandler("$destroy"):n=!n,q=0,p=(A=p.children()).length;q<p;q++)e.push(Ca(A[q]));return f.apply(this,arguments)}var f=Ca.fn[b],f=f.$original||f;e.$original=f;Ca.fn[b]=e}function R(b){if(b instanceof R)return b;D(b)&&(b=da(b));if(!(this instanceof R)){if(D(b)&&"<"!=b.charAt(0))throw Bb("nosel");return new R(b)}if(D(b)){var a=T.createElement("div");a.innerHTML="<div>&#160;</div>"+b;a.removeChild(a.firstChild);Cb(this,a.childNodes);z(T.createDocumentFragment()).append(this)}else Cb(this,
b)}function Db(b){return b.cloneNode(!0)}function Da(b){cc(b);var a=0;for(b=b.childNodes||[];a<b.length;a++)Da(b[a])}function dc(b,a,c,d){if(v(d))throw Bb("offargs");var e=ka(b,"events");ka(b,"handle")&&(x(a)?r(e,function(a,c){Eb(b,c,a);delete e[c]}):r(a.split(" "),function(a){x(c)?(Eb(b,a,e[a]),delete e[a]):Na(e[a]||[],c)}))}function cc(b,a){var c=b[eb],d=Sa[c];d&&(a?delete Sa[c].data[a]:(d.handle&&(d.events.$destroy&&d.handle({},"$destroy"),dc(b)),delete Sa[c],b[eb]=s))}function ka(b,a,c){var d=
b[eb],d=Sa[d||-1];if(v(c))d||(b[eb]=d=++Zc,d=Sa[d]={}),d[a]=c;else return d&&d[a]}function ec(b,a,c){var d=ka(b,"data"),e=v(c),f=!e&&v(a),g=f&&!Z(a);d||g||ka(b,"data",d={});if(e)d[a]=c;else if(f){if(g)return d&&d[a];t(d,a)}else return d}function Fb(b,a){return b.getAttribute?-1<(" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").indexOf(" "+a+" "):!1}function fb(b,a){a&&b.setAttribute&&r(a.split(" "),function(a){b.setAttribute("class",da((" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g,
" ").replace(" "+da(a)+" "," ")))})}function gb(b,a){if(a&&b.setAttribute){var c=(" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ");r(a.split(" "),function(a){a=da(a);-1===c.indexOf(" "+a+" ")&&(c+=a+" ")});b.setAttribute("class",da(c))}}function Cb(b,a){if(a){a=a.nodeName||!v(a.length)||za(a)?[a]:a;for(var c=0;c<a.length;c++)b.push(a[c])}}function fc(b,a){return hb(b,"$"+(a||"ngController")+"Controller")}function hb(b,a,c){b=z(b);9==b[0].nodeType&&(b=b.find("html"));for(a=H(a)?a:[a];b.length;){for(var d=
......
src/main/resources/templates/login.html
......@@ -30,7 +30,6 @@
</div>
<button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
<input type="button" class="btn btn-lg btn-primary btn-block" onclick="go()" value="注册"> </input>
<p class="mt-5 mb-3 text-muted">© 2019-2020</p>
</form>
......
src/main/resources/templates/register.html → src/main/resources/templates/user/addUser.html
......@@ -10,53 +10,45 @@
</head>
<body class="text-center">
<div style="margin-top: 100px;">
<div>
<body>
<!--top头部标题栏-->
<div id="top">
<!--用户注册-->
<div id="vl_registe">
<!--账号信息-->
<p class="r_p1"><span class="line"></span>账号信息</p>
<div>
<p class="userinfo">
<span class="left">
<span class="red">*</span>
<span class="info">用户名:</span>
<span class="info" style="margin-left: -15px;">用户名:</span>
</span>
<input type="text" name="v_username" id="username" value="" placeholder="用户名" autocomplete="off" />
<input type="text" name="v_username" id="username" value="" placeholder="用户名" onfocus="userNameFocus()" autocomplete="off" />
</p>
<p class="userinfo">
<span class="left">
<span class="red">*</span>
<span class="info">密码:</span>
</span>
<input type="password" name="v_passward" id="passward" value="" placeholder="密码" autocomplete="off" />
</p>
<p class="userinfo">
<span class="left">
<span class="red">*</span>
<span class="info">邮箱:</span>
</span>
<input type="emaila" name="v_mail" id="email" value="" placeholder="邮箱" autocomplete="off" />
</p>
<p class="userinfo">
<span class="left">
<span class="red">*</span>
<span class="info">手机号:</span>
<span class="info" style="margin-left: -15px;">手机号:</span>
</span>
<input type="emaila" name="telephone" id="telephone" value="" placeholder="手机号" autocomplete="off" />
</p>
<p class="userinfo">
<span class="left">
<span class="red">*</span>
<span class="info">用户描述:</span>
<span class="info" style="margin-left: -29px;">用户描述:</span>
</span>
<input type="emaila" name="content" id="content" value="" placeholder="用户描述" autocomplete="off" />
</p>
</div>
<button onclick="register()">确认申请</button>
<button onclick="register()" class="btn">添加</button>
</div>
</div>
</body>
......@@ -71,7 +63,6 @@
margin: 0 auto;
}
div{
width: 400px;
text-align:center;
padding-top:10px;
}
......@@ -79,9 +70,10 @@ input,button{
margin-top:10px;
}
button {
padding:5px 0;
width: 408px;
.btn{
border-color: #10c8ef;
background-color: #10c8ef;
color: #fff;
}
</style>
<script src="/js/plugins/jquery.min.js"></script>
......@@ -103,16 +95,27 @@ button {
layer.msg('邮箱不可为空');
return false
}
var content=$("#content").val();
if(content==''){
layer.msg('用户描述不可为空');
return false
}
var myreg = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
if(!myreg.test(email)){
alert('请输入有效的E_mail！');
myreg.focus();
return false;
}
var telephone=$("#telephone").val()
if(telephone==''){
layer.msg('手机号不可为空');
return false
}
if(!(/^1[34578]\d{9}$/.test(telephone))){
alert('请输入有效手机号');
myreg.focus();
return false;
}
var content=$("#content").val();
if(content==''){
layer.msg('用户描述不可为空');
return false
}
$.post("/bpm/user/addUser",
{
telephone:telephone,
......@@ -122,11 +125,15 @@ button {
content:content
},function (data) {
if(data.code==200){
layer.msg('删除成功');
location.reload();
layer.msg('添加成功!', {icon: 1,time:1000});
setTimeout(function (){
parent.location.reload();
},500);
}else {
layer.msg('删除失败');
location.reload();
layer.msg('添加失败!', {icon: 2,time:1000});
setTimeout(function (){
parent.location.reload();
},500);
}
},'json')
......
src/main/resources/templates/user/userList.html
......@@ -35,6 +35,7 @@
<span class="cx">
<input type="button" style=" border: 1px solid #000000;background-color: #2b2b2b;width: 64px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;" value="查询" onclick="getBargainProduct()">
</span>
<button id="addMe" style="margin-left: 530px;float: right; border: 1px solid #000000;background-color: #2b2b2b;width: 70px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;" onclick="addUser()">添加人员</button></span>
</p>
</div>
<div class="content">
......@@ -59,7 +60,7 @@
<script type="text/javascript">
$(function(){
$.post(
"/bpm/user/content",
"/bpm/user/userList",
{
pageSize:10,
pageNum:1,
......@@ -67,6 +68,7 @@
status:""
},
function (data) {
console.log(data)
var size = data.data.pages;
if (!data.data.pages){
size = 0;
......@@ -113,14 +115,14 @@
var total = data.total;
data = data.list;
var content = '';
content += '<tr><th>用户编号</th><th style="width: 15%">用户标识</th><th style="width: 8%">用户名称</th><th>邮箱</th><th>用户描述</th><th style="width: 8%">手机</th><th style="width: 8%">创建时间</th><th>操作</th></tr>';
content += '<tr><th>用户编号</th><th style="width: 8%">用户名称</th><th>邮箱</th><th>用户描述</th><th style="width: 8%">手机</th><th style="width: 8%">创建时间</th><th>操作</th></tr>';
if(data!=null){
for (var i in data) {
content += '<tr>';
content += '<td class="product_name" style="width: 5%;">'+data[i].id+'</td>';
content += '<td class="product_num">'+data[i].userUuid+'</td><td class="product_num">'+data[i].username+'</td>';
content += '<td class="product_num">'+data[i].username+'</td>';
content += '<td class="product_num">'+data[i].email+'</td><td class="product_num">'+data[i].content+'</td><td class="product_num">'+data[i].telephone+'</td>';
content += '<td class="product_num">'+data[i].lastTime+'</td>';
content += '<td class="product_num">'+data[i].createTime+'</td>';
content += '<td class="cao_zuo"><span onclick="toActivityDetail(\''+data[i].username+'\',\''+data[i].email+'\',\''+data[i].telephone+'\',\''+data[i].lastTime+'\',\''+data[i].content+'\')">查看</span><span onclick="deleteUser('+data[i].id+',\''+data[i].username+'\')">删除</span></td></tr>';
}
$('#pages').text(pages);
......@@ -179,6 +181,23 @@
}
function addUser(){
layer.open({
type: 2,
title: '添加用户',
closeBtn: 1,
area: ['300px','500px'],
shade: 0,
btnAlign: 'c',
content: "/web/bpm/user/addUser",
});
}
/*删除用户 */
function deleteUser(id ,name) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment