张延森 2 gadus atpakaļ
vecāks
revīzija
b9a8b1e448

+ 5
- 2
resources/static/css/common.css Parādīt failu

@@ -414,6 +414,9 @@
414 414
 .dashboard-page .act-list div[class^="col"] .act-bg img:nth-child(2) {
415 415
   display: none;
416 416
 }
417
+.dashboard-page .act-list div[class^="col"]:hover {
418
+  cursor: pointer;
419
+}
417 420
 .dashboard-page .act-list div[class^="col"]:hover .act-bg img:nth-child(1),
418 421
 .dashboard-page .act-list div[class^="col"]:hover .act-icon img:nth-child(1) {
419 422
   display: none;
@@ -423,6 +426,6 @@
423 426
   display: block;
424 427
 }
425 428
 .dashboard-page .act-list div[class^="col"]:hover .act-content span {
426
-  color: #ffffff;
427
-  background: transparent;
429
+  color: #fff;
430
+  background: none;
428 431
 }

+ 4
- 2
resources/static/less/ext-page.less Parādīt failu

@@ -210,6 +210,8 @@
210 210
       }
211 211
 
212 212
       &:hover {
213
+        cursor: pointer;
214
+
213 215
         .act-bg, .act-icon {
214 216
           img {
215 217
             &:nth-child(1) {
@@ -223,8 +225,8 @@
223 225
 
224 226
         .act-content {
225 227
           span {
226
-            color: #ffffff;
227
-            background: transparent;
228
+            color: #fff;
229
+            background: none;
228 230
           }
229 231
         }
230 232
       }

+ 3
- 4
resources/templates/common/common_header.html Parādīt failu

@@ -19,18 +19,17 @@
19 19
 	<script th:src="@{/js/jquery-validation/localization/messages_zh.min.js}"  th:if="${methodName=='edit'}"></script>
20 20
     <script th:src="@{/js/zui/dist/lib/bootbox/bootbox.js}"></script>
21 21
     <link th:href="@{/js/zui/dist/lib/bootbox/bootbox.css}" rel="stylesheet" type="text/css"/>
22
+		<link th:href="@{/css/common.css}" rel="stylesheet" type="text/css"/>
22 23
     <script th:src="@{/js/common.js}"></script>
23 24
     <script type="text/javascript" th:inline="javascript">
24 25
         /*<![CDATA[*/
25 26
 	    var  ctxPath = /*[[@{/}]]*/ '';
26
-	    /*]]>*/	 
27
-	  
28
-	</script> 
27
+	    /*]]>*/
28
+	</script>
29 29
     <th:block th:replace="${link}" />
30 30
     <!--/* Per-page placeholder for additional styles */-->
31 31
     <th:block th:replace="${style}" />  
32 32
     <!--/* Per-page placeholder for additional script */-->
33 33
     
34 34
  	<th:block th:replace="${script}" />	
35
-	<link th:href="@{/css/common.css}" rel="stylesheet" type="text/css"/>
36 35
 </head>

+ 23
- 11
resources/templates/common/common_menu.html Parādīt failu

@@ -2,16 +2,28 @@
2 2
 <html lang="zh-CN" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
3 3
 <div th:fragment="nav-menu" class="nav-menu">
4 4
   <script>
5
-    function onNavMenuClick(dom, menuId) {
5
+    function showSider(visible) {
6
+      if (visible) {
7
+        $('.layout .left').attr("style","display: block");
8
+      } else {
9
+        $('.layout .left').attr("style","display: none");
10
+      }
11
+    }
12
+
13
+    function activeNavMenu(menuId) {
6 14
       $(".nav-menu .nav-menu-item.active").removeClass("active");
7
-      $(dom).addClass("active");
8
-      $('.layout .left').attr("style","display: block");
15
+      $("#"+menuId).addClass("active");
16
+    }
17
+
18
+    function onNavMenuClick(menuId) {
19
+      activeNavMenu(menuId);
20
+      showSider(true);
9 21
 
10 22
       if (menuId == 'nav-menu-index') {
11 23
         toPage(ctxPath +"main?t=1");
12
-        $('.layout .left').attr("style","display: none");
24
+        showSider(false);
13 25
       } else if (menuId == 'nav-menu-data') {
14
-        $('.layout .left').attr("style","display: none");
26
+        showSider(false);
15 27
         toPage(ctxPath +"main?t=2");
16 28
       } else if (menuId == 'nav-menu-doc') {
17 29
         $(".help-doc").get(0).click()
@@ -26,22 +38,22 @@
26 38
     }
27 39
   </script>
28 40
   <a class="help-doc" th:href="@{/js/操作手册.pdf}" target="_blank" style="width: 0"></a>
29
-  <div class="nav-menu-item active" onclick="onNavMenuClick(this, 'nav-menu-index')">
41
+  <div id="nav-menu-index" class="nav-menu-item active" onclick="onNavMenuClick(this.id)">
30 42
     <div><span>首页</span></div>
31 43
   </div>
32
-  <div class="nav-menu-item" onclick="onNavMenuClick(this, 'nav-menu-data')">
44
+  <div id="nav-menu-data" class="nav-menu-item" onclick="onNavMenuClick(this.id)">
33 45
     <div><span>数据统计</span></div>
34 46
   </div>
35
-  <div class="nav-menu-item" onclick="onNavMenuClick(this, 'nav-menu-report')">
47
+  <div id="nav-menu-report" class="nav-menu-item" onclick="onNavMenuClick(this.id)">
36 48
     <div><span>数据上报</span></div>
37 49
   </div>
38
-  <div class="nav-menu-item" onclick="onNavMenuClick(this, 'nav-menu-government')">
50
+  <div id="nav-menu-government" class="nav-menu-item" onclick="onNavMenuClick(this.id)">
39 51
     <div><span>政务外网</span></div>
40 52
   </div>
41
-  <div class="nav-menu-item" onclick="onNavMenuClick(this, 'nav-menu-system')">
53
+  <div id="nav-menu-system" class="nav-menu-item" onclick="onNavMenuClick(this.id)">
42 54
     <div><span>系统管理</span></div>
43 55
   </div>
44
-  <div class="nav-menu-item" onclick="onNavMenuClick(this, 'nav-menu-doc')">
56
+  <div id="nav-menu-doc" class="nav-menu-item" onclick="onNavMenuClick(this.id)">
45 57
     <div>
46 58
       <span>操作手册</span>
47 59
     </div>

+ 18
- 10
resources/templates/index.html Parādīt failu

@@ -45,7 +45,7 @@
45 45
 					<ul id="treeMenu" class="tree tree-menu nav-menu-submenu nav-menu-report active" data-ride="tree">
46 46
 						<th:block th:each="menu:${user.menus}">
47 47
 								<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'} ">
48
-										<a th:href="@{'javascript:childMenuHandle(\''+ ${menu.oldId} + '\',\'' + ${menu.nodepath} + '\',\'' + ${menu.nodename} + '\',\'' + ${menu.openimg} + '\')'}">
48
+										<a th:href="@{'javascript:childMenuHandle(\''+ ${menu.oldId} + '\',\'' + ${menu.nodepath} + '\',\'' + ${menu.nodename} + '\',\'' + ${menu.openimg} + '\', \'nav-menu-report\')'}">
49 49
 												<i th:class="'iconfont '+${menu.nodeimg}"></i><i th:class="'iconfont '+${menu.openimg}"></i>[[${menu.nodename}]]
50 50
 										</a>
51 51
 								</li>
@@ -54,7 +54,7 @@
54 54
 					<ul id="treeMenu" class="tree tree-menu nav-menu-submenu nav-menu-government" data-ride="tree">
55 55
 						<th:block th:each="menu:${user.menus}">
56 56
 								<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'}">
57
-										<a th:href="@{'javascript:childMenuHandle(\''+ ${menu.oldId} + '\',\'' + ${menu.nodepath} + '\',\'' + ${menu.nodename} + '\',\'' + ${menu.openimg} + '\')'}">
57
+										<a th:href="@{'javascript:childMenuHandle(\''+ ${menu.oldId} + '\',\'' + ${menu.nodepath} + '\',\'' + ${menu.nodename} + '\',\'' + ${menu.openimg} + '\', \'nav-menu-government\')'}">
58 58
 												<i th:class="'iconfont '+${menu.nodeimg}"></i><i th:class="'iconfont '+${menu.openimg}"></i>[[${menu.nodename}]]
59 59
 										</a>
60 60
 								</li>
@@ -63,7 +63,7 @@
63 63
 					<ul id="treeMenu" class="tree tree-menu nav-menu-submenu nav-menu-system" data-ride="tree">
64 64
 						<th:block th:each="menu:${user.menus}">
65 65
 								<li th:id="${menu.oldId}" th:if="${menu.oldId == '100272' || menu.oldId == '100273' }">
66
-										<a th:href="@{'javascript:childMenuHandle(\''+ ${menu.oldId} + '\',\'' + ${menu.nodepath} + '\',\'' + ${menu.nodename} + '\',\'' + ${menu.openimg} + '\')'}">
66
+										<a th:href="@{'javascript:childMenuHandle(\''+ ${menu.oldId} + '\',\'' + ${menu.nodepath} + '\',\'' + ${menu.nodename} + '\',\'' + ${menu.openimg} + '\', \'nav-menu-system\')'}">
67 67
 												<i th:class="'iconfont '+${menu.nodeimg}"></i><i th:class="'iconfont '+${menu.openimg}"></i>[[${menu.nodename}]]
68 68
 										</a>
69 69
 								</li>
@@ -103,7 +103,7 @@
103 103
 		bootbox.confirm(confirmData);
104 104
 	}
105 105
 	  //二级菜单事件处理
106
-	function childMenuHandle(tmpId, tmpUrl, tmpText, openimg) {
106
+	function childMenuHandle(tmpId, tmpUrl, tmpText, openimg, parentMenu) {
107 107
 		var arr = document.getElementsByTagName("li");
108 108
 		for (var j = 0; j < arr.length; j++) {
109 109
 			arr[j].classList.remove("active");
@@ -125,19 +125,27 @@
125 125
 		localStorage.setItem("parentUrl",url);
126 126
 		localStorage.setItem("openimg",openimg);
127 127
 		window.top.hideMask();
128
+
129
+		activeNavMenu(parentMenu);
128 130
 	}
129 131
 	function passwordEdit(){
130 132
 		toPage(ctxPath + 'api/operator/toChangePwd')
131 133
 	}
132 134
 	function toMain(){
133 135
 		toPage(ctxPath +"main");
134
-		// 父级菜单回显
135
-		$(".nav-menu .nav-menu-item.active").removeClass("active");
136
-		$(".nav-menu .nav-menu-item").first().addClass("active");
137
-
136
+		activeNavMenu('nav-menu-index');
138 137
 	}
139
-	window.onload=function(){
140
-		
138
+	
139
+	function subMenuClick(menuText) {
140
+		var found = false;
141
+		$('.menu li').each(function(_, el) {
142
+			if (found) return;
143
+
144
+			if ($(el).text().includes(menuText)) {
145
+				$(el).find('a').get(0).click()
146
+				found = true;
147
+			}
148
+		});
141 149
 	}
142 150
 </script>
143 151
 </html>

+ 1
- 1
resources/templates/main.html Parādīt failu

@@ -2,7 +2,6 @@
2 2
 <html>
3 3
 <head
4 4
 	th:replace="common/common_header::common_header(~{},~{},~{::style},~{::script},'')">
5
-<meta charset="utf-8">
6 5
 <script th:src="@{/js/chart/echarts.min.js}" type="text/javascript"></script>
7 6
 <script th:src="@{/js/chart/chart.js}"></script>
8 7
 <script th:src="@{/js/chart/pie.js}"></script>
@@ -14,6 +13,7 @@
14 13
 @media (max-width: 1280px) {
15 14
 .panel{margin:30px 0 0 15px;}
16 15
 }
16
+body { background-color: #081A48; }
17 17
 </style>
18 18
 </head>
19 19
 <body>

+ 17
- 9
resources/templates/main/dashboard.html Parādīt failu

@@ -1,10 +1,18 @@
1 1
 <!DOCTYPE html>
2 2
 <html lang="zh-CN" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
3 3
 <div id="t1" th:fragment="main-dashboard" class="dashboard-page" style="display: none;">
4
+  <script>
5
+    function onAction(menuId, subMenuName) {
6
+      // 额外添加, 显示菜单栏
7
+      parent.onNavMenuClick(menuId);
8
+      parent.subMenuClick(subMenuName);
9
+    }
10
+  </script>
11
+
4 12
   <div></div>
5 13
   <div class="act-list">
6 14
     <div class="row">
7
-      <div class="col-md-3">
15
+      <div class="col-md-3" onclick="onAction('nav-menu-report','年度任务汇总')">
8 16
         <div class="act-bg">
9 17
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
10 18
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
@@ -22,7 +30,7 @@
22 30
           </div>
23 31
         </div>
24 32
       </div>
25
-      <div class="col-md-3">
33
+      <div class="col-md-3" onclick="onAction('nav-menu-report','军供任务明细')">
26 34
         <div class="act-bg">
27 35
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
28 36
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
@@ -40,7 +48,7 @@
40 48
           </div>
41 49
         </div>
42 50
       </div>
43
-      <div class="col-md-3">
51
+      <div class="col-md-3" onclick="onAction('nav-menu-report','军供保障能力')">
44 52
         <div class="act-bg">
45 53
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
46 54
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
@@ -58,7 +66,7 @@
58 66
           </div>
59 67
         </div>
60 68
       </div>
61
-      <div class="col-md-3">
69
+      <div class="col-md-3" onclick="onAction('nav-menu-report','军供保障预案')">
62 70
         <div class="act-bg">
63 71
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
64 72
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
@@ -71,14 +79,14 @@
71 79
           </div>
72 80
           <div class="act-content">
73 81
             <img th:src="@{/images/dashboard/left.png}" alt="">
74
-            <span>社会保障预案</span>
82
+            <span>军供保障预案</span>
75 83
             <img th:src="@{/images/dashboard/right.png}" alt="">
76 84
           </div>
77 85
         </div>
78 86
       </div>
79 87
     </div>
80 88
     <div class="row">
81
-      <div class="col-md-3">
89
+      <div class="col-md-3" onclick="onAction('nav-menu-report','社会保障机构')">
82 90
         <div class="act-bg">
83 91
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
84 92
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
@@ -96,7 +104,7 @@
96 104
           </div>
97 105
         </div>
98 106
       </div>
99
-      <div class="col-md-3">
107
+      <div class="col-md-3" onclick="onAction('nav-menu-report','军供供应设备')">
100 108
         <div class="act-bg">
101 109
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
102 110
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
@@ -114,7 +122,7 @@
114 122
           </div>
115 123
         </div>
116 124
       </div>
117
-      <div class="col-md-3">
125
+      <div class="col-md-3" onclick="onAction('nav-menu-government','军供站简介')">
118 126
         <div class="act-bg">
119 127
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
120 128
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
@@ -132,7 +140,7 @@
132 140
           </div>
133 141
         </div>
134 142
       </div>
135
-      <div class="col-md-3">
143
+      <div class="col-md-3" onclick="onAction('nav-menu-government','安防管理')">
136 144
         <div class="act-bg">
137 145
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
138 146
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">