feats

resources/static/css/common.css

@@ -415,7 +415,7 @@
 .dashboard-page .act-list .row {
   width: 100%;
   height: calc(35vh - 64px);
-  padding: 0 80px;
+  padding: 0 60px;
 }
 .dashboard-page .act-list .row + .row {
   margin-top: 64px;

resources/static/css/public.css

@@ -26,7 +26,7 @@ img{border: 0;}
 .left1{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;} */
 .header{width:100%; height: 94px;}
-.layout{ display: flex; position: relative; min-height: calc(100% - 94px);}
+.layout{ display: flex; position: relative; min-height: calc(100% - 94px); height: calc(100% - 94px);}
 .layout .left1 { flex: none; height: 100%; }
 .layout .layout-content { flex: 1; }
 
@@ -71,8 +71,8 @@ img{border: 0;}
 
 
 /*左侧*/
-.left1{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{top:10px;right:0;bottom:10px;left:0;overflow-y: auto;padding:10px 0;}
+.left1{background:var(--main-bg);; color: #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{top:10px;right:0;bottom:10px;left:0;overflow-y: auto;padding:10px 0;height: 100%;}
 .leftNav::-webkit-scrollbar {display:none}
 
 .tree-menu{border:0;border-radius:0;}
@@ -101,8 +101,8 @@ img{border: 0;}
 .tree-menu li.open > a .icon{background: transparent; color:#4c88fe;opacity: 1;}
 
 .tree-menu li > ul{background: #fff;padding:10px 0;border-bottom: #ddd 1px solid;}
-.tree-menu > li > a{height: 40px; line-height: 40px;color:#555;padding-left:32px;}
-.tree-menu > li > a .iconfont{color:#555;margin-right:10px;font-size:15px;}
+.tree-menu > li > a{height: 40px; line-height: 40px;color:#ccc;padding-left:32px;}
+.tree-menu > li > a .iconfont{color:#ccc;margin-right:10px;font-size:15px;}
 
 .tree-menu > li > a:focus,
 .tree-menu li.active {background: var(--primary-bg); color:#fff; border-radius: 0 40px 40px 0; }

resources/static/less/ext-page.less

@@ -203,7 +203,7 @@
     .row {
       width: 100%;
       height: calc(35vh - 64px);
-      padding: 0 80px;
+      padding: 0 60px;
 
       & + .row {
         margin-top: 64px;

resources/templates/index.html

@@ -53,17 +53,22 @@
 					</ul>
 					<ul id="treeMenu" class="tree tree-menu nav-menu-submenu nav-menu-government" data-ride="tree">
 						<th:block th:each="menu,state:${user.menus}">
-							<li id="tmp111" th:if="${state.index == 0}">
-								<a href="javascript:childMenuHandle('tmp111','api/station/toList?t=1','监控管理','icon-station-o', 'nav-menu-government')">
-									<i class="iconfont icon-film"></i><i class="iconfont icon-film"></i>监控管理
-								</a>
-							</li>
 								<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} + '\', \'nav-menu-government\')'}">
 												<i th:class="'iconfont '+${menu.nodeimg}"></i><i th:class="'iconfont '+${menu.openimg}"></i>[[${menu.nodename}]]
 										</a>
 								</li>
 						</th:block>
+						<li id="tmp111">
+							<a href="javascript:childMenuHandle('outer-link','http://192.168.9.10','大华监控','icon-station-o', 'nav-menu-government', 'tmp111')">
+								<i class="iconfont icon-film"></i><i class="iconfont icon-film"></i>大华监控
+							</a>
+						</li>
+						<li id="tmp222">
+							<a href="javascript:childMenuHandle('outer-link','http://192.168.9.10','海康监控','icon-station-o', 'nav-menu-government', 'tmp111')">
+								<i class="iconfont icon-film"></i><i class="iconfont icon-film"></i>海康监控
+							</a>
+						</li>
 					</ul>
 					<ul id="treeMenu" class="tree tree-menu nav-menu-submenu nav-menu-system" data-ride="tree">
 						<th:block th:each="menu:${user.menus}">
@@ -108,7 +113,15 @@
 		bootbox.confirm(confirmData);
 	}
 	  //二级菜单事件处理
-	function childMenuHandle(tmpId, tmpUrl, tmpText, openimg, parentMenu) {
+	function childMenuHandle(tmpId, tmpUrl, tmpText, openimg, parentMenu, parentId) {
+		if ('outer-link' == tmpId) {
+			var a = document.createElement('a');
+			a.target = '_blank';
+			a.href = tmpUrl;
+			a.click();
+			return;
+		}
+
 		var arr = document.getElementsByTagName("li");
 		for (var j = 0; j < arr.length; j++) {
 			arr[j].classList.remove("active");

resources/templates/main/dashboard.html

@@ -166,9 +166,93 @@
         </div>
       </div>
     </div>
+    <div class="row">
+      <div class="col-md-3" onclick="onAction('out-link','/rotationChart/list')">
+        <div class="act-bg">
+          <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
+          <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
+        </div>
+  
+        <div class="act-body">
+          <div class="act-icon">
+            <img th:src="@{/images/dashboard/军供供应设备.png}" alt="">
+            <img th:src="@{/images/dashboard/军供供应设备click.png}" alt="">
+          </div>
+          <div class="act-content">
+            <img th:src="@{/images/dashboard/left.png}" alt="">
+            <span>轮播图管理</span>
+            <img th:src="@{/images/dashboard/right.png}" alt="">
+          </div>
+        </div>
+      </div>
+      <div class="col-md-3" onclick="onAction('out-link','/dish/list')">
+        <div class="act-bg">
+          <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
+          <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
+        </div>
+  
+        <div class="act-body">
+          <div class="act-icon">
+            <img th:src="@{/images/dashboard/军供任务明细.png}" alt="">
+            <img th:src="@{/images/dashboard/军供任务明细click.png}" alt="">
+          </div>
+          <div class="act-content">
+            <img th:src="@{/images/dashboard/left.png}" alt="">
+            <span>菜肴管理</span>
+            <img th:src="@{/images/dashboard/right.png}" alt="">
+          </div>
+        </div>
+      </div>
+      <div class="col-md-3" onclick="onAction('out-link','/package/list')">
+        <div class="act-bg">
+          <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
+          <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
+        </div>
+  
+        <div class="act-body">
+          <div class="act-icon">
+            <img th:src="@{/images/dashboard/社会保障预案.png}" alt="">
+            <img th:src="@{/images/dashboard/社会保障预案click.png}" alt="">
+          </div>
+          <div class="act-content">
+            <img th:src="@{/images/dashboard/left.png}" alt="">
+            <span>套餐管理</span>
+            <img th:src="@{/images/dashboard/right.png}" alt="">
+          </div>
+        </div>
+      </div>
+      <div class="col-md-3" onclick="onAction('out-link','/guaranteeTask/list')">
+        <div class="act-bg">
+          <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
+          <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
+        </div>
+  
+        <div class="act-body">
+          <div class="act-icon">
+            <img th:src="@{/images/dashboard/年度任务汇总.png}" alt="">
+            <img th:src="@{/images/dashboard/年度任务汇总click.png}" alt="">
+          </div>
+          <div class="act-content">
+            <img th:src="@{/images/dashboard/left.png}" alt="">
+            <span>任务管理</span>
+            <img th:src="@{/images/dashboard/right.png}" alt="">
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
   <script>
+    var outLinkHost = 'http://127.0.0.1:8000/#';
+    var outLink = document.createElement('a');
+    outLink.target = '_blank';
+
     function onAction(menuId, subMenuName) {
+      if (menuId == 'out-link') {
+        outLink.href = `${outLinkHost}${subMenuName}`;
+        outLink.click();
+        return;
+      }
+
       // 额外添加, 显示菜单栏
       parent.onNavMenuClick(menuId);
       parent.subMenuClick(subMenuName);