Skip to content

B
bpm
Commit 5530868a by Java-曹文达
Options

页面优化 提示语优化

parent 26232161
Showing with 124 additions and 80 deletions
src/main/java/com/bbd/bpm/dao/UserInfoMapper.xml
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
LAST_UPDATE_TIME_ updateTime, LAST_UPDATE_TIME_ updateTime,
VERSION_ version, VERSION_ version,
META_INFO_ metaInfo, META_INFO_ metaInfo,
DEPLOYMENT_ID_ deploymentId, IFNULL( DEPLOYMENT_ID_,'未部署') deploymentId,
EDITOR_SOURCE_EXTRA_VALUE_ID_ editorSourceExtraValueId, EDITOR_SOURCE_EXTRA_VALUE_ID_ editorSourceExtraValueId,
EDITOR_SOURCE_VALUE_ID_ editorSourceValueId, EDITOR_SOURCE_VALUE_ID_ editorSourceValueId,
TENANT_ID_ tenantId TENANT_ID_ tenantId
......
src/main/resources/static/js/layui.js 0 → 100644
/** layui-v2.4.5 MIT License By https://www.layui.com */
;!function(e){"use strict";var t=document,o={modules:{},status:{},timeout:10,event:{}},n=function(){this.v="2.4.5"},r=function(){var e=t.currentScript?t.currentScript.src:function(){for(var e,o=t.scripts,n=o.length-1,r=n;r>0;r--)if("interactive"===o[r].readyState){e=o[r].src;break}return e||o[n].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),i=function(t){e.console&&console.error&&console.error("Layui hint: "+t)},a="undefined"!=typeof opera&&"[object Opera]"===opera.toString(),u={layer:"modules/layer",laydate:"modules/laydate",laypage:"modules/laypage",laytpl:"modules/laytpl",layim:"modules/layim",layedit:"modules/layedit",form:"modules/form",upload:"modules/upload",tree:"modules/tree",table:"modules/table",element:"modules/element",rate:"modules/rate",colorpicker:"modules/colorpicker",slider:"modules/slider",carousel:"modules/carousel",flow:"modules/flow",util:"modules/util",code:"modules/code",jquery:"modules/jquery",mobile:"modules/mobile","layui.all":"../layui.all"};n.prototype.cache=o,n.prototype.define=function(e,t){var n=this,r="function"==typeof e,i=function(){var e=function(e,t){layui[e]=t,o.status[e]=!0};return"function"==typeof t&&t(function(n,r){e(n,r),o.callback[n]=function(){t(e)}}),this};return r&&(t=e,e=[]),layui["layui.all"]||!layui["layui.all"]&&layui["layui.mobile"]?i.call(n):(n.use(e,i),n)},n.prototype.use=function(e,n,l){function s(e,t){var n="PLaySTATION 3"===navigator.platform?/^complete$/:/^(complete|loaded)$/;("load"===e.type||n.test((e.currentTarget||e.srcElement).readyState))&&(o.modules[f]=t,d.removeChild(v),function r(){return++m>1e3*o.timeout/4?i(f+" is not a valid module"):void(o.status[f]?c():setTimeout(r,4))}())}function c(){l.push(layui[f]),e.length>1?y.use(e.slice(1),n,l):"function"==typeof n&&n.apply(layui,l)}var y=this,p=o.dir=o.dir?o.dir:r,d=t.getElementsByTagName("head")[0];e="string"==typeof e?[e]:e,window.jQuery&&jQuery.fn.on&&(y.each(e,function(t,o){"jquery"===o&&e.splice(t,1)}),layui.jquery=layui.$=jQuery);var f=e[0],m=0;if(l=l||[],o.host=o.host||(p.match(/\/\/([\s\S]+?)\//)||["//"+location.host+"/"])[0],0===e.length||layui["layui.all"]&&u[f]||!layui["layui.all"]&&layui["layui.mobile"]&&u[f])return c(),y;if(o.modules[f])!function g(){return++m>1e3*o.timeout/4?i(f+" is not a valid module"):void("string"==typeof o.modules[f]&&o.status[f]?c():setTimeout(g,4))}();else{var v=t.createElement("script"),h=(u[f]?p+"lay/":/^\{\/\}/.test(y.modules[f])?"":o.base||"")+(y.modules[f]||f)+".js";h=h.replace(/^\{\/\}/,""),v.async=!0,v.charset="utf-8",v.src=h+function(){var e=o.version===!0?o.v||(new Date).getTime():o.version||"";return e?"?v="+e:""}(),d.appendChild(v),!v.attachEvent||v.attachEvent.toString&&v.attachEvent.toString().indexOf("[native code")<0||a?v.addEventListener("load",function(e){s(e,h)},!1):v.attachEvent("onreadystatechange",function(e){s(e,h)}),o.modules[f]=h}return y},n.prototype.getStyle=function(t,o){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](o)},n.prototype.link=function(e,n,r){var a=this,u=t.createElement("link"),l=t.getElementsByTagName("head")[0];"string"==typeof n&&(r=n);var s=(r||e).replace(/\.|\//g,""),c=u.id="layuicss-"+s,y=0;return u.rel="stylesheet",u.href=e+(o.debug?"?v="+(new Date).getTime():""),u.media="all",t.getElementById(c)||l.appendChild(u),"function"!=typeof n?a:(function p(){return++y>1e3*o.timeout/100?i(e+" timeout"):void(1989===parseInt(a.getStyle(t.getElementById(c),"width"))?function(){n()}():setTimeout(p,100))}(),a)},o.callback={},n.prototype.factory=function(e){if(layui[e])return"function"==typeof o.callback[e]?o.callback[e]:null},n.prototype.addcss=function(e,t,n){return layui.link(o.dir+"css/"+e,t,n)},n.prototype.img=function(e,t,o){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,"function"==typeof t&&t(n)},void(n.onerror=function(e){n.onerror=null,"function"==typeof o&&o(e)}))},n.prototype.config=function(e){e=e||{};for(var t in e)o[t]=e[t];return this},n.prototype.modules=function(){var e={};for(var t in u)e[t]=u[t];return e}(),n.prototype.extend=function(e){var t=this;e=e||{};for(var o in e)t[o]||t.modules[o]?i("模块名 "+o+" 已被占用"):t.modules[o]=e[o];return t},n.prototype.router=function(e){var t=this,e=e||location.hash,o={path:[],search:{},hash:(e.match(/[^#](#.*$)/)||[])[1]||""};return/^#\//.test(e)?(e=e.replace(/^#\//,""),o.href="/"+e,e=e.replace(/([^#])(#.*$)/,"$1").split("/")||[],t.each(e,function(e,t){/^\w+=/.test(t)?function(){t=t.split("="),o.search[t[0]]=t[1]}():o.path.push(t)}),o):o},n.prototype.data=function(t,o,n){if(t=t||"layui",n=n||localStorage,e.JSON&&e.JSON.parse){if(null===o)return delete n[t];o="object"==typeof o?o:{key:o};try{var r=JSON.parse(n[t])}catch(i){var r={}}return"value"in o&&(r[o.key]=o.value),o.remove&&delete r[o.key],n[t]=JSON.stringify(r),o.key?r[o.key]:r}},n.prototype.sessionData=function(e,t){return this.data(e,t,sessionStorage)},n.prototype.device=function(t){var o=navigator.userAgent.toLowerCase(),n=function(e){var t=new RegExp(e+"/([^\\s\\_\\-]+)");return e=(o.match(t)||[])[1],e||!1},r={os:function(){return/windows/.test(o)?"windows":/linux/.test(o)?"linux":/iphone|ipod|ipad|ios/.test(o)?"ios":/mac/.test(o)?"mac":void 0}(),ie:function(){return!!(e.ActiveXObject||"ActiveXObject"in e)&&((o.match(/msie\s(\d+)/)||[])[1]||"11")}(),weixin:n("micromessenger")};return t&&!r[t]&&(r[t]=n(t)),r.android=/android/.test(o),r.ios="ios"===r.os,r},n.prototype.hint=function(){return{error:i}},n.prototype.each=function(e,t){var o,n=this;if("function"!=typeof t)return n;if(e=e||[],e.constructor===Object){for(o in e)if(t.call(e[o],o,e[o]))break}else for(o=0;o<e.length&&!t.call(e[o],o,e[o]);o++);return n},n.prototype.sort=function(e,t,o){var n=JSON.parse(JSON.stringify(e||[]));return t?(n.sort(function(e,o){var n=/^-?\d+$/,r=e[t],i=o[t];return n.test(r)&&(r=parseFloat(r)),n.test(i)&&(i=parseFloat(i)),r&&!i?1:!r&&i?-1:r>i?1:r<i?-1:0}),o&&n.reverse(),n):n},n.prototype.stope=function(t){t=t||e.event;try{t.stopPropagation()}catch(o){t.cancelBubble=!0}},n.prototype.onevent=function(e,t,o){return"string"!=typeof e||"function"!=typeof o?this:n.event(e,t,null,o)},n.prototype.event=n.event=function(e,t,n,r){var i=this,a=null,u=t.match(/\((.*)\)$/)||[],l=(e+"."+t).replace(u[0],""),s=u[1]||"",c=function(e,t){var o=t&&t.call(i,n);o===!1&&null===a&&(a=!1)};return r?(o.event[l]=o.event[l]||{},o.event[l][s]=[r],this):(layui.each(o.event[l],function(e,t){return"{*}"===s?void layui.each(t,c):(""===e&&layui.each(t,c),void(s&&e===s&&layui.each(t,c)))}),a)},e.layui=new n}(window);
\ No newline at end of file
src/main/resources/static/js/plugins/bootstrapselect/css/product_list.css
...@@ -96,7 +96,7 @@ html,body{ ...@@ -96,7 +96,7 @@ html,body{
margin-bottom:20px; margin-bottom:20px;
} }
.box .search .title{ .box .search .title{
background:#f5f5f5 url(../img/suo.png) no-repeat 10px center; background:#f5f5f5 url(../img/sou.png) no-repeat 10px center;
} }
.box .search_pro{ .box .search_pro{
padding-left:40px; padding-left:40px;
...@@ -134,7 +134,7 @@ html,body{ ...@@ -134,7 +134,7 @@ html,body{
border-width: 1px 1px 0px; border-width: 1px 1px 0px;
} }
.content .list_ti{ .content .list_ti{
background:#f5f5f5 url(../img/li.png) no-repeat 10px center; background:#f5f5f5 url(../img/li.jpg) no-repeat 10px center;
} }
.content .title select{ .content .title select{
width:150px; width:150px;
......
src/main/resources/templates/bpm/index.html
...@@ -70,26 +70,8 @@ ...@@ -70,26 +70,8 @@
</head> </head>
<body> <body>
<!--首页--> <!--首页-->
<div class="MainBox"> <div class="MainBox" style="height:auto;overflow:hidden">
<!--头部-->
<!--<div class="navbar navbar-dark bg-dark box-shadow">-->
<!--<div style="width: 90%;">-->
<!--<a href="#" class="navbar-brand d-flex align-items-center" >-->
<!--<img th:src="@{/images/bpmwh.png}" alt="logo" style="width: 14%;">-->
<!--<strong>BPM后台管理系统</strong>-->
<!--</a>-->
<!--</div>-->
<!--<div >-->
<!--<span class="glyphicon glyphicon-user"><span th:text=" ${userName}"></span> &nbsp;</span>-->
<!--<a class="navbar-toggler" href="/logout">Sign up</a>-->
<!--</div>-->
<!--</div>-->
<div class="d-flex flex-column flex-md-row align-items-center p-3 px-md-4 mb-3 bg-white border-bottom box-shadow"> <div class="d-flex flex-column flex-md-row align-items-center p-3 px-md-4 mb-3 bg-white border-bottom box-shadow">
<h4 class="my-0 mr-md-auto font-weight-normal"> <h4 class="my-0 mr-md-auto font-weight-normal">
<img th:src="@{/images/bpm.png}" alt="logo" style="width: 14%;">BPM后台管理系统 <img th:src="@{/images/bpm.png}" alt="logo" style="width: 14%;">BPM后台管理系统
</h4> </h4>
...@@ -97,7 +79,6 @@ ...@@ -97,7 +79,6 @@
<a class="btn btn-outline-primary" href="/logout">Sign up</a> <a class="btn btn-outline-primary" href="/logout">Sign up</a>
</div> </div>
<!--end 头部--> <!--end 头部-->
<!--左边导航--> <!--左边导航-->
<div class="main_wrap clearfix" > <div class="main_wrap clearfix" >
...@@ -105,21 +86,15 @@ ...@@ -105,21 +86,15 @@
<li class="s_menu_item"><a target="main_frame" href="/web/bpm/user/toDeployment"><span class="nav-icon"><i class="fa fa-qrcode bg-gradient-red text-white"></i></span>查看流程</a></li> <li class="s_menu_item"><a target="main_frame" href="/web/bpm/user/toDeployment"><span class="nav-icon"><i class="fa fa-qrcode bg-gradient-red text-white"></i></span>查看流程</a></li>
<li class="s_menu_item"><a target="main_frame" href="/model/createNew"><span class="nav-icon"><i class="fa fa-heart bg-gradient-orange text-white"></i></span>创建流程</a></li> <li class="s_menu_item"><a target="main_frame" href="/model/createNew"><span class="nav-icon"><i class="fa fa-heart bg-gradient-orange text-white"></i></span>创建流程</a></li>
<li class="s_menu_item"><a target="main_frame" href="/web/bpm/user/toOrganization"><span class="nav-icon"><i class="fa fa-table bg-gradient-green text-white"></i></span>组织结构</a></li> <li class="s_menu_item"><a target="main_frame" href="/web/bpm/user/toOrganization"><span class="nav-icon"><i class="fa fa-table bg-gradient-green text-white"></i></span>组织结构</a></li>
<li class="s_menu_item"><a target="main_frame" href="/web/bpm/user/toUserList"><span class="nav-icon"><i class="fa fa-map bg-gradient-blue text-white"></i></span>用户管理</a></li> <li class="s_menu_item"><a target="main_frame" href="/web/bpm/user/toUserList"><span class="nav-icon"><i class="fa fa-user bg-gradient-pink text-white"></i></span>用户管理</a></li>
<li class="s_menu_item"><a target="main_frame" href="/swagger-ui.html"><span class="nav-icon"><i class="fa fa-map bg-gradient-blue text-white"></i></span>API 文档</a></li> <li class="s_menu_item"><a target="main_frame" href="/swagger-ui.html"><span class="nav-icon"><i class="fa fa-map bg-gradient-blue text-white"></i></span>API 文档</a></li>
</ul> </ul>
</div> </div>
<!--&lt;!&ndash;end 左边导航&ndash;&gt;-->
<div class="mainContentBox"> <div class="mainContentBox">
<iframe id="main_frame" width="100%" height="100%" frameborder="0" onload="" name="main_frame" src="/web/bpm/user/welcome" <iframe id="main_frame" width="100%" height="100%" frameborder="0" onload="" name="main_frame" src="/web/bpm/user/welcome"
style="overflow:hidden; position:absolute;"></iframe> style="overflow:hidden; position:absolute;"></iframe>
</div> </div>
<!--主体内容-->
<!--end 主体内容-->
</div> </div>
...@@ -130,15 +105,5 @@ ...@@ -130,15 +105,5 @@
<script type="text/javascript" th:src="@{/js/plugins/validat/jquery.validationEngine-zh_CN.js}"></script> <script type="text/javascript" th:src="@{/js/plugins/validat/jquery.validationEngine-zh_CN.js}"></script>
<script type="text/javascript" th:src="@{/js/plugins/layer/layer.js}"></script> <script type="text/javascript" th:src="@{/js/plugins/layer/layer.js}"></script>
<script type="text/javascript" th:src="@{/bootstrap-dist/js/bootstrap.js}"></script> <script type="text/javascript" th:src="@{/bootstrap-dist/js/bootstrap.js}"></script>
<!--<script>-->
<!--$(document).ready(function(){-->
<!--$('.s_menu_item a').click(function () {-->
<!--var dk = $(window.parent.document).find("#iframe_id").attr("src");-->
<!--dk = $(this).attr("name");-->
<!--})-->
<!--})-->
<!--</script>-->
</body> </body>
</html> </html>
\ No newline at end of file
src/main/resources/templates/deployment/deplymentList.html
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<link rel="stylesheet" th:href="@{/css/common/base.css}" /> <link rel="stylesheet" th:href="@{/css/common/base.css}" />
<link rel="stylesheet" th:href="@{/css/common/page_new.css}" /> <link rel="stylesheet" th:href="@{/css/common/page_new.css}" />
<link rel="stylesheet" th:href="@{/js/plugins/bootstrapselect/css/product_list.css}" /> <link rel="stylesheet" th:href="@{/js/plugins/bootstrapselect/css/product_list.css}" />
<link rel="stylesheet" th:href="@{/css/layui.css}" media="all">
</head> </head>
<style type="text/css"> <style type="text/css">
.box .search_pro .cx input{ .box .search_pro .cx input{
...@@ -24,23 +25,26 @@ ...@@ -24,23 +25,26 @@
border:1px solid #EEEEEE; border:1px solid #EEEEEE;
text-indent: 5px; text-indent: 5px;
} }
.layui-table th{
text-align: center;
}
</style> </style>
<body> <body>
<div class="box"> <div class="box">
<h2><span></span>流程列表<button onclick="location.reload()">刷新</button></h2> <h2><span></span>流程列表<button onclick="location.reload()">刷新</button></h2>
<div class="search"> <div class="search">
<p class="title">筛选查询</p> <p class="title">条件查询</p>
<p class="search_pro"> <p class="search_pro" style="padding-left: 0px;">
<span><b>流程名称：</b><input type="text" name="modelName" placeholder="请输入"/></span> <label class="layui-form-label">流程名称:</label>
<input style="width: 200px" type="text" name="modelName" lay-verify="title" autocomplete="off" placeholder="请输入流程名称" class="layui-input">
<span class="cx"> <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()"> <button style="margin-left: 16px;" class="layui-btn" onclick="getBargainProduct()">查询</button>
</span> </span>
</p> </p>
</div> </div>
<div class="content"> <div class="content">
<p class="title list_ti"><span>数据列表</span></p> <p class="title list_ti"><span>流程列表</span></p>
<table border="" cellspacing="" cellpadding=""> <table class="layui-table" lay-size="sm">
</table> </table>
</div> </div>
...@@ -113,17 +117,17 @@ ...@@ -113,17 +117,17 @@
var total = data.total; var total = data.total;
data = data.list; data = data.list;
var content = ''; var content = '';
content += '<tr><th>编号</th><th>流程名称</th><th style="width: 8%">KEY</th><th>创建时间</th><th style="width: 8%">更新时间</th><th style="width: 8%">META_INFO_</th><th style="width: 8%">版本</th><th style="width: 15%">操作</th></tr>'; content += '<thead><tr><th>编号</th><th>流程名称</th><th style="width: 8%">部署ID</th><th>创建时间</th><th style="width: 8%">更新时间</th><th style="width: 8%">META_INFO_</th><th style="width: 8%">版本</th><th style="width: 15%">操作</th></tr></thead>';
if(data!=null){ if(data!=null){
for (var i in data) { for (var i in data) {
content += '<tr>'; content += '<tbody><tr>';
content += '<td class="product_name" style="width: 5%;">'+data[i].id+'</td>'; content += '<td class="product_name" style="width: 5%;">'+data[i].id+'</td>';
content += '<td class="product_num">'+data[i].name+'</td><td class="product_num">'+data[i].KEY_+'</td>'; content += '<td class="product_num">'+data[i].name+'</td><td class="product_num">'+data[i].deploymentId+'</td>';
content += '<td class="product_num">'+data[i].createTime+'</td><td class="product_num">'+data[i].updateTime+'</td>'; content += '<td class="product_num">'+data[i].createTime+'</td><td class="product_num">'+data[i].updateTime+'</td>';
content += '<td class="product_num">'+data[i].metaInfo+'</td><td class="product_num">'+data[i].version+'</td>'; content += '<td class="product_num">'+data[i].metaInfo+'</td><td class="product_num">'+data[i].version+'</td>';
content += '<td class="cao_zuo"><span onclick="toActivityDetail('+data[i].id+')">查看</span></span><span onclick="deploymentModel('+data[i].id+',\''+data[i].name+'\')">部署流程</span><span onclick="deleteDeployMent('+data[i].id+',\''+data[i].name+'\')">删除</span></td></tr>'; content += '<td class="cao_zuo"><span onclick="toActivityDetail('+data[i].id+')">查看</span></span><span onclick="deploymentModel('+data[i].id+',\''+data[i].name+'\',\''+data[i].deploymentId+'\')">部署流程</span><span onclick="deleteDeployMent('+data[i].id+',\''+data[i].name+'\')">删除</span></td></tr></tbody>';
} }
$('#pages').text(pages); $('#pages').text(pages);
$('#total').text(total); $('#total').text(total);
...@@ -169,7 +173,8 @@ ...@@ -169,7 +173,8 @@
//部署流程 //部署流程
function deploymentModel(id,name){ function deploymentModel(id,name,deploymentId){
if(deploymentId=='未部署'){
layer.open({ layer.open({
id:1, id:1,
type: 1, type: 1,
...@@ -180,7 +185,7 @@ ...@@ -180,7 +185,7 @@
, ,
btn:['保存','取消'], btn:['保存','取消'],
btn1: function (index,layero) { btn1: function (index,layero) {
layer.msg('上传文件中', { layer.msg('文件部署中', {
icon: 16, icon: 16,
time : -1 time : -1
}); });
...@@ -204,6 +209,43 @@ ...@@ -204,6 +209,43 @@
} }
}); });
}else {
layer.open({
id:1,
type: 1,
title:'确认部署',
skin:'layui-layer-rim',
area:['300px', '165px'],
content: '<div style="margin-top: 22px;margin-left: 8px;">您确定再次部署'+name+"流程吗？</div>"
,
btn:['保存','取消'],
btn1: function (index,layero) {
layer.msg('文件部署中', {
icon: 16,
time : -1
});
$.post("/api/bpm/model/deploymentModel",
{
modelId:id
},function (data) {
if(data.code==200){
layer.msg('部署成功',{time:1000},function () {
location.reload();
});
}else {
layer.msg('部署失败',{time:1000},function () {
location.reload();
});
}
},'json')
},
btn2:function (index,layero) {
layer.close(index);
}
});
}
......
src/main/resources/templates/user/organizationList.html
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<link rel="stylesheet" th:href="@{/js/plugins/bootstrapselect/css/page_new.css}" /> <link rel="stylesheet" th:href="@{/js/plugins/bootstrapselect/css/page_new.css}" />
<link rel="stylesheet" th:href="@{/js/plugins/bootstrapselect/css/product_list.css}" /> <link rel="stylesheet" th:href="@{/js/plugins/bootstrapselect/css/product_list.css}" />
<link rel="stylesheet" th:href="@{/js/plugins/ztree/zTreeStyle.css}" /> <link rel="stylesheet" th:href="@{/js/plugins/ztree/zTreeStyle.css}" />
<link rel="stylesheet" th:href="@{/css/layui.css}" media="all">
</head> </head>
<style> <style>
.box .search_pro span { .box .search_pro span {
...@@ -45,6 +46,9 @@ ...@@ -45,6 +46,9 @@
.ztree li span.button.switch.level0 {visibility:hidden; width:1px;} .ztree li span.button.switch.level0 {visibility:hidden; width:1px;}
.ztree li ul.level0 {padding:0; background:none;} .ztree li ul.level0 {padding:0; background:none;}
.layui-table th{
text-align: center;
}
</style> </style>
<body style="width: 100%;"> <body style="width: 100%;">
<input type="hidden" id="pages"> <input type="hidden" id="pages">
...@@ -56,9 +60,6 @@ ...@@ -56,9 +60,6 @@
<input type="text" id="key" value="" style="border: 1px solid #EEEEEE;height: 29px;margin-left: 10px;margin-top: 10px;text-indent: 11px;" class="empty" placeholder="请输入关键字"/> <input type="text" id="key" value="" style="border: 1px solid #EEEEEE;height: 29px;margin-left: 10px;margin-top: 10px;text-indent: 11px;" class="empty" placeholder="请输入关键字"/>
<div class="treebox scrollXY"> <div class="treebox scrollXY">
<div class="zTreeDemoBackground left"> <div class="zTreeDemoBackground left">
<!--<input type="text" style="border-radius: 10px;border: 1px solid grey;margin-left: 12px;outline: none;color: grey;height: 20px;padding-left: 10px;" placeholder="四级菜单"><img style="position: absolute;left: 156px;top: 4px;width: 17px;height: 17px;" th:src="@{/images/sousuo.png}">-->
<ul id="treeDemo" class="ztree"></ul> <ul id="treeDemo" class="ztree"></ul>
</div> </div>
</div> </div>
...@@ -67,20 +68,39 @@ ...@@ -67,20 +68,39 @@
<div class="box" style="float: left;max-width: 85%;height: 680px;box-sizing: border-box;margin: 0;padding: 10px;"> <div class="box" style="float: left;max-width: 85%;height: 680px;box-sizing: border-box;margin: 0;padding: 10px;">
<h2><span></span>组织架构列表<button onclick="reload()">刷新</button></h2> <h2><span></span>组织架构列表<button onclick="reload()">刷新</button></h2>
<div class="search"> <div class="search" id="organization" hidden>
<p class="title">筛选查询</p> <p class="title">条件查询</p>
<p class="search_pro" style="height: auto;overflow: hidden;display: block; padding: 0;"> <p class="search_pro" style="padding-left: 0px;">
<span ><b id="spanB">组织名称：</b><input type="text" value="" placeholder="请输入" name="name" style="color: black"/></span> <label class="layui-form-label">组织名称:</label>
<span style="width: 200px;"><button style=" border: 1px solid #000000;background-color: #2b2b2b;width: 64px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;" onclick="queryDeviceRecords()">查询</button></span><span style="width: 67px;float: right"> <input style="width: 200px" type="text" name="name" lay-verify="title" autocomplete="off" placeholder="请输入组织名称" class="layui-input">
<button id="addOr" style=" border: 1px solid #000000;background-color: #2b2b2b;width: 70px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;margin-left: -1px;" onclick="add(1)">添加组织</button></span> <span class="cx">
<button id="addMe" style="float: right;margin-top: 7px; border: 1px solid #000000;background-color: #2b2b2b;width: 70px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;" onclick="add(2)">添加人员</button></span> <button style="margin-left: 10px;margin-top: -10px" class="layui-btn" onclick="queryDeviceRecords(1)">查询</button>
</span>
<button id="addOr" style="margin-left: 345px;" class="layui-btn layui-btn-radius" onclick="add(1)">添加组织</button></span>
<button id="addMe" class="layui-btn layui-btn-radius" onclick="add(2)">添加人员</button></span>
</p>
</div>
<div class="search" hidden id="user">
<p class="title">条件查询</p>
<p class="search_pro" style="padding-left: 0px;">
<label class="layui-form-label">人员名称:</label>
<input style="width: 200px" type="text" name="userName" lay-verify="title" autocomplete="off" placeholder="请输入人员名称" class="layui-input">
<span class="cx">
<button style="margin-left: 10px;margin-top: -10px" class="layui-btn" onclick="queryDeviceRecords(2)">查询</button>
</span>
<button id="addOr" style="margin-left: 345px;" class="layui-btn layui-btn-radius" onclick="add(1)">添加组织</button></span>
<button id="addMe" class="layui-btn layui-btn-radius" onclick="add(2)">添加人员</button></span>
</p> </p>
</div> </div>
<div class="content"> <div class="content">
<p class="title list_ti"><span>数据列表</span> <p class="title list_ti"><span>数据列表</span>
</p> </p>
<table border="" cellspacing="" cellpadding=""> <table border="" cellspacing="" cellpadding="" class="layui-table" lay-size="sm">
<tr> <tr>
<th>序号</th> <th>序号</th>
<th>组织名称</th> <th>组织名称</th>
...@@ -95,8 +115,6 @@ ...@@ -95,8 +115,6 @@
</tr> </tr>
</table> </table>
</div> </div>
<div class="footer" style="display: flex;justify-content: space-between;align-items:center;padding:10px 10px;border:1px solid #e4e4e4;font-size:14px;color:#999"> <div class="footer" style="display: flex;justify-content: space-between;align-items:center;padding:10px 10px;border:1px solid #e4e4e4;font-size:14px;color:#999">
<div style="width:auto;height:25px;display: flex;"> <div style="width:auto;height:25px;display: flex;">
...@@ -269,15 +287,19 @@ ...@@ -269,15 +287,19 @@
data = data.list; data = data.list;
var content = ''; var content = '';
if (type == 2){ if (type == 2){
$("#user").show()
$("#organization").hide()
$("#addMe").show(); $("#addMe").show();
$("#addOr").show(); $("#addOr").show();
$("#spanB").html("人员信息：") $("#spanB").html("人员信息：")
content += "<tr><th>人员编号</th><th>人员名称</th><th>职位</th><th>部门</th><th>所属组织编码</th><th>加入时间</th><th >操作</th></tr>"; content += "<thead><tr><th>人员编号</th><th>人员名称</th><th>职位</th><th>部门</th><th>所属组织编码</th><th>加入时间</th><th >操作</th></tr></thead>";
}else { }else {
$("#user").hide()
$("#organization").show()
$("#addOr").show(); $("#addOr").show();
$("#addMe").hide(); $("#addMe").hide();
$("#spanB").html("组织名称：") $("#spanB").html("组织名称：")
content += "<tr><th>序号</th><th>组织名称</th><th>上级组织</th><th >操作</th></tr>"; content += "<thead><tr><th>序号</th><th>组织名称</th><th>上级组织</th><th >操作</th></tr></thead>";
} }
if(data!=null){ if(data!=null){
if (type==2) { if (type==2) {
...@@ -309,11 +331,16 @@ ...@@ -309,11 +331,16 @@
} }
/*条件查询*/ /*条件查询*/
function queryDeviceRecords() { function queryDeviceRecords(typea) {
var pId = $("#pid").val(); var pId = $("#pid").val();
var id = $("#id").val(); var id = $("#id").val();
var type = $("#type").val(); var type = $("#type").val();
var name = $("[name='name']").val(); var name;
if (typea ==1 ){
name = $("[name='name']").val();
}else if(typea ==2){
name = $("[name='userName']").val();
}
$.post( $.post(
"/bpm/user/getOrganization", "/bpm/user/getOrganization",
{ {
......
src/main/resources/templates/user/userList.html
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<link rel="stylesheet" th:href="@{/css/common/base.css}" /> <link rel="stylesheet" th:href="@{/css/common/base.css}" />
<link rel="stylesheet" th:href="@{/css/common/page_new.css}" /> <link rel="stylesheet" th:href="@{/css/common/page_new.css}" />
<link rel="stylesheet" th:href="@{/js/plugins/bootstrapselect/css/product_list.css}" /> <link rel="stylesheet" th:href="@{/js/plugins/bootstrapselect/css/product_list.css}" />
<link rel="stylesheet" th:href="@{/css/layui.css}" media="all">
</head> </head>
<style type="text/css"> <style type="text/css">
.box .search_pro .cx input{ .box .search_pro .cx input{
...@@ -24,24 +25,31 @@ ...@@ -24,24 +25,31 @@
border:1px solid #EEEEEE; border:1px solid #EEEEEE;
text-indent: 5px; text-indent: 5px;
} }
.layui-table th{
text-align: center;
}
</style> </style>
<body> <body>
<div class="box"> <div class="box">
<h2><span></span>用户列表<button onclick="location.reload()">刷新</button></h2> <h2><span></span>用户列表<button onclick="location.reload()">刷新</button></h2>
<div class="search"> <div class="search">
<p class="title">筛选查询</p> <p class="title">条件查询</p>
<p class="search_pro"> <p class="search_pro" style="padding-left: 0px;">
<span><b>用户名称：</b><input type="text" name="userName" placeholder="请输入"/></span> <label class="layui-form-label">用户名称:</label>
<input style="width: 200px" type="text" name="userName" lay-verify="title" autocomplete="off" placeholder="请输入用户名称" class="layui-input">
<span class="cx"> <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()"> <button style="margin-left: 10px" class="layui-btn" onclick="getBargainProduct()">查询</button>
</span> </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>
<button id="addMe" class="layui-btn layui-btn-radius" style="margin-left: 565px" onclick="addUser()">添加人员</button></span>
</p> </p>
</div> </div>
<div class="content"> <div class="content">
<p class="title list_ti"><span>用户列表</span></p> <p class="title list_ti"><span>用户列表</span></p>
<table border="" cellspacing="" cellpadding=""> <table class="layui-table" lay-size="sm">
</table> </table>
</div> </div>
...@@ -115,7 +123,7 @@ ...@@ -115,7 +123,7 @@
var total = data.total; var total = data.total;
data = data.list; data = data.list;
var content = ''; var content = '';
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>'; content += '<thead><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></thead>';
if(data!=null){ if(data!=null){
for (var i in data) { for (var i in data) {
content += '<tr>'; content += '<tr>';
...@@ -178,7 +186,7 @@ ...@@ -178,7 +186,7 @@
type: 2, type: 2,
title: '添加用户', title: '添加用户',
closeBtn: 1, closeBtn: 1,
area: ['300px','500px'], area: ['400px','500px'],
shade: 0, shade: 0,
btnAlign: 'c', btnAlign: 'c',
content: "/web/bpm/user/addUser", content: "/web/bpm/user/addUser",
......
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