Merge branch 'master' of http://192.168.1.220:10080/esb/esb

src/main/webapp/WEB-INF/ehr/jsp/common/index.jsp

@@ -7,23 +7,25 @@
    .m-index-top{height:80px;background:url('${staticRoot}/images/index/logo.png') left top no-repeat #2a2a34;}
    .m-index-top-name{padding-left:40px;line-height:40px;color:#919baf;background:url('${staticRoot}/images/index/head_icon.png') 10px no-repeat;}
    .m-index-nav{height:40px;background:url('${staticRoot}/images/index/local_icon.png') 8px 8px no-repeat #fff;padding-left:40px;line-height: 40px;}
    .m-index-left{padding-top:10px;background:transparent}
    .m-index-left{background:#f6f9fa;}
    .m-index-menu-top{background:url('${staticRoot}/images/index/index_icon.png') 24px 12px no-repeat #fff;font-weight: bolder;padding-left: 55px;font-size: 16px;line-height: 40px;cursor: pointer}
    .m-index-menu-top-over{background:url('${staticRoot}/images/index/index_over_icon.png') 24px 12px no-repeat  #f0f0f0;font-size: 16px;color:#1eaaff}
    .m-index-center{background-color: #f0f0f0;padding-left: 10px;padding-top: 10px;padding-right: 10px;overflow-y: auto;overflow-x:hidden}
    .m-index-content{height:100%;background-color: #fff;border:1px solid #e1e1e1;border-bottom: 0px;}
    #ulTree.l-tree{background: transparent}
    #ulTree.l-tree li .l-body,#ulTree.l-tree li .l-body span{height:64px;line-height: 64px;font-size: 16px;font-weight: bolder}
    #ulTree.l-tree li.l-last .l-body{border-bottom:0px;}
    #ulTree.l-tree li .l-body{border-left:10px solid #dce6f0;border-right:10px solid #dce6f0;border-bottom:1px solid #cddceb;}
    #ulTree.l-tree{background: #f6f9fa;}
    #ulTree.l-tree li .l-body,#ulTree.l-tree li .l-body span{height: 45px;line-height: 45px;font-size: 14px;font-weight: bolder;}
    #ulTree.l-tree li .l-body{background: #f6f9fa;border-bottom: #e8e8e8 solid 1px;}
    #ulTree.l-tree li>.l-selected{background:#4DB2EE;}
    #ulTree.l-tree li>.l-selected span{color:#fff;}
    #ulTree.l-tree li .l-body .l-box{background: transparent;width:0px;}
    #ulTree.l-tree li .l-body .l-box.l-tree-icon{width:45px;height:64px;}
    #ulTree.l-tree li .l-body .l-box.l-tree-icon img{width:24px;height:24px;margin-top:20px;margin-left:10px;}
    #ulTree.l-tree .l-children li .l-body,#ulTree.l-tree .l-children li .l-body span{height:40px;line-height: 40px;font-size: 12px;font-weight:normal}
    #ulTree.l-tree .l-children li .l-body{padding-left:49px;border-left:6px solid #dce6f0;border-right:0px;border-bottom:0px;}
    #ulTree.l-tree .l-children li .l-body.l-selected{border-left:6px solid #1eaaff;background-color: #b9d2f0}
    #ulTree.l-tree li .l-body .l-box.l-tree-icon{width:45px;height:45px;}
    #ulTree.l-tree li .l-body .l-box.l-tree-icon img{width:16px;height:16px;margin-top:14px;margin-left:20px;}
    #ulTree.l-tree .l-children li .l-body,#ulTree.l-tree .l-children li .l-body span{height:45px;line-height: 45px;font-size: 12px;font-weight:normal;}
    #ulTree.l-tree .l-children li .l-body{height: 45px;line-height: 45px;padding-left:15px;}
    #ulTree.l-tree .l-children li .l-body.l-selected{background-color: #f6f9fa;}
    #ulTree.l-tree .l-children li>.l-body.l-selected span{color: #4DB2EE;}
    
    #btnIndexLogout{float: right;width:40px;height:40px;background:url('${staticRoot}/images/index/logout_btn.png') no-repeat;margin-left:10px;}
    #btnIndexLogout:hover{background:url('${staticRoot}/images/index/logout_over_btn.png') no-repeat;cursor:pointer}
    #btnIndexPassword{float: right;width:40px;height:40px;background:url('${staticRoot}/images/index/password_btn.png') no-repeat;}

src/main/webapp/WEB-INF/ehr/jsp/common/indexJs.jsp

@@ -73,63 +73,60 @@
            var menu = [
                //标准管理
                //标准规范中心
                {id: 2, text: '标准规范', icon: '${staticRoot}/images/index/menu3_icon.png'},
                {id: 21, pid: 2, text: '平台标准', url: '${contextRoot}/integration/initial/standard'},
                {id: 22, pid: 2, text: '应用标准', url: '${contextRoot}/integration/initial/application'},
                {id: 23, pid: 2, text: '适配方案', url: '${contextRoot}/adapterPlan/initial'},
                {id: 2, text: '标准规范', icon: '${staticRoot}/images/index/menu01.png'},
                {id: 21, pid: 2, text: '平台标准', url: '${contextRoot}/integration/initial/standard', icon: '${staticRoot}/images/index/dot.png'},
                {id: 22, pid: 2, text: '应用标准', url: '${contextRoot}/integration/initial/application', icon: '${staticRoot}/images/index/dot.png'},
                {id: 23, pid: 2, text: '适配方案', url: '${contextRoot}/adapterPlan/initial', icon: '${staticRoot}/images/index/dot.png'},
                //服务管理中心
                {id: 6, text: '服务管理', icon: '${staticRoot}/images/index/menu5_icon.png'},
                {id: 61, pid: 6, text: '服务管理', url: '${contextRoot}/app/initial'},
                {id: 62, pid: 6, text: '转换管理', url: '${contextRoot}/processor/initial'},
                {id: 6, text: '服务管理', icon: '${staticRoot}/images/index/menu02.png'},
                {id: 61, pid: 6, text: '服务管理', url: '${contextRoot}/app/initial', icon: '${staticRoot}/images/index/dot.png'},
                {id: 62, pid: 6, text: '转换管理', url: '${contextRoot}/processor/initial', icon: '${staticRoot}/images/index/dot.png'},
                //数据服务总线
                {id: 1, text: '服务总线', icon: '${staticRoot}/images/index/menu2_icon.png'},
                {id: 11, pid: 1, text: '流程编排', url: '${contextRoot}/flow/initial'},
                {id: 12, pid: 1, text: '任务配置', url: '${contextRoot}/datacollect/configJob'},
                {id: 13, pid: 1, text: '采集编排', url: '${contextRoot}/crawler/jobLayout'},
                {id: 14, pid: 1, text: '流程编辑', url: '${contextRoot}/process/initial'},
                {id: 1, text: '服务总线', icon: '${staticRoot}/images/index/menu03.png'},
                {id: 11, pid: 1, text: '流程编排', url: '${contextRoot}/flow/initial', icon: '${staticRoot}/images/index/dot.png'},
                {id: 12, pid: 1, text: '任务配置', url: '${contextRoot}/datacollect/configJob', icon: '${staticRoot}/images/index/dot.png'},
                {id: 13, pid: 1, text: '采集编排', url: '${contextRoot}/crawler/jobLayout', icon: '${staticRoot}/images/index/dot.png'},
                {id: 14, pid: 1, text: '流程编辑', url: '${contextRoot}/process/initial', icon: '${staticRoot}/images/index/dot.png'},
                //运行监控中心
                {id: 5, text: '运行监控', icon: '${staticRoot}/images/index/menu5_icon.png'},
                {id: 51, pid: 5, text: '系统监控', url: '${contextRoot}/monitor/server/initial'},
                {id: 52, pid: 5, text: '服务监控', url: '${contextRoot}/monitor/service/initial'},
                {id: 53, pid: 5, text: '任务跟踪', url: '${contextRoot}/datacollect/trackJob', targetType: '1'},
                {id: 54, pid: 5, text: '任务补采', url: '${contextRoot}/datacollect/repeatDatacollect'},
                {id: 55, pid: 5, text: '远程管理', url: '${contextRoot}/shell/initial'},
                {id: 5, text: '运行监控', icon: '${staticRoot}/images/index/menu04.png'},
                {id: 51, pid: 5, text: '系统监控', url: '${contextRoot}/monitor/server/initial', icon: '${staticRoot}/images/index/dot.png'},
                {id: 52, pid: 5, text: '服务监控', url: '${contextRoot}/monitor/service/initial', icon: '${staticRoot}/images/index/dot.png'},
                {id: 53, pid: 5, text: '任务跟踪', url: '${contextRoot}/datacollect/trackJob', targetType: '1', icon: '${staticRoot}/images/index/dot.png'},
                {id: 54, pid: 5, text: '任务补采', url: '${contextRoot}/datacollect/repeatDatacollect', icon: '${staticRoot}/images/index/dot.png'},
                {id: 55, pid: 5, text: '远程管理', url: '${contextRoot}/shell/initial', icon: '${staticRoot}/images/index/dot.png'},
                //资源管理
                {id: 3, text: '资源服务', icon: '${staticRoot}/images/index/menu4_icon.png'},
                {id: 31, pid: 3, text: '资源注册', url: '${contextRoot}/resource/resource/initial'},
                {id: 32, pid: 3, text: '资源浏览', url: '${contextRoot}/resource/resourcePage'},
                {id: 34, pid: 3, text: '资源分类', url: '${contextRoot}/resource/rsCategory/initial'},
                {id: 35, pid: 3, text: '业务资源', url: '${contextRoot}/resourceRest/initial'},
                {id: 3, text: '资源服务', icon: '${staticRoot}/images/index/menu05.png'},
                {id: 31, pid: 3, text: '资源注册', url: '${contextRoot}/resource/resource/initial', icon: '${staticRoot}/images/index/dot.png'},
                {id: 32, pid: 3, text: '资源浏览', url: '${contextRoot}/resource/resourcePage', icon: '${staticRoot}/images/index/dot.png'},
                {id: 34, pid: 3, text: '资源分类', url: '${contextRoot}/resource/rsCategory/initial', icon: '${staticRoot}/images/index/dot.png'},
                {id: 35, pid: 3, text: '业务资源', url: '${contextRoot}/resourceRest/initial', icon: '${staticRoot}/images/index/dot.png'},
                //维度管理
                <%--{id: 4, text: '维度管理', icon: '${staticRoot}/images/index/menu5_icon.png'},--%>
                {id: 36, pid: 3, text: '维度配置', url: '${contextRoot}/dimension/dimension'},
                {id: 37, pid: 3, text: '维度类别配置', url: '${contextRoot}/dimension/dimensioncatetory'},
                {id: 36, pid: 3, text: '维度配置', url: '${contextRoot}/dimension/dimension', icon: '${staticRoot}/images/index/dot.png'},
                {id: 37, pid: 3, text: '维度类别配置', url: '${contextRoot}/dimension/dimensioncatetory', icon: '${staticRoot}/images/index/dot.png'},
                //用户安全中心
                {id: 7, text: '用户安全', icon: '${staticRoot}/images/index/menu5_icon.png'},
                {id: 71, pid: 7, text: '机构管理', url: '${contextRoot}/org/initial'},
                {id: 72, pid: 7, text: '用户管理', url: '${contextRoot}/user/initial'},
                {id: 73, pid: 7, text: '角色管理', url: '${contextRoot}/role/initial'},
                {id: 74, pid: 7, text: '权限管理', url: '${contextRoot}/authority/initial'},
                {id: 7, text: '用户安全', icon: '${staticRoot}/images/index/menu06.png'},
                {id: 71, pid: 7, text: '机构管理', url: '${contextRoot}/org/initial', icon: '${staticRoot}/images/index/dot.png'},
                {id: 72, pid: 7, text: '用户管理', url: '${contextRoot}/user/initial', icon: '${staticRoot}/images/index/dot.png'},
                {id: 73, pid: 7, text: '角色管理', url: '${contextRoot}/role/initial', icon: '${staticRoot}/images/index/dot.png'},
                {id: 74, pid: 7, text: '权限管理', url: '${contextRoot}/authority/initial', icon: '${staticRoot}/images/index/dot.png'},
                //系统配置
                {id: 9, text: '系统配置', icon: '${staticRoot}/images/index/menu6_icon.png'},
                {id: 91, pid: 9, text: '系统参数', url: '${contextRoot}/param/initial'},
                {id: 92, pid: 9, text: '字典管理', url: '${contextRoot}/dict/initial'},
                {id: 93, pid: 9, text: '菜单配置', url: '${contextRoot}/menu/initial'},
                {id: 94, pid: 9, text: '菜单按钮配置', url: '${contextRoot}/menu/menuAction/initial'},
                {id: 95, pid: 9, text: '数据源配置', url: '${contextRoot}/datasource/configSources'},
                //质控规则管理
                {id: 8, text: '质控规则管理', icon: '${staticRoot}/images/index/menu5_icon.png'},
                {id: 81, pid: 8, text: '规则管理', url: '${contextRoot}/rule/initial'},
                {id: 9, text: '系统配置', icon: '${staticRoot}/images/index/menu07.png'},
                {id: 91, pid: 9, text: '系统参数', url: '${contextRoot}/param/initial', icon: '${staticRoot}/images/index/dot.png'},
                {id: 92, pid: 9, text: '字典管理', url: '${contextRoot}/dict/initial', icon: '${staticRoot}/images/index/dot.png'},
                {id: 93, pid: 9, text: '菜单配置', url: '${contextRoot}/menu/initial', icon: '${staticRoot}/images/index/dot.png'},
                {id: 94, pid: 9, text: '菜单按钮配置', url: '${contextRoot}/menu/menuAction/initial', icon: '${staticRoot}/images/index/dot.png'},
                {id: 95, pid: 9, text: '数据源配置', url: '${contextRoot}/datasource/configSources', icon: '${staticRoot}/images/index/dot.png'},
            ];
            if(userRole=="admin"){
                //是管理中心用户，则添加租户管理模块
//                menu = menu.concat(tenantManager);
                var menu_1 = [
                    {id: 10, text: '租户管理', icon: '${staticRoot}/images/index/menu1_icon.png'},
                    {id: 101, pid: 10, text: '租户管理', url: '${contextRoot}/tenant/initial'},
                    {id: 102, pid: 10, text: '数据库实例管理', url: '${contextRoot}/tenant/dataBase/initial'}
                    {id: 10, text: '租户管理', icon: '${staticRoot}/images/index/menu08.png'},
                    {id: 101, pid: 10, text: '租户管理', url: '${contextRoot}/tenant/initial', icon: '${staticRoot}/images/index/dot.png'},
                    {id: 102, pid: 10, text: '数据库实例管理', url: '${contextRoot}/tenant/dataBase/initial', icon: '${staticRoot}/images/index/dot.png'}
                ];
                menu =  menu.concat(menu_1);
            }
@@ -138,7 +135,6 @@
//            var menu_1 = [
//            ]
//            menu =  menu.concat(menu_1);
            me.menuTree = $('#ulTree').ligerTree({
                data: menu,
                idFieldName: 'id',
@@ -148,24 +144,57 @@
                autoCheckboxEven: false,
                needCancel: false,
                btnClickToToggleOnly: false,
                slide: false,
                slide: true,
                nodeDraggable: false,
                isExpand: false,
                parentIcon: true,
                childIcon: true,
                nodeWidth: 176,
                onSelect: function (obj) {
                    if (obj.data.url != undefined) {
                	if (obj.data.url != undefined) {
                        me.openMenu(obj);
                    }
                	//选中子菜单时默认选中父菜单
                	if(obj.data.children == undefined){
                		var parent = $("#ulTree li").eq(obj.data.treedataindex).parents("li");
                		var parImg = parent.children(".l-body").children(".l-tree-icon").find("img");
                		parent.children(".l-body").addClass("l-selected");
                		if(parImg.attr("src").indexOf("hover") == -1){
                			var imgSrc = parImg.attr("src");
                			parImg.attr("src",imgSrc.substring(0,imgSrc.length-4)+"_hover.png");
                		}
                	}
                	//切换选中菜单的图标
                	var imgSrc = obj.data.icon;
                	if(imgSrc.indexOf("hover")>0){
                		obj.data.hover = imgSrc;
                	}else{
                		obj.data.hover = imgSrc.substring(0,obj.data.icon.length-4)+"_hover.png";
                		obj.data.icon = obj.data.hover;
                	}
                	$("#ulTree li").eq(obj.data.treedataindex).children(".l-body").find("img").attr("src",obj.data.hover);
                	$.each($(".l-body"), function(index, item) {
						var self = $(this);
						if(!self.hasClass("l-selected")){
							var imgSrcs = self.find("img").attr("src");
							if(imgSrcs.indexOf("hover") > 0){	
								self.find("img").attr("src",imgSrcs.substring(0,imgSrcs.length-10)+".png");
							}
						}
					});
                },
                onClick:function(obj){
                	
					
                },
                //一级节点不可选中
                onAfterAppend: function () {
                    $.each($("#ulTree li[outlinelevel='1']"), function (index, item) {
                        $(item).addClass("l-unselectable");
                    });
//                  $.each($("#ulTree li[outlinelevel='1']"), function (index, item) {
//                      $(item).addClass("l-unselectable");
//                  });
                }
            });
			
            //首页按钮
            $('#btnIndexHome').bind('click', function () {
                me.openHome();