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

src/main/java/com/yihu/hos/ServletInitializer.java

@@ -7,7 +7,7 @@ public class ServletInitializer extends SpringBootServletInitializer {
	@Override
	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
		return application.sources(ESBApplication.class);
		return application.sources(ESBApplication.class)           ;
	}
}

src/main/java/com/yihu/hos/common/CommonPageController.java

@@ -177,7 +177,6 @@ public class CommonPageController extends BaseController {
                "        {id: 99, pid: 9, text: '<spring:message code=\"title.app.manage\"/>', url: '${contextRoot}/app/initial'}]";
        model.addAttribute("menu", menu);
        model.addAttribute("contentPage", "/common/index");
        return "pageView";
    }
@@ -248,7 +247,8 @@ public class CommonPageController extends BaseController {
        model.addAttribute("contentPage", "/common/index");
        //从此处登入不显示logo（标识showLogo==false）
        model.addAttribute("showLogo", "false");
        return "pageView";
    }

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

@@ -50,10 +50,15 @@
        homeUrl: "${contextRoot}/homePage",
        init: function () {
            var me = this;
            //showLogo == "false"不显示logo横条
            var topHeight =120;
            if (${showLogo == "false"}) {
                topHeight = 40
            }
            //主布局
            $("#divIndexMain").ligerLayout({
                space: 0,
                topHeight: 120,
                topHeight: topHeight,
                leftWidth: 220,
                allowLeftCollapse: false,
                allowLeftResize: false,
@@ -446,6 +451,14 @@
        isLogin();
        indexPage.init();
        //不显示logo横条
        if (${showLogo == "false"}) {
            $(".m-index-top").css("display","none");
            $(".m-index-top").height(0);
            $(".l-layout-left").css("top","40px");
            $(".l-layout-center").css("top","40px");
        }
    });
</script>