From 12678d31e40ac2c1c36fa93e8229d9f2d5bbe460 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Wed, 4 Apr 2018 11:10:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/sys/userList.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/views/sys/userList.jsp b/src/main/webapp/WEB-INF/views/sys/userList.jsp index c273baed9..a0641d124 100644 --- a/src/main/webapp/WEB-INF/views/sys/userList.jsp +++ b/src/main/webapp/WEB-INF/views/sys/userList.jsp @@ -187,7 +187,7 @@ ${fns:getOfficeDesc(user.office.id)} ${user.loginId} ${user.name} - ${user.identity eq 1 ?'信访办':'办理人员'} + ${user.identity eq 1 ?'管理人员':'普通人员'} ${user.email} From 42f388d874cc9e8c4f0e823055c5e0fc22511c2c Mon Sep 17 00:00:00 2001 From: zhangshilin Date: Wed, 4 Apr 2018 18:16:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?sys=5Fdict=5Finfo=20=E6=96=B0=E5=A2=9Eis=5F?= =?UTF-8?q?initianlize=E5=AD=97=E6=AE=B5=EF=BC=88=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=B8=BA=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AE=EF=BC=89?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=BE=97=E5=88=A0=E9=99=A4=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BB=85admin=E5=8F=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/domain/basics/SysDictInfo.java | 7 ++++++ .../com/nis/web/dao/basics/SysDictInfoDao.xml | 3 ++- .../service/basics/SysDictInfoService.java | 1 + .../WEB-INF/views/basics/sysDictList.jsp | 24 ++++++++++++++++--- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nis/domain/basics/SysDictInfo.java b/src/main/java/com/nis/domain/basics/SysDictInfo.java index 29a2fbd1b..0edc75a5e 100644 --- a/src/main/java/com/nis/domain/basics/SysDictInfo.java +++ b/src/main/java/com/nis/domain/basics/SysDictInfo.java @@ -30,6 +30,7 @@ public class SysDictInfo extends BaseEntity{ private SysUser sysDictEditor; //editor_id 修改人员 int Y 取自sys_user.id private Date editTime; //edit_time 修改时间 date Y private Integer levelNo; //层级 + private Integer isInitianlize; //是否为初始化数据 0：否 1：是 private List ChildrenList = new ArrayList();//字列表 private Date beginDate; // 开始日期 @@ -167,6 +168,12 @@ public class SysDictInfo extends BaseEntity{ public void setConditionType(List conditionType) { this.conditionType = conditionType; } + public Integer getIsInitianlize() { + return isInitianlize; + } + public void setIsInitianlize(Integer isInitianlize) { + this.isInitianlize = isInitianlize; + } @JsonIgnore public static void sortList(List list, List sourcelist, Integer parentId, boolean cascade){ for (int i=0; i diff --git a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java index 6eb3ac530..d2113e174 100644 --- a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java +++ b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java @@ -111,6 +111,7 @@ public class SysDictInfoService extends BaseService{ sysDictInfo.setCreateTime(new Date()); sysDictInfo.setSysDictEditor(user); sysDictInfo.setEditTime(sysDictInfo.getCreateTime()); + sysDictInfo.setIsInitianlize(0);//是否为初始化数据，默认为0：否 sysDictInfoDao.insertDict(sysDictInfo); } diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp index 9854519b8..4971c0fd4 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp @@ -31,13 +31,21 @@ function cmd(){ var url=arguments[0]; var mulitId=""; + var isinit = true; jQuery("#treeTable").find(":checkbox:checked[name='check']").each(function(){ if(jQuery(this).val()!=""){ + if(jQuery(this).prop("placeholder")==1){ + isinit = false; + } mulitId+=jQuery(this).val()+","; } }); if(mulitId!=""){ - confirmx("", url+"&mulitId="+mulitId); + if(isinit){ + confirmx("", url+"&mulitId="+mulitId); + }else{ + top.$.jBox.tip("", ""); + } }else{ top.$.jBox.tip("", ""); } @@ -54,7 +62,17 @@ } if(cked.length==1){ var url=arguments[0]; - confirmx("", url+"&sysDictId="+cked.val()); + if(cked.prop("placeholder")!=1){ + confirmx("", url+"&sysDictId="+cked.val()); + }else{ + if(${fns:getUser().loginId=='admin'}){ + confirmx("", url+"&sysDictId="+cked.val()); + }else{ + top.$.jBox.tip("", ""); + } + + } + } } @@ -295,7 +313,7 @@ - + <%-- ${sysDictInfo.showSequence} --%> ${sysDictInfo.itemCode} ${sysDictInfo.itemValue} From 6ac47b1e80df27c546d3cb19db16e52e7d57c00a Mon Sep 17 00:00:00 2001 From: chiguangxu Date: Wed, 4 Apr 2018 18:17:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/home.jsp | 110 +++++++++++++----- .../webapp/static/global/css/components.css | 41 ++++++- .../static/layouts/layout/css/layout.css | 31 +++-- 3 files changed, 140 insertions(+), 42 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp index a0d9d5597..9a28b8245 100644 --- a/src/main/webapp/WEB-INF/views/home.jsp +++ b/src/main/webapp/WEB-INF/views/home.jsp @@ -62,24 +62,10 @@ $("#searchText").click(function(){ $(this).val(""); }); + }); - //面包屑导航 -/* $(function(){ - - $("div ul li a").click(function(){ - if(typeof $(this).attr("id") !='undefined'){ - $("#menutwo").text($(this).text().trim()); - $("#menuthree").text(""); - }else{ - $("#menuthree").text($(this).text().trim()); - } -// var urlto=this+""; -// var ur="${ctx}"+urlto.split("nis")[1]; -// $("#menutwo").attr("href",ur); - }) -}) */ - + //页面跳转函数 level:级别，1顶级，2有子级。name:菜单名称，有多级#间隔。url：访问路径。object：点击元素对象。 function page_turn(id, level, name, url,obj){ var $object = $("#menu_"+id);//点击当前级别 @@ -117,28 +103,88 @@ function page_turn(id, level, name, url,obj){ $header.append("
  • "+breadcrumbs[i]+""+circle+"
    • "); } + + + App.scrollTo() + + App.startPageLoading({animate:true}); + //调入页面 window.frames['mainFrame'].location=url; + + $("#mainFrame").load(function(){ + App.stopPageLoading(); + }); + + - App.scrollTo() - } - + + function searchMenu() { - var search_txt = $("#searchText").val(); - if(search_txt.indexOf('_')!=-1){ - search_txt = search_txt.substring(search_txt.lastIndexOf('_')); - $("#menu"+search_txt+" >a").trigger('click'); - }else { - alert('未找到该菜单！'); - } + + if ($('body').hasClass("page-sidebar-closed")) { + if ($('.sidebar-search').hasClass('open') === false) { + if ($('.page-sidebar-fixed').size() === 1) { + $('.page-sidebar .sidebar-toggler').click(); //trigger sidebar toggle button + + } + $('.sidebar-search').addClass("open"); + } else { + + searchForm(); + } + } else { + searchForm() + } + + if ($('.sidebar-search').size() !== 0) { + $('.sidebar-search .input-group').on('click', function(e){ + e.stopPropagation(); + }); + + $('body').on('click', function() { + if ($('.sidebar-search').hasClass('open')) { + $('.sidebar-search').removeClass("open"); + } + }); + } +} + +function searchForm() { + + var search_txt = $("#searchText").val(); + if(search_txt.indexOf('_')!=-1){ + search_txt = search_txt.substring(search_txt.lastIndexOf('_')); + $("#menu"+search_txt+" >a").trigger('click'); + }else { + alert('未找到该菜单！'); + } +} + +function changeFrameHeight() { + + var iframe = $("#mainFrame"); + var clientHeight = $(window).height(); + + var headerHeight = $(".page-header").height(); + var barHeight = $(".page-bar").height(); + var footerHeight = $(".page-footer").height(); + var paddingHeight = 20; + + iframe.contents().find(".page-content").addClass("page-content-body"); + iframe.prop("height",clientHeight-headerHeight-barHeight-footerHeight-paddingHeight); + +} +window.onresize=function(){ + changeFrameHeight(); } - +
    @@ -150,6 +196,10 @@ function searchMenu() { src="${pageContext.request.contextPath}/static/layouts/layout/img/logo.png" alt="logo" class="logo-default" /> + +
    + +
    @@ -220,7 +270,7 @@ function searchMenu() { - + @@ -234,7 +284,7 @@ function searchMenu() {
  • @@ -318,7 +368,7 @@ function searchMenu() { - diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css index bb0b02513..4851ddcac 100644 --- a/src/main/webapp/static/global/css/components.css +++ b/src/main/webapp/static/global/css/components.css @@ -21591,5 +21591,42 @@ Color library demo } - - +.none-data { + position: absolute; + display: block; + padding: 20px 15px; + background-color: #fff; + border-bottom: 1px solid #ddd; + text-align: center; + margin-top: -1px; + width: 100%; + left: 0; +} + + +@media (max-width: 1480px) { + .mega-menu >li >a { + white-space: nowrap; + min-width: 108px; + width: 108px; + text-align:center; + overflow: hidden; + text-overflow:ellipsis; + } + + .mega-menu >li >a:hover { + width: 100%; + overflow: visible; + text-overflow: inherit; + } + +} + + +.mega-menu .dropdown-menu { + min-width: 190px; +} + + + + diff --git a/src/main/webapp/static/layouts/layout/css/layout.css b/src/main/webapp/static/layouts/layout/css/layout.css index 0a0395899..1cb6f7844 100644 --- a/src/main/webapp/static/layouts/layout/css/layout.css +++ b/src/main/webapp/static/layouts/layout/css/layout.css @@ -1572,10 +1572,10 @@ b-menu>li>.sub-menu>li>a { box-shadow:none!important } .page-container-bg-solid .page-bar,.page-content-white .page-bar { - background-color:#fff; - position:relative; - padding:0 20px; - margin:-25px -20px 0; + background-color: #fff; +position: relative; +padding: 0 15px; +margin: -0px 0px 0; } .page-container-bg-solid .page-bar .page-breadcrumb,.page-content-white .page-bar .page-breadcrumb { padding:11px 0 @@ -1606,10 +1606,19 @@ b-menu>li>.sub-menu>li>a { .page-container-bg-solid .page-bar .page-toolbar .btn.btn-sm,.page-content-white .page-bar .page-toolbar .btn.btn-sm { margin-top:0 } -.page-content { - margin-top:0; - padding-top: 15px; - background-color:#fff + +.page-content-body { + margin-top:0; + padding-top: 15px; + background-color:#fff; + position: absolute; + left: 0; + right: 0; + overflow-y: auto; + padding-left: 15px; + padding-right: 15px; + height: 100%; + } .page-content .row { @@ -1638,7 +1647,8 @@ b-menu>li>.sub-menu>li>a { margin-left:235px; margin-top:0; min-height:600px; - padding:25px 20px 10px + background-color: #fff; + /* padding:25px 20px 10px */ } .page-content-wrapper .page-content.no-min-height { min-height:auto @@ -1711,7 +1721,8 @@ b-menu>li>.sub-menu>li>a { .page-footer { padding:8px 20px 5px; font-size:13px; - height:33px + height:33px; + background-color: #333; } .page-footer:after,.page-footer:before { content:" ";