feats

resources/static/css/public.css

@@ -20,9 +20,13 @@ img{border: 0;}
 
 /*主题框架*/
 
-.header{position:absolute;z-index:100;top:0;left:0;width:100%;}
+/* .header{position:absolute;z-index:100;top:0;left:0;width:100%;}
 .left{position:absolute;z-index:98;top:98px;bottom:40px;left:0;}
-.layout-content{position:absolute;z-index:97;top:74px;bottom:40px;left:240px;right:0;}
+.layout-content{position:absolute;z-index:97;top:74px;bottom:40px;left:240px;right:0;} */
+.header{width:100%; height: 94px;}
+.layout{ display: flex; position: relative; min-height: calc(100% - 94px);}
+.layout .left { flex: none; height: 100%; }
+.layout .layout-content { flex: 1; }
 
 .footer{background:var(--main-bg);text-align:center;height:40px;line-height:40px;color:#FFF;position:absolute;left:0;right:0;bottom:0;}
 
@@ -66,7 +70,7 @@ img{border: 0;}
 
 /*左侧*/
 .left{background:#fff;width: 240px;-moz-box-shadow:2px 0 3px rgba(0,0,0,.3);-webkit-box-shadow:2px 0 3px rgba(0,0,0,.3);box-shadow:2px 0 3px rgba(0,0,0,.3);}
-.leftNav{position:absolute; top:10px;right:0;bottom:10px;left:0;overflow-y: auto;padding:10px 0;}
+.leftNav{top:10px;right:0;bottom:10px;left:0;overflow-y: auto;padding:10px 0;}
 .leftNav::-webkit-scrollbar {display:none}
 
 .tree-menu{border:0;border-radius:0;}

resources/static/js/chart/chart.js

@@ -18,6 +18,12 @@ function getBar1Option(xAxisData, seriesData) {
   };
 
   return {
+    tooltip : {
+      trigger: 'axis',
+      axisPointer : {
+        type : 'shadow'
+      }
+    },
     xAxis: {
       type: 'category',
       axisLabel: axisLabel,
@@ -95,6 +101,12 @@ function getBar2Option(xAxisData, seriesData) {
       },
       type: 'value'
     },
+    tooltip : {
+      trigger: 'axis',
+      axisPointer : {
+        type : 'shadow'
+      }
+    },
     grid: {
       top: 20,
       left: 50,

resources/templates/common/common_menu.html

@@ -5,8 +5,10 @@
     function onNavMenuClick(dom, menuId) {
       $(".nav-menu .nav-menu-item.active").removeClass("active");
       $(dom).addClass("active");
+      $('.layout .left').attr("style","display: block");
 
       if (menuId == 'nav-menu-index') {
+        $('.layout .left').attr("style","display: none");
         toPage(ctxPath +"main");
       } else if (menuId == 'nav-menu-doc') {
         $(".help-doc").get(0).click()

resources/templates/index.html

@@ -38,45 +38,46 @@
 		</div>
 		<div th:replace="common/common_menu::nav-menu"></div>
 	</div>
-	<div class="left">
-		<div class="leftNav">
-			<nav class="menu" data-ride="menu">
-			  <ul id="treeMenu" class="tree tree-menu nav-menu-submenu nav-menu-report active" data-ride="tree">
-					<th:block th:each="menu:${user.menus}">
-							<li th:id="${menu.oldId}" th:if="${menu.oldId == '100009' || menu.oldId == '100381' || menu.oldId == '100383' || menu.oldId == '100008' || menu.oldId == '100382' || menu.oldId == '100384'  || menu.oldId == '100296'} ">
-									<a th:href="@{'javascript:childMenuHandle(\''+ ${menu.oldId} + '\',\'' + ${menu.nodepath} + '\',\'' + ${menu.nodename} + '\',\'' + ${menu.openimg} + '\')'}">
-											<i th:class="'iconfont '+${menu.nodeimg}"></i><i th:class="'iconfont '+${menu.openimg}"></i>[[${menu.nodename}]]
-									</a>
-							</li>
-					</th:block>
-				</ul>
-			  <ul id="treeMenu" class="tree tree-menu nav-menu-submenu nav-menu-government" data-ride="tree">
-					<th:block th:each="menu:${user.menus}">
-							<li th:id="${menu.oldId}" th:if="${menu.oldId == '100003' || menu.oldId == '100007' || menu.oldId == '100005' || menu.oldId == '100004' || menu.oldId == '100010' || menu.oldId == '100380'}">
-									<a th:href="@{'javascript:childMenuHandle(\''+ ${menu.oldId} + '\',\'' + ${menu.nodepath} + '\',\'' + ${menu.nodename} + '\',\'' + ${menu.openimg} + '\')'}">
-											<i th:class="'iconfont '+${menu.nodeimg}"></i><i th:class="'iconfont '+${menu.openimg}"></i>[[${menu.nodename}]]
-									</a>
-							</li>
-					</th:block>
-				</ul>
-			  <ul id="treeMenu" class="tree tree-menu nav-menu-submenu nav-menu-system" data-ride="tree">
-					<th:block th:each="menu:${user.menus}">
-							<li th:id="${menu.oldId}" th:if="${menu.oldId == '100272' || menu.oldId == '100273' }">
-									<a th:href="@{'javascript:childMenuHandle(\''+ ${menu.oldId} + '\',\'' + ${menu.nodepath} + '\',\'' + ${menu.nodename} + '\',\'' + ${menu.openimg} + '\')'}">
-											<i th:class="'iconfont '+${menu.nodeimg}"></i><i th:class="'iconfont '+${menu.openimg}"></i>[[${menu.nodename}]]
-									</a>
-							</li>
-					</th:block>
-			  </ul>
-			</nav>
+	<div class="layout">
+		<div class="left" style="display: none;">
+			<div class="leftNav">
+				<nav class="menu" data-ride="menu">
+					<ul id="treeMenu" class="tree tree-menu nav-menu-submenu nav-menu-report active" data-ride="tree">
+						<th:block th:each="menu:${user.menus}">
+								<li th:id="${menu.oldId}" th:if="${menu.oldId == '100009' || menu.oldId == '100381' || menu.oldId == '100383' || menu.oldId == '100008' || menu.oldId == '100382' || menu.oldId == '100384'  || menu.oldId == '100296'} ">
+										<a th:href="@{'javascript:childMenuHandle(\''+ ${menu.oldId} + '\',\'' + ${menu.nodepath} + '\',\'' + ${menu.nodename} + '\',\'' + ${menu.openimg} + '\')'}">
+												<i th:class="'iconfont '+${menu.nodeimg}"></i><i th:class="'iconfont '+${menu.openimg}"></i>[[${menu.nodename}]]
+										</a>
+								</li>
+						</th:block>
+					</ul>
+					<ul id="treeMenu" class="tree tree-menu nav-menu-submenu nav-menu-government" data-ride="tree">
+						<th:block th:each="menu:${user.menus}">
+								<li th:id="${menu.oldId}" th:if="${menu.oldId == '100003' || menu.oldId == '100007' || menu.oldId == '100005' || menu.oldId == '100004' || menu.oldId == '100010' || menu.oldId == '100380'}">
+										<a th:href="@{'javascript:childMenuHandle(\''+ ${menu.oldId} + '\',\'' + ${menu.nodepath} + '\',\'' + ${menu.nodename} + '\',\'' + ${menu.openimg} + '\')'}">
+												<i th:class="'iconfont '+${menu.nodeimg}"></i><i th:class="'iconfont '+${menu.openimg}"></i>[[${menu.nodename}]]
+										</a>
+								</li>
+						</th:block>
+					</ul>
+					<ul id="treeMenu" class="tree tree-menu nav-menu-submenu nav-menu-system" data-ride="tree">
+						<th:block th:each="menu:${user.menus}">
+								<li th:id="${menu.oldId}" th:if="${menu.oldId == '100272' || menu.oldId == '100273' }">
+										<a th:href="@{'javascript:childMenuHandle(\''+ ${menu.oldId} + '\',\'' + ${menu.nodepath} + '\',\'' + ${menu.nodename} + '\',\'' + ${menu.openimg} + '\')'}">
+												<i th:class="'iconfont '+${menu.nodeimg}"></i><i th:class="'iconfont '+${menu.openimg}"></i>[[${menu.nodename}]]
+										</a>
+								</li>
+						</th:block>
+					</ul>
+				</nav>
+			</div>
+		</div>
+		<div class="layout-content">
+			<iframe id="mainFrame" name="mainFrame" src="main" frameborder="0" width="100%" height="100%"></iframe>
 		</div>
-	</div>
-	<div class="layout-content">
-		<iframe id="mainFrame" name="mainFrame" src="main" frameborder="0" width="100%" height="100%"></iframe>
 	</div>
 </body>
-<script> 
-	
+<script>	
 	function logout() {
 		var confirmData = {
 			message : "您要注销登录么?",

resources/templates/main.html

@@ -374,5 +374,7 @@
 		});	
 		return colArr;
 	}
+
+	console.log('-------->', window)
 </script> 
 </html>