.

.gitignore

@@ -0,0 +1,2 @@
+db/
+application.yml

application.yml

@@ -1,9 +1,9 @@
 spring:
   resources:
-    static-locations: file:///E:/work/jungongzhang/jgz/resources/static/
+    static-locations: file:///E:/work/newJgzWeb/resources/static/
   datasource:
     driver-class-name: org.h2.Driver
-    url: jdbc:h2:E:/work/jungongzhang/jgz/db/db
+    url: jdbc:h2:E:/work/newJgzWeb/db/db
     username: 
     password: 
     hikari:
@@ -13,7 +13,7 @@ spring:
       minimum-idle: 2
       connection-timeout: 30000
   thymeleaf:
-    prefix: file:///E:/work/jungongzhang/jgz/resources/templates/
+    prefix: file:///E:/work/newJgzWeb/resources/templates/
     cache: false
   jpa:
     generate-ddl: false

resources/static/css/common.css

@@ -26,7 +26,7 @@
 .nav-menu {
   display: flex;
   justify-content: center;
-  max-width: 600px;
+  max-width: 800px;
   height: 100%;
   margin: 0 auto;
 }
@@ -330,3 +330,126 @@
 .table tbody tr:hover {
   background: rgba(66, 118, 245, 0.2);
 }
+.dashboard-page {
+  height: 100%;
+  background-color: #081A48;
+}
+.dashboard-page > div {
+  height: 50%;
+  overflow: hidden;
+}
+.dashboard-page .dash-carousel {
+  max-width: 1200px;
+  margin: 0 auto;
+  height: 100%;
+}
+.dashboard-page .dash-carousel .ratio-static {
+  height: 0;
+  padding-bottom: 32%;
+  position: relative;
+  overflow: hidden;
+}
+.dashboard-page .dash-carousel .ratio-static > div {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: transparent;
+}
+.dashboard-page .dash-carousel .ratio-static .left {
+  width: auto;
+  background: transparent;
+  box-shadow: none;
+}
+.dashboard-page .act-list .row {
+  height: calc(50% - 64px);
+  padding: 0 80px;
+}
+.dashboard-page .act-list .row + .row {
+  margin-top: 64px;
+}
+.dashboard-page .act-list div[class^="col"] {
+  min-width: 280px;
+  width: calc(25% - 48px);
+  height: 100%;
+  position: relative;
+}
+.dashboard-page .act-list div[class^="col"] + div {
+  margin-left: 64px;
+}
+.dashboard-page .act-list div[class^="col"] .act-body {
+  z-index: 1;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.dashboard-page .act-list div[class^="col"] .act-body .act-icon {
+  position: relative;
+  width: 64px;
+  height: 64px;
+  min-height: 64px;
+  flex: 0;
+}
+.dashboard-page .act-list div[class^="col"] .act-body .act-icon img {
+  position: absolute;
+  left: calc(50% - 32px);
+  top: 0;
+  display: block;
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+.dashboard-page .act-list div[class^="col"] .act-body .act-icon img:nth-child(2) {
+  display: none;
+}
+.dashboard-page .act-list div[class^="col"] .act-body .act-content {
+  flex: 0;
+  text-align: center;
+}
+.dashboard-page .act-list div[class^="col"] .act-body .act-content span {
+  display: inline-block;
+  padding: 0 1em;
+  font-size: 24px;
+  font-weight: 500;
+  color: transparent;
+  background: linear-gradient(0deg, #2362E4 0%, #00D5FB 100%);
+  vertical-align: middle;
+  background-clip: text;
+  -webkit-background-clip: text;
+}
+.dashboard-page .act-list div[class^="col"] .act-bg {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  z-index: 0;
+  left: 0;
+  top: 0;
+}
+.dashboard-page .act-list div[class^="col"] .act-bg img {
+  display: block;
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+.dashboard-page .act-list div[class^="col"] .act-bg img:nth-child(2) {
+  display: none;
+}
+.dashboard-page .act-list div[class^="col"]:hover {
+  cursor: pointer;
+}
+.dashboard-page .act-list div[class^="col"]:hover .act-bg img:nth-child(1),
+.dashboard-page .act-list div[class^="col"]:hover .act-icon img:nth-child(1) {
+  display: none;
+}
+.dashboard-page .act-list div[class^="col"]:hover .act-bg img:nth-child(2),
+.dashboard-page .act-list div[class^="col"]:hover .act-icon img:nth-child(2) {
+  display: block;
+}
+.dashboard-page .act-list div[class^="col"]:hover .act-content span {
+  color: #fff;
+  background: none;
+}

resources/static/js/equipment/list.js

@@ -103,7 +103,11 @@ function datagrid(){
 						title : "操作",
 						width : 280,
 						formatter : function(data, row, index) {
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
+							var rtnData = [
+								'<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>',
+								'<a href="'+ urlPre + getClassName() +'/toUpdate?id='+row.id+'" class="btn btn-mini btn-link" title="编辑">编辑</a>',
+								'<a onclick="deleteObj('+index+', \'api/equipment\');" class="btn btn-mini btn-link" title="删除">删除</a>',
+							].join('');							
 							return rtnData;
 						}
 					} ]

resources/static/js/guaranteeOrg/list.js

@@ -39,18 +39,24 @@ function toUpdate() {
 /**
  * 删除的公用方法
  */
-function deleteObj() {
-	var boxes = $("input[name='dataId']:checked");
-	if (boxes.length == 0) {
-		bootbox.alert('请选择要删除的数据');
-		return false;
-	}
+function deleteObj(inx) {
 	var className = getClassName();
 	var datas = JSON.parse($("#datas").val());
 	let idArr = [];
-	for(let t=0;t<boxes.length;t++){
-		idArr[idArr.length] = datas[boxes[t].value].OLD_ID
+
+	if (inx === undefined) {
+		var boxes = $("input[name='dataId']:checked");
+		if (boxes.length == 0) {
+			bootbox.alert('请选择要删除的数据');
+			return false;
+		}
+		for(let t=0;t<boxes.length;t++){
+			idArr[idArr.length] = datas[boxes[t].value].OLD_ID
+		}
+	} else {
+		idArr.push(datas[inx].OLD_ID)
 	}
+
 	var delUrl = urlPre + className + "/" + idArr.toString();
 	top.bootbox.confirm("确认删除当前选中的记录吗?", function(result) {
 		if (result) {
@@ -126,9 +132,13 @@ function datagrid(){
 						title : "操作",
 						width : 280,
 						formatter : function(data, row, index) {
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.ID+'" class="btn btn-mini btn-link" title="查看">查看</a>';	
-							rtnData += '<a href="'+ urlPre  +'api/guaranteeOrgRecord/toList?org_id='+row.OLD_ID+'" class="btn btn-mini btn-link" title="审核记录">审核</a>';	
-							rtnData += '<a href="'+ urlPre  +'api/guaranteeOrgPerson/toList?org_id='+row.OLD_ID+'" class="btn btn-mini btn-link" title="人员管理">人员</a>';	
+							var rtnData = [
+								'<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.ID+'" class="btn btn-mini btn-link" title="查看">查看</a>',
+								'<a href="'+ urlPre + getClassName() +'/toUpdate?id='+row.ID+'" class="btn btn-mini btn-link" title="编辑">编辑</a>',
+								'<a onclick="deleteObj('+index+');" class="btn btn-mini btn-link" title="删除">删除</a>',
+								'<a href="'+ urlPre  +'api/guaranteeOrgRecord/toList?org_id='+row.OLD_ID+'" class="btn btn-mini btn-link" title="审核记录">审核</a>',
+								'<a href="'+ urlPre  +'api/guaranteeOrgPerson/toList?org_id='+row.OLD_ID+'" class="btn btn-mini btn-link" title="人员管理">人员</a>',
+							].join('');
 													return rtnData;
 						}
 					} ]

resources/static/js/guaranteeOrgPerson/list.js

@@ -54,7 +54,11 @@ function datagrid(){
 						title : "操作",
 						width : 280,
 						formatter : function(data, row, index) {
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
+							var rtnData = [
+								'<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>',
+								'<a href="'+ urlPre + getClassName() +'/toUpdate?id='+row.id+'" class="btn btn-mini btn-link" title="编辑">编辑</a>',
+								'<a onclick="deleteObj('+index+', \'api/guaranteeOrgPerson\');" class="btn btn-mini btn-link" title="删除">删除</a>',
+							].join('');							
 							return rtnData;
 						}
 					} ]

resources/static/js/guaranteeOrgRecord/list.js

@@ -62,7 +62,11 @@ function datagrid(){
 						title : "操作",
 						width : 280,
 						formatter : function(data, row, index) {
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
+							var rtnData = [
+								'<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>',
+								'<a href="'+ urlPre + getClassName() +'/toUpdate?id='+row.id+'" class="btn btn-mini btn-link" title="编辑">编辑</a>',
+								'<a onclick="deleteObj('+index+', \'api/guaranteeOrgRecord\');" class="btn btn-mini btn-link" title="删除">删除</a>',
+							].join('');
 							return rtnData;
 						}
 					} ]

resources/static/js/guaranteePlan/list.js

@@ -38,7 +38,11 @@ function datagrid(){
 						title : "操作",
 						width : 280,
 						formatter : function(data, row, index) {
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
+							var rtnData = [
+								'<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>',
+								'<a href="'+ urlPre + getClassName() +'/toUpdate?id='+row.id+'" class="btn btn-mini btn-link" title="编辑">编辑</a>',
+								'<a onclick="deleteObj('+index+', \'api/guaranteePlan\');" class="btn btn-mini btn-link" title="删除">删除</a>',
+							].join('');
 							return rtnData;
 						}
 					} ]

resources/static/js/task/list.js

@@ -74,8 +74,12 @@ function datagrid(){
 						title : "操作",
 						width : 280,
 						formatter : function(data, row, index) {
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
-							rtnData += '<a href="javascript:toList(\''+ row.config_evaluate_item+'\',\''+ row.oldId+'\')" class="btn btn-mini btn-link" title="评价">评价</a>';						
+							var rtnData = [
+								'<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>',
+								'<a href="'+ urlPre + getClassName() +'/toUpdate?id='+row.id+'" class="btn btn-mini btn-link" title="编辑">编辑</a>',
+								'<a onclick="deleteObj('+index+', \'api/task\');" class="btn btn-mini btn-link" title="删除">删除</a>',
+								'<a href="javascript:toList(\''+ row.config_evaluate_item+'\',\''+ row.oldId+'\')" class="btn btn-mini btn-link" title="评价">评价</a>'
+							].join('');						
 							return rtnData;
 						}
 					} ]

resources/static/less/ext-page.less

@@ -107,4 +107,159 @@
       }
     }
   }
-}
+}
+
+.dashboard-page {
+  height: 100%;
+  background-color: #081A48;
+
+  & > div {
+    height: 50%;
+    overflow: hidden;
+  }
+
+  .dash-carousel {
+    max-width: 1200px;
+    margin: 0 auto;
+    height: 100%;
+
+    .ratio-static {
+      height: 0;
+      padding-bottom: 32%; // 大约 10:3
+      position: relative;
+      overflow: hidden;
+
+      & > div {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background: transparent;
+      }
+
+      .left {
+        width: auto;
+        background: transparent;
+        box-shadow: none;
+      }
+    }
+
+  }
+  
+
+  .act-list {
+    .row {
+      height: calc(50% - 64px);
+      padding: 0 80px;
+
+      & + .row {
+        margin-top: 64px;
+      }
+    }
+
+    div[class^="col"] {
+      min-width: 280px;
+      // 每行 4 个, 间距 64
+      width: calc(25% - 48px);
+      height: 100%;
+      position: relative;
+      
+      & + div {
+        margin-left: 64px;
+      }
+
+      .act-body {
+        z-index: 1;
+        width: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        .act-icon {
+          position: relative;
+          width: 64px;
+          height: 64px;
+          min-height: 64px;
+          flex: 0;
+
+          img {
+            position: absolute;
+            left: calc(50% - 32px);
+            top: 0;
+            display: block;
+            width: 100%;
+            height: 100%;
+            object-fit: contain;
+  
+            &:nth-child(2) {
+              display: none;
+            }
+          }
+        }
+
+        .act-content {
+          flex: 0;
+          text-align: center;
+
+          span {
+            display: inline-block;
+            padding: 0 1em;
+            font-size: 24px;
+            font-weight: 500;
+            color: transparent;
+            background: linear-gradient(0deg, #2362E4 0%, #00D5FB 100%);
+            vertical-align: middle;
+            background-clip: text;
+            -webkit-background-clip: text;
+          }
+        }
+
+      }
+
+      .act-bg {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        z-index: 0;
+        left: 0;
+        top: 0;
+
+        img {
+          display: block;
+          width: 100%;
+          height: 100%;
+          object-fit: contain;
+
+          &:nth-child(2) {
+            display: none;
+          }
+        }
+      }
+
+      &:hover {
+        cursor: pointer;
+
+        .act-bg, .act-icon {
+          img {
+            &:nth-child(1) {
+              display: none;
+            }
+            &:nth-child(2) {
+              display: block;
+            }
+          }
+        }
+
+        .act-content {
+          span {
+            color: #fff;
+            background: none;
+          }
+        }
+      }
+    }
+  }
+}

resources/static/less/nav-menu.less

@@ -1,7 +1,7 @@
 .nav-menu {
   display: flex;
   justify-content: center;
-  max-width: 600px;
+  max-width: 800px;
   height: 100%;
   margin: 0 auto;
 

resources/templates/common/common_header.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <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">
 <head th:fragment="common_header(title,link,style,script,methodName)">
-    <title th:replace="${title}">全国军供保障信息管理系统</title>
+    <title th:replace="${title}">海安军供保障信息管理系统</title>
     <meta name="application-name" content="HTML5test"/>
 	<meta charset="utf-8"/>
 	<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
@@ -19,18 +19,17 @@
 	<script th:src="@{/js/jquery-validation/localization/messages_zh.min.js}"  th:if="${methodName=='edit'}"></script>
     <script th:src="@{/js/zui/dist/lib/bootbox/bootbox.js}"></script>
     <link th:href="@{/js/zui/dist/lib/bootbox/bootbox.css}" rel="stylesheet" type="text/css"/>
+		<link th:href="@{/css/common.css}" rel="stylesheet" type="text/css"/>
     <script th:src="@{/js/common.js}"></script>
     <script type="text/javascript" th:inline="javascript">
         /*<![CDATA[*/
 	    var  ctxPath = /*[[@{/}]]*/ '';
-	    /*]]>*/	 
-	  
-	</script>　
+	    /*]]>*/
+	</script>
     <th:block th:replace="${link}" />
     <!--/* Per-page placeholder for additional styles */-->
     <th:block th:replace="${style}" />  
     <!--/* Per-page placeholder for additional script */-->
     
  	<th:block th:replace="${script}" />	
-	<link th:href="@{/css/common.css}" rel="stylesheet" type="text/css"/>
 </head>

resources/templates/common/common_list.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-<html lang="zh-CN" xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:th="http://www.thymeleaf.org">
+<html lang="zh-CN" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
+
 <body th:fragment="common_list(title,div,haveAuth)" class="ext-page">
 	<input id="resCode" type="hidden" th:value="${resCode}" />
 	<th:block th:replace="${div}" />
@@ -20,27 +20,30 @@
 					onclick="queryDatas()" id="ordinary"><i class="icon icon-search"></i>搜索</a>
 			</span>
 			</span>-->
-			 <span id="schSpan" class="input-group">
+			<span id="schSpan" class="input-group">
 				<span class="input-group-addon" id="selSapn" style="display:none"></span>
-				<select data-placeholder="请选择查询项..." class="chosen-select form-control" tabindex="2" multiple=""  id="schSel" style="display:none">
-				 
+				<select data-placeholder="请选择查询项..." class="chosen-select form-control" tabindex="2" multiple="" id="schSel"
+					style="display:none">
+
 				</select>
-				 <span class="input-group-addon" id="schCol_span"></span>
-					 <input type="text" name="schVal" id="schVal" value="" class="form-control ">
-					 <input type="hidden" id="searchCols" />
-				 <span class="input-group-btn"><a class="input-group-btn btn btn-primary" onclick="queryDatas()" id="ordinary">搜索</a></span>
-			</span> 
+				<span class="input-group-addon" id="schCol_span"></span>
+				<input type="text" name="schVal" id="schVal" value="" class="form-control ">
+				<input type="hidden" id="searchCols" />
+				<span class="input-group-btn"><a class="input-group-btn btn btn-primary" onclick="queryDatas()"
+						id="ordinary">搜索</a></span>
+			</span>
 		</div>
 	</div>
 	<div class="panel">
 		<div class="panel-body">
 			<div class="editBar" id="schBar">
-				<span class="btn-group"  id="btnSpan" th:if="${haveAuth != null && haveAuth == '1'}">
-		        <a class="btn btn-primary" onclick="toAdd();" id="addBtn"><i class="icon icon-plus"></i>添加</a>
-						<!-- <a class="btn btn-info" onclick="toUpdate();" id="updateBtn"><i class="icon icon-edit"></i> 编辑</a> -->
-						<!-- <a class="btn btn-danger" onclick="deleteObj();" id="deleteBtn"><i class="icon icon-trash"></i>删除</a> -->
+				<span class="btn-group" id="btnSpan">
+					<!-- th:if="${haveAuth != null && haveAuth == '1'}" -->
+					<a class="btn btn-primary" onclick="toAdd();" id="addBtn"><i class="icon icon-plus"></i>添加</a>
+					<a class="btn btn-info" onclick="toUpdate();" id="updateBtn"><i class="icon icon-edit"></i> 编辑</a>
+					<a class="btn btn-danger" onclick="deleteObj();" id="deleteBtn"><i class="icon icon-trash"></i>删除</a>
 				</span>
-				
+
 			</div>
 			<div class="conCoverTable">
 				<input id="datas" type="hidden" value="">
@@ -49,7 +52,7 @@
 					<tbody id="tbTbody"></tbody>
 				</table>
 			</div>
-		
+
 			<div class="mainPager" id="pageDiv">
 				<div class="pull-right">
 					<ul class="pager">
@@ -58,22 +61,17 @@
 						<li id="nextLi"><a href="javascript:jumpPage('next')">下一页</a></li>
 						<li id="lastLi"><a href="javascript:jumpPage('last')">末页</a></li>
 					</ul>
-					<span class="form-condensed floatL"> <input id="currentPage"
-						type="hidden" value=""> <input id="totalPage" type="hidden"
-						value=""> <input id="totalNum" type="hidden" value="">
-						转至第<input id="jumppage" class="form-control" size="2" maxlength="5"
-						value="">页
-					</span> <span class="floatL"> <input name="pagesubmit"
-						class="btn btn-sm btn-primary" onclick="return gotoPage()"
-						type="button" value="跳转">
+					<span class="form-condensed floatL"> <input id="currentPage" type="hidden" value=""> <input id="totalPage"
+							type="hidden" value=""> <input id="totalNum" type="hidden" value="">
+						转至第<input id="jumppage" class="form-control" size="2" maxlength="5" value="">页
+					</span> <span class="floatL"> <input name="pagesubmit" class="btn btn-sm btn-primary"
+							onclick="return gotoPage()" type="button" value="跳转">
 				</div>
-				</span><span class="pull-left">总共<font class="text-red"
-					id="totalNumFont"></font>条记录&nbsp; 共<font class="text-red"
-					id="totalPageFont"></font>页&nbsp; 当前所在第<font class="text-red"
-					id="currentPageFont"></font>页
+				</span><span class="pull-left">总共<font class="text-red" id="totalNumFont"></font>条记录&nbsp; 共<font
+						class="text-red" id="totalPageFont"></font>页&nbsp; 当前所在第<font class="text-red" id="currentPageFont"></font>页
 				</span>
 			</div>
-	</div>
-		
+		</div>
+
 	</div>
 </body>

resources/templates/common/common_menu.html

@@ -2,14 +2,29 @@
 <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">
 <div th:fragment="nav-menu" class="nav-menu">
   <script>
-    function onNavMenuClick(dom, menuId) {
+    function showSider(visible) {
+      if (visible) {
+        $('.layout .left').attr("style","display: block");
+      } else {
+        $('.layout .left').attr("style","display: none");
+      }
+    }
+
+    function activeNavMenu(menuId) {
       $(".nav-menu .nav-menu-item.active").removeClass("active");
-      $(dom).addClass("active");
-      $('.layout .left').attr("style","display: block");
+      $("#"+menuId).addClass("active");
+    }
+
+    function onNavMenuClick(menuId) {
+      activeNavMenu(menuId);
+      showSider(true);
 
       if (menuId == 'nav-menu-index') {
-        $('.layout .left').attr("style","display: none");
-        toPage(ctxPath +"main");
+        toPage(ctxPath +"main?t=1");
+        showSider(false);
+      } else if (menuId == 'nav-menu-data') {
+        showSider(false);
+        toPage(ctxPath +"main?t=2");
       } else if (menuId == 'nav-menu-doc') {
         $(".help-doc").get(0).click()
       } else {
@@ -23,19 +38,22 @@
     }
   </script>
   <a class="help-doc" th:href="@{/js/操作手册.pdf}" target="_blank" style="width: 0"></a>
-  <div class="nav-menu-item active" onclick="onNavMenuClick(this, 'nav-menu-index')">
+  <div id="nav-menu-index" class="nav-menu-item active" onclick="onNavMenuClick(this.id)">
     <div><span>首页</span></div>
   </div>
-  <div class="nav-menu-item" onclick="onNavMenuClick(this, 'nav-menu-report')">
+  <div id="nav-menu-data" class="nav-menu-item" onclick="onNavMenuClick(this.id)">
+    <div><span>数据统计</span></div>
+  </div>
+  <div id="nav-menu-report" class="nav-menu-item" onclick="onNavMenuClick(this.id)">
     <div><span>数据上报</span></div>
   </div>
-  <div class="nav-menu-item" onclick="onNavMenuClick(this, 'nav-menu-government')">
+  <div id="nav-menu-government" class="nav-menu-item" onclick="onNavMenuClick(this.id)">
     <div><span>政务外网</span></div>
   </div>
-  <div class="nav-menu-item" onclick="onNavMenuClick(this, 'nav-menu-system')">
+  <div id="nav-menu-system" class="nav-menu-item" onclick="onNavMenuClick(this.id)">
     <div><span>系统管理</span></div>
   </div>
-  <div class="nav-menu-item" onclick="onNavMenuClick(this, 'nav-menu-doc')">
+  <div id="nav-menu-doc" class="nav-menu-item" onclick="onNavMenuClick(this.id)">
     <div>
       <span>操作手册</span>
     </div>

resources/templates/dataManager/add.html

@@ -1,96 +1,117 @@
 <html lang="zh-CN">
-<head
-	th:replace="common/common_header::common_header(~{},~{::link},~{},~{::script},'edit')">
-<meta charset="utf-8" />
-<link th:href="@{/js/zui/dist/lib/uploader/zui.uploader.min.css}"
-	rel="stylesheet">
-<script th:src="@{/js/zui/dist/lib/uploader/zui.uploader.min.js}"></script>
-<script th:src="@{/js/dataManager/add.js}"></script>
+
+<head th:replace="common/common_header::common_header(~{},~{::link},~{},~{::script},'edit')">
+	<meta charset="utf-8" />
+	<link th:href="@{/js/zui/dist/lib/uploader/zui.uploader.min.css}" rel="stylesheet">
+	<script th:src="@{/js/zui/dist/lib/uploader/zui.uploader.min.js}"></script>
+	<script th:src="@{/js/dataManager/add.js}"></script>
 
 </head>
-<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">  	
-		<div class="panel-body">
-		<form id="dataManagerForm"  method="post" class="conForm load-indicator" data-loading="正在处理...">
-			<h1 class="title">基本信息</h1>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">资料名称：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="dataTitle" name="dataTitle" class="form-control required" 
-						 maxlength="100">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">资料类别：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="dataType" id="dataType"
-						class="form-control required" aria-required="true" aria-invalid="false"><option
-							 value="" selected="">--请选择--</option></select>
+
+<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
+	<div class="panel-body">
+		<form id="dataManagerForm" method="post" class="conForm load-indicator" data-loading="正在处理...">
+
+			<div class="ext-card">
+				<h1 class="title">基本信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">资料名称：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="dataTitle" name="dataTitle" class="form-control required" maxlength="100">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">资料类别：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="dataType" id="dataType" class="form-control required" aria-required="true"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<!-- <div class="form-group col-xs-12">
+						<label class="col-sm-4">是否允许全局查看：</label>
+						<div class="col-lg-6 col-xs-8">
+							<label class="checkbox-inline"> <input type="checkbox"
+								name="ifGlobalView" id="ifGlobalView" value="1">
+							</label>
+						</div>
+					</div> -->
+					<div class="form-group col-xs-12">
+						<label class="col-sm-4">资料摘要：</label>
+						<div class="col-lg-10 col-xs-12">
+							<textarea style="resize: none;" rows="5" name="dataSummary" maxlength="500"
+								class="form-control"></textarea>
+						</div>
+					</div>
 				</div>
 			</div>
-			<!-- <div class="form-group col-xs-12">
-				<label class="col-sm-4">是否允许全局查看：</label>
-				<div class="col-lg-6 col-xs-8">
-					<label class="checkbox-inline"> <input type="checkbox"
-						name="ifGlobalView" id="ifGlobalView" value="1">
-					</label>
-				</div>
-			</div> -->
-			<div class="form-group col-xs-12">
-				<label class="col-sm-4">资料摘要：</label>
-				<div class="col-lg-10 col-xs-12">
-					<textarea style="resize: none;" rows="5" name="dataSummary"
-						maxlength="500" class="form-control"></textarea>
+
+			<div class="ext-card">
+				<h1 class="title">资料附件</h1>
+				<div class="wd-m">
+					<div class="">
+						<input type="hidden" id="dataFiles" name="dataFiles" />
+						<div id="tableUploader" class="uploader">
+							<div class="uploader-message text-center">
+								<div class="content"></div>
+								<button type="button" class="close">×</button>
+							</div>
+							<table class="table table-bordered">
+								<thead>
+									<tr>
+										<th colspan="2">文件名</th>
+										<th style="width: 100px">大小</th>
+										<th style="width: 160px; text-align: center;">状态/操作</th>
+									</tr>
+								</thead>
+								<tbody class="uploader-files">
+									<tr class="file template">
+										<td style="width: 38px; padding: 3px">
+											<div class="file-icon"></div>
+										</td>
+										<td style="padding: 0">
+											<div style="position: relative; padding: 8px;">
+												<strong class="file-name"></strong>
+												<div class="file-progress-bar"></div>
+											</div>
+										</td>
+										<td><span class="file-size text-muted"></span></td>
+										<td class="actions text-right" style="padding: 0 4px;">
+											<div class="file-status" data-toggle="tooltip" style="margin: 8px;"><i class="icon"></i> <span
+													class="text"></span></div>
+											<a data-toggle="tooltip" class="btn btn-link btn-download-file" target="_blank"><i
+													class="icon icon-download-alt"></i></a>
+											<button type="button" data-toggle="tooltip" class="btn btn-link btn-reset-file" title="Repeat"><i
+													class="icon icon-repeat"></i></button>
+											<button type="button" data-toggle="tooltip" class="btn btn-link btn-rename-file" title="Rename"><i
+													class="icon icon-pencil"></i></button>
+											<button type="button" data-toggle="tooltip" title="Remove" class="btn btn-link btn-delete-file"><i
+													class="icon icon-trash text-danger"></i></button>
+										</td>
+									</tr>
+								</tbody>
+								<tfoot>
+									<tr>
+										<td colspan="4" style="padding: 4px 0">
+											<div style="position: relative;">
+												<div class="uploader-status pull-right text-muted" style="margin-top: 5px;"></div>
+												<button type="button" class="btn btn-link uploader-btn-browse"><i class="icon icon-plus"></i>
+													选择文件</button>
+												<button type="button" class="btn btn-link uploader-btn-start"><i
+														class="icon icon-cloud-upload"></i> 开始上传</button>
+											</div>
+										</td>
+									</tr>
+								</tfoot>
+							</table>
+						</div>
+					</div>
 				</div>
+
 			</div>
-			<h1 class="title">资料附件</h1>
-			<div class="">
-			<input type="hidden" id="dataFiles" name="dataFiles" />
-			<div id="tableUploader" class="uploader">
-				  <div class="uploader-message text-center">
-				    <div class="content"></div>
-				    <button type="button" class="close">×</button>
-				  </div>
-				  <table class="table table-bordered">
-				    <thead>
-				      <tr>
-				        <th colspan="2">文件名</th>
-				        <th style="width: 100px">大小</th>
-				        <th style="width: 160px; text-align: center;">状态/操作</th>
-				      </tr>
-				    </thead>
-				    <tbody class="uploader-files">
-				      <tr class="file template">
-				        <td style="width: 38px; padding: 3px"><div class="file-icon"></div></td>
-				        <td style="padding: 0">
-				          <div style="position: relative; padding: 8px;">
-				            <strong class="file-name"></strong>
-				            <div class="file-progress-bar"></div>
-				          </div>
-				        </td>
-				        <td><span class="file-size text-muted"></span></td>
-				        <td class="actions text-right" style="padding: 0 4px;">
-				          <div class="file-status" data-toggle="tooltip" style="margin: 8px;"><i class="icon"></i> <span class="text"></span></div>
-				          <a data-toggle="tooltip" class="btn btn-link btn-download-file" target="_blank"><i class="icon icon-download-alt"></i></a>
-				          <button type="button" data-toggle="tooltip" class="btn btn-link btn-reset-file" title="Repeat"><i class="icon icon-repeat"></i></button>
-				          <button type="button" data-toggle="tooltip" class="btn btn-link btn-rename-file" title="Rename"><i class="icon icon-pencil"></i></button>
-				          <button type="button" data-toggle="tooltip" title="Remove" class="btn btn-link btn-delete-file"><i class="icon icon-trash text-danger"></i></button>
-				        </td>
-				      </tr>
-				    </tbody>
-				    <tfoot>
-				      <tr>
-				        <td colspan="4" style="padding: 4px 0">
-				          <div style="position: relative;">
-				            <div class="uploader-status pull-right text-muted" style="margin-top: 5px;"></div>
-				            <button type="button" class="btn btn-link uploader-btn-browse"><i class="icon icon-plus"></i> 选择文件</button>
-				            <button type="button" class="btn btn-link uploader-btn-start"><i class="icon icon-cloud-upload"></i> 开始上传</button>
-				          </div>
-				        </td>
-				      </tr>
-				    </tfoot>
-				  </table>
-				</div>
-				</div>
+
 			<div class="btnEnd">
 				<button class="btn btn-primary" id="submitBtn" type="button">保存</button>
 				<button class="btn" type="button" onclick="history.back();">取消</button>

resources/templates/dataManager/details.html

@@ -1,84 +1,106 @@
 <html lang="zh-CN">
-<head
-	th:replace="common/common_header::common_header(~{},~{::link},~{::style},~{::script},'')">
-<meta charset="utf-8" />
-<link th:href="@{/js/zui/dist/lib/uploader/zui.uploader.min.css}"
-	rel="stylesheet">
-<script th:src="@{/js/zui/dist/lib/uploader/zui.uploader.min.js}"></script>
-<script th:src="@{/js/dataManager/details.js}"></script>
-<script th:src="@{/js/pictureViewer/js/pictureViewer.js}"></script>
-<script th:src="@{/js/pictureViewer/js/jquery.mousewheel.min.js}"></script>
-<script th:src="@{/js/pictureViewer/js/pictureViewer.js}"></script>
-<link rel="stylesheet" type="text/css" th:href="@{/js/pictureViewer/css/pictureViewer.css}">
-<style type="text/css">
-.view-info>div>label{min-width: 148px;}
-</style>
+
+<head th:replace="common/common_header::common_header(~{},~{::link},~{::style},~{::script},'')">
+	<meta charset="utf-8" />
+	<link th:href="@{/js/zui/dist/lib/uploader/zui.uploader.min.css}" rel="stylesheet">
+	<script th:src="@{/js/zui/dist/lib/uploader/zui.uploader.min.js}"></script>
+	<script th:src="@{/js/dataManager/details.js}"></script>
+	<script th:src="@{/js/pictureViewer/js/pictureViewer.js}"></script>
+	<script th:src="@{/js/pictureViewer/js/jquery.mousewheel.min.js}"></script>
+	<script th:src="@{/js/pictureViewer/js/pictureViewer.js}"></script>
+	<link rel="stylesheet" type="text/css" th:href="@{/js/pictureViewer/css/pictureViewer.css}">
+	<style type="text/css">
+		.view-info>div>label {
+			min-width: 148px;
+		}
+	</style>
 </head>
+
 <body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
 	<div class="panel-body">
-		<form id="equipmentForm" action="" method="post"
-			class="conForm view-info">		
-				<h1 class="title">基本信息</h1>	
-			<div class="col-xs-6">
-				<label>资料名称：</label>[[${dataManagerObj.dataTitle}]]
-			</div>
-			<div class="col-xs-6">
-				<label>资料类别：</label><font th:selOpt="${dataManagerObj.dataType}" id="dataType"></font>
+		<form id="equipmentForm" action="" method="post" class="conForm">
+
+			<div class="ext-card">
+				<h1 class="title">基本信息</h1>
+				<div class="view-info">
+					<div class="col-xs-6">
+						<label>资料名称：</label>[[${dataManagerObj.dataTitle}]]
+					</div>
+					<div class="col-xs-6">
+						<label>资料类别：</label>
+						<font th:selOpt="${dataManagerObj.dataType}" id="dataType"></font>
+
+					</div>
+					<!-- <div class="col-xs-6">
+						<label>是否允许全局查看：</label><font th:selOpt="${dataManagerObj.ifGlobalView}" id="ifGlobalView"></font>
+					</div> -->
+					<div class="col-xs-12">
+						<label>资料摘要：</label>[[${dataManagerObj.dataSummary}]]
+					</div>
+				</div>
 
 			</div>
-			<!-- <div class="col-xs-6">
-				<label>是否允许全局查看：</label><font th:selOpt="${dataManagerObj.ifGlobalView}" id="ifGlobalView"></font>
-			</div> -->
-			<div class="col-xs-12">
-				<label>资料摘要：</label>[[${dataManagerObj.dataSummary}]]
-			</div>
-			<h1 class="title">资料附件</h1>
-			<div class="text-center">
-				<input type="hidden" id="dataFiles" name="dataFiles"  th:value="${dataManagerObj.dataFiles}"/>
-			    <div id="tableUploader" class="uploader">
-				  <div class="uploader-message text-center">
-				    <div class="content"></div>
-				    <button type="button" class="close">×</button>
-				  </div>
-				  <table class="table table-bordered">
-				    <thead>
-				      <tr>
-				        <th colspan="2">文件名</th>
-				        <th style="width: 100px">大小</th>
-				        <th style="width: 160px; text-align: center;">状态/操作</th>
-				      </tr>
-				    </thead>
-				    <tbody class="uploader-files">
-				      <tr class="file template">
-				        <td style="width: 38px; padding: 3px"><div class="file-icon"></div></td>
-				        <td style="padding: 0">
-				          <div style="position: relative; padding: 8px;">
-				            <strong class="file-name"></strong>
-				            <div class="file-progress-bar"></div>
-				          </div>
-				        </td>
-				        <td><span class="file-size text-muted"></span></td>
-				        <td class="actions text-right" style="padding: 0 4px;">
-				          <div class="file-status" data-toggle="tooltip" style="margin: 8px;"><i class="icon"></i> <span class="text"></span></div>
-				          <a data-toggle="tooltip" class="btn btn-link btn-download-file" target="_blank"><i class="icon icon-download-alt"></i></a>
-				          <a data-toggle="tooltip" class="btn btn-link btn-reset-file" title="Repeat"><i class="icon icon-repeat"></i></a>
-				          <a data-toggle="tooltip" class="btn btn-link btn-rename-file" title="Rename"><i class="icon icon-pencil"></i></a>
-				          <a data-toggle="tooltip" title="Remove" class="btn btn-link btn-delete-file"><i class="icon icon-trash text-danger"></i></a>
-				        </td>
-				      </tr>
-				    </tbody>
-				    <tfoot>
-				      <tr style="display:none">
-				        <td colspan="4" style="padding: 4px 0">
-				          <div style="position: relative;">
-				            <div class="uploader-status pull-right text-muted" style="margin-top: 5px;"></div>
-				            <button type="button" class="btn btn-link uploader-btn-browse"><i class="icon icon-plus"></i> 选择文件</button>
-				            <button type="button" class="btn btn-link uploader-btn-start"><i class="icon icon-cloud-upload"></i> 开始上传</button>
-				          </div>
-				        </td>
-				      </tr>
-				    </tfoot>
-				  </table>
+
+			<div class="ext-card">
+				<h1 class="title">资料附件</h1>
+				<div class="view-info">
+					<div class="text-center">
+						<input type="hidden" id="dataFiles" name="dataFiles" th:value="${dataManagerObj.dataFiles}" />
+						<div id="tableUploader" class="uploader">
+							<div class="uploader-message text-center">
+								<div class="content"></div>
+								<button type="button" class="close">×</button>
+							</div>
+							<table class="table table-bordered">
+								<thead>
+									<tr>
+										<th colspan="2">文件名</th>
+										<th style="width: 100px">大小</th>
+										<th style="width: 160px; text-align: center;">状态/操作</th>
+									</tr>
+								</thead>
+								<tbody class="uploader-files">
+									<tr class="file template">
+										<td style="width: 38px; padding: 3px">
+											<div class="file-icon"></div>
+										</td>
+										<td style="padding: 0">
+											<div style="position: relative; padding: 8px;">
+												<strong class="file-name"></strong>
+												<div class="file-progress-bar"></div>
+											</div>
+										</td>
+										<td><span class="file-size text-muted"></span></td>
+										<td class="actions text-right" style="padding: 0 4px;">
+											<div class="file-status" data-toggle="tooltip" style="margin: 8px;"><i class="icon"></i> <span
+													class="text"></span></div>
+											<a data-toggle="tooltip" class="btn btn-link btn-download-file" target="_blank"><i
+													class="icon icon-download-alt"></i></a>
+											<a data-toggle="tooltip" class="btn btn-link btn-reset-file" title="Repeat"><i
+													class="icon icon-repeat"></i></a>
+											<a data-toggle="tooltip" class="btn btn-link btn-rename-file" title="Rename"><i
+													class="icon icon-pencil"></i></a>
+											<a data-toggle="tooltip" title="Remove" class="btn btn-link btn-delete-file"><i
+													class="icon icon-trash text-danger"></i></a>
+										</td>
+									</tr>
+								</tbody>
+								<tfoot>
+									<tr style="display:none">
+										<td colspan="4" style="padding: 4px 0">
+											<div style="position: relative;">
+												<div class="uploader-status pull-right text-muted" style="margin-top: 5px;"></div>
+												<button type="button" class="btn btn-link uploader-btn-browse"><i class="icon icon-plus"></i>
+													选择文件</button>
+												<button type="button" class="btn btn-link uploader-btn-start"><i
+														class="icon icon-cloud-upload"></i> 开始上传</button>
+											</div>
+										</td>
+									</tr>
+								</tfoot>
+							</table>
+						</div>
+					</div>
 				</div>
 			</div>
 			<div class="btnEnd">
@@ -87,4 +109,5 @@
 		</form>
 	</div>
 </body>
+
 </html>

resources/templates/dataManager/update.html

@@ -1,98 +1,119 @@
 <html lang="zh-CN">
-<head
-	th:replace="common/common_header::common_header(~{},~{::link},~{},~{::script},'edit')">
-<meta charset="utf-8" />
-<link th:href="@{/js/zui/dist/lib/uploader/zui.uploader.min.css}"
-	rel="stylesheet">
-<script th:src="@{/js/zui/dist/lib/uploader/zui.uploader.min.js}"></script>
-<script th:src="@{/js/dataManager/update.js}"></script>
+
+<head th:replace="common/common_header::common_header(~{},~{::link},~{},~{::script},'edit')">
+	<meta charset="utf-8" />
+	<link th:href="@{/js/zui/dist/lib/uploader/zui.uploader.min.css}" rel="stylesheet">
+	<script th:src="@{/js/zui/dist/lib/uploader/zui.uploader.min.js}"></script>
+	<script th:src="@{/js/dataManager/update.js}"></script>
 
 </head>
-<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">  	
-		<div class="panel-body">
-		<form id="dataManagerForm"  method="post" class="conForm load-indicator" data-loading="正在处理...">
-		    <input type="hidden" id="id" name="id" th:value="${dataManagerObj.id}" />
-			<h1 class="title">基本信息</h1>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">资料名称：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="dataTitle" name="dataTitle" class="form-control required"  th:value="${dataManagerObj.dataTitle}"
-						 maxlength="100">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">资料类别：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="dataType" id="dataType" th:selOpt="${dataManagerObj.dataType}"
-						class="form-control required" aria-required="true" aria-invalid="false" ><option
-							 value="" selected="">--请选择--</option></select>
+
+<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
+	<div class="panel-body">
+		<form id="dataManagerForm" method="post" class="conForm load-indicator" data-loading="正在处理...">
+			<input type="hidden" id="id" name="id" th:value="${dataManagerObj.id}" />
+
+			<div class="ext-card">
+				<h1 class="title">基本信息</h1>
+				<div class="view-info">
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">资料名称：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="dataTitle" name="dataTitle" class="form-control required"
+								th:value="${dataManagerObj.dataTitle}" maxlength="100">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">资料类别：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="dataType" id="dataType" th:selOpt="${dataManagerObj.dataType}" class="form-control required"
+								aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<!-- <div class="form-group col-xs-12">
+							<label class="col-sm-4">是否允许全局查看：</label>
+							<div class="col-lg-6 col-xs-8">
+								<label class="checkbox-inline"> <input type="checkbox" th:selOpt="${dataManagerObj.ifGlobalView}"
+									name="ifGlobalView" id="ifGlobalView" value="1">
+								</label>
+							</div>
+						</div> -->
+					<div class="form-group col-xs-12">
+						<label>资料摘要：</label>
+						<div class="col-lg-10 col-xs-12">
+							<textarea style="resize: none;" rows="5" name="dataSummary" th:text="${dataManagerObj.dataSummary}"
+								maxlength="500" class="form-control"></textarea>
+						</div>
+					</div>
 				</div>
 			</div>
-			<!-- <div class="form-group col-xs-12">
-				<label class="col-sm-4">是否允许全局查看：</label>
-				<div class="col-lg-6 col-xs-8">
-					<label class="checkbox-inline"> <input type="checkbox" th:selOpt="${dataManagerObj.ifGlobalView}"
-						name="ifGlobalView" id="ifGlobalView" value="1">
-					</label>
-				</div>
-			</div> -->
-			<div class="form-group col-xs-12">
-				<label>资料摘要：</label>
-				<div class="col-lg-10 col-xs-12">
-					<textarea style="resize: none;" rows="5" name="dataSummary" th:text="${dataManagerObj.dataSummary}"
-						maxlength="500" class="form-control"></textarea>
+
+			<div class="ext-card">
+				<h1 class="title">资料附件</h1>
+				<div class="view-info">
+					<div class="">
+						<input type="hidden" id="dataFiles" name="dataFiles" th:value="${dataManagerObj.dataFiles}" />
+						<input type="hidden" id="nodeCode" th:value="${nodeCode}" />
+						<div id="tableUploader" class="uploader">
+							<div class="uploader-message text-center">
+								<div class="content"></div>
+								<button type="button" class="close">×</button>
+							</div>
+							<table class="table table-bordered">
+								<thead>
+									<tr>
+										<th colspan="2">文件名</th>
+										<th style="width: 100px">大小</th>
+										<th style="width: 160px; text-align: center;">状态/操作</th>
+									</tr>
+								</thead>
+								<tbody class="uploader-files">
+									<tr class="file template">
+										<td style="width: 38px; padding: 3px">
+											<div class="file-icon"></div>
+										</td>
+										<td style="padding: 0">
+											<div style="position: relative; padding: 8px;">
+												<strong class="file-name"></strong>
+												<div class="file-progress-bar"></div>
+											</div>
+										</td>
+										<td><span class="file-size text-muted"></span></td>
+										<td class="actions text-right" style="padding: 0 4px;">
+											<div class="file-status" data-toggle="tooltip" style="margin: 8px;"><i class="icon"></i> <span
+													class="text"></span></div>
+											<a data-toggle="tooltip" class="btn btn-link btn-download-file" target="_blank"><i
+													class="icon icon-download-alt"></i></a>
+											<button type="button" data-toggle="tooltip" class="btn btn-link btn-reset-file" title="Repeat"><i
+													class="icon icon-repeat"></i></button>
+											<button type="button" data-toggle="tooltip" class="btn btn-link btn-rename-file" title="Rename"><i
+													class="icon icon-pencil"></i></button>
+											<button type="button" data-toggle="tooltip" title="Remove" class="btn btn-link btn-delete-file"><i
+													class="icon icon-trash text-danger"></i></button>
+										</td>
+									</tr>
+								</tbody>
+								<tfoot>
+									<tr>
+										<td colspan="4" style="padding: 4px 0">
+											<div style="position: relative;">
+												<div class="uploader-status pull-right text-muted" style="margin-top: 5px;"></div>
+												<button type="button" class="btn btn-link uploader-btn-browse"><i class="icon icon-plus"></i>
+													选择文件</button>
+												<button type="button" class="btn btn-link uploader-btn-start"><i
+														class="icon icon-cloud-upload"></i>
+													开始上传</button>
+											</div>
+										</td>
+									</tr>
+								</tfoot>
+							</table>
+						</div>
+					</div>
 				</div>
 			</div>
-			<h1 class="title">资料附件</h1>
-			<div class="">
-			<input type="hidden" id="dataFiles" name="dataFiles"  th:value="${dataManagerObj.dataFiles}"/>
-			<input type="hidden" id="nodeCode" th:value="${nodeCode}"/>
-			<div id="tableUploader" class="uploader">
-				  <div class="uploader-message text-center">
-				    <div class="content"></div>
-				    <button type="button" class="close">×</button>
-				  </div>
-				  <table class="table table-bordered">
-				    <thead>
-				      <tr>
-				        <th colspan="2">文件名</th>
-				        <th style="width: 100px">大小</th>
-				        <th style="width: 160px; text-align: center;">状态/操作</th>
-				      </tr>
-				    </thead>
-				    <tbody class="uploader-files">
-				      <tr class="file template">
-				        <td style="width: 38px; padding: 3px"><div class="file-icon"></div></td>
-				        <td style="padding: 0">
-				          <div style="position: relative; padding: 8px;">
-				            <strong class="file-name"></strong>
-				            <div class="file-progress-bar"></div>
-				          </div>
-				        </td>
-				        <td><span class="file-size text-muted"></span></td>
-				        <td class="actions text-right" style="padding: 0 4px;">
-				          <div class="file-status" data-toggle="tooltip" style="margin: 8px;"><i class="icon"></i> <span class="text"></span></div>
-				          <a data-toggle="tooltip" class="btn btn-link btn-download-file" target="_blank"><i class="icon icon-download-alt"></i></a>
-				          <button type="button" data-toggle="tooltip" class="btn btn-link btn-reset-file" title="Repeat"><i class="icon icon-repeat"></i></button>
-				          <button type="button" data-toggle="tooltip" class="btn btn-link btn-rename-file" title="Rename"><i class="icon icon-pencil"></i></button>
-				          <button type="button" data-toggle="tooltip" title="Remove" class="btn btn-link btn-delete-file"><i class="icon icon-trash text-danger"></i></button>
-				        </td>
-				      </tr>
-				    </tbody>
-				    <tfoot>
-				      <tr>
-				        <td colspan="4" style="padding: 4px 0">
-				          <div style="position: relative;">
-				            <div class="uploader-status pull-right text-muted" style="margin-top: 5px;"></div>
-				            <button type="button" class="btn btn-link uploader-btn-browse"><i class="icon icon-plus"></i> 选择文件</button>
-				            <button type="button" class="btn btn-link uploader-btn-start"><i class="icon icon-cloud-upload"></i> 开始上传</button>
-				          </div>
-				        </td>
-				      </tr>
-				    </tfoot>
-				  </table>
-				</div>
-				</div>
 			<div class="btnEnd">
 				<button class="btn btn-primary" id="submitBtn" type="button">保存</button>
 				<button class="btn" type="button" onclick="history.back();">取消</button>

resources/templates/index.html

@@ -3,7 +3,7 @@
 	xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
 <head th:replace="common/common_header::common_header(~{::title},~{::style},~{},~{},'')">
 <meta charset="utf-8">
-<title>全国军供保障信息管理系统</title>
+<title>海安军供保障信息管理系统</title>
 <style type="text/css">
 .dropdown{display: inline-block;margin-right: 15px;}
 .dropdown .icon{font-size: 18px;}
@@ -45,7 +45,7 @@
 					<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} + '\')'}">
+										<a th:href="@{'javascript:childMenuHandle(\''+ ${menu.oldId} + '\',\'' + ${menu.nodepath} + '\',\'' + ${menu.nodename} + '\',\'' + ${menu.openimg} + '\', \'nav-menu-report\')'}">
 												<i th:class="'iconfont '+${menu.nodeimg}"></i><i th:class="'iconfont '+${menu.openimg}"></i>[[${menu.nodename}]]
 										</a>
 								</li>
@@ -54,7 +54,7 @@
 					<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} + '\')'}">
+										<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>
@@ -63,7 +63,7 @@
 					<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} + '\')'}">
+										<a th:href="@{'javascript:childMenuHandle(\''+ ${menu.oldId} + '\',\'' + ${menu.nodepath} + '\',\'' + ${menu.nodename} + '\',\'' + ${menu.openimg} + '\', \'nav-menu-system\')'}">
 												<i th:class="'iconfont '+${menu.nodeimg}"></i><i th:class="'iconfont '+${menu.openimg}"></i>[[${menu.nodename}]]
 										</a>
 								</li>
@@ -103,7 +103,7 @@
 		bootbox.confirm(confirmData);
 	}
 	  //二级菜单事件处理
-	function childMenuHandle(tmpId, tmpUrl, tmpText, openimg) {
+	function childMenuHandle(tmpId, tmpUrl, tmpText, openimg, parentMenu) {
 		var arr = document.getElementsByTagName("li");
 		for (var j = 0; j < arr.length; j++) {
 			arr[j].classList.remove("active");
@@ -125,19 +125,27 @@
 		localStorage.setItem("parentUrl",url);
 		localStorage.setItem("openimg",openimg);
 		window.top.hideMask();
+
+		activeNavMenu(parentMenu);
 	}
 	function passwordEdit(){
 		toPage(ctxPath + 'api/operator/toChangePwd')
 	}
 	function toMain(){
 		toPage(ctxPath +"main");
-		// 父级菜单回显
-		$(".nav-menu .nav-menu-item.active").removeClass("active");
-		$(".nav-menu .nav-menu-item").first().addClass("active");
-
+		activeNavMenu('nav-menu-index');
 	}
-	window.onload=function(){
-		
+	
+	function subMenuClick(menuText) {
+		var found = false;
+		$('.menu li').each(function(_, el) {
+			if (found) return;
+
+			if ($(el).text().includes(menuText)) {
+				$(el).find('a').get(0).click()
+				found = true;
+			}
+		});
 	}
 </script>
 </html>

resources/templates/installations/add.html

@@ -1,42 +1,48 @@
 <html lang="zh-CN">
-<head
-	th:replace="common/common_header::common_header(~{},~{},~{},~{::script},'edit')">
-<meta charset="utf-8" />
-<script th:src="@{/js/installations/add.js}"></script>
+
+<head th:replace="common/common_header::common_header(~{},~{},~{},~{::script},'edit')">
+	<meta charset="utf-8" />
+	<script th:src="@{/js/installations/add.js}"></script>
 </head>
-<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">  	
-		<div class="panel-body">
-		<form id="installationsForm"  method="post" class="conForm load-indicator" data-loading="正在处理...">
-			<h1 class="title">基本信息</h1>
-			<div class="form-group col-xs-12">
-				<label class=" required">设施名称：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="inTitle" name="inTitle" class="form-control required" 
-						 maxlength="30">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class=" required">设施数量：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="inCount" name="inCount" class="form-control required digits" 
-						 maxlength="100">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class=" required">设施面积(㎡)：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="inArea" name="inArea" class="form-control required number" 
-						 maxlength="20">
+
+<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
+	<div class="panel-body">
+		<form id="installationsForm" method="post" class="conForm load-indicator" data-loading="正在处理...">
+			<div class="ext-card">
+				<h1 class="title">基本信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<label class=" required col-sm-4">设施名称：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="inTitle" name="inTitle" class="form-control required" maxlength="30">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class=" required col-sm-4">设施数量：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="inCount" name="inCount" class="form-control required digits" maxlength="100">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class=" required col-sm-4">设施面积(㎡)：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="inArea" name="inArea" class="form-control required number" maxlength="20">
+						</div>
+					</div>
 				</div>
 			</div>
-			
-			<h1 class="title">备注信息</h1>
-			<div class="form-group col-xs-12">
-				<div class="col-lg-10 col-xs-12">
-						<textarea style="resize: none;" rows="5" name="remark"
-						maxlength="500" class="form-control"></textarea>
+
+			<div class="ext-card">
+				<h1 class="title">备注信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<div class="col-lg-10 col-xs-12">
+							<textarea style="resize: none;" rows="5" name="remark" maxlength="500" class="form-control"></textarea>
+						</div>
+					</div>
 				</div>
 			</div>
+
 			<div class="btnEnd">
 				<button class="btn btn-primary" id="submitBtn" type="button">保存</button>
 				<button class="btn" type="button" onclick="history.back();">取消</button>

resources/templates/installations/details.html

@@ -1,37 +1,52 @@
 <html lang="zh-CN">
-<head
-	th:replace="common/common_header::common_header(~{},~{},~{},~{::script},'')">
-<meta charset="utf-8">
-<script th:src="@{/js/installations/details.js}"></script>
+
+<head th:replace="common/common_header::common_header(~{},~{},~{},~{::script},'')">
+	<meta charset="utf-8">
+	<script th:src="@{/js/installations/details.js}"></script>
 </head>
+
 <body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
 	<div class="panel-body">
-		<form id="installationsForm" action="" method="post"
-			class="conForm view-info">		
-				<h1 class="title">基本信息</h1>	
-			<div class="col-xs-6">
-				<label>设施名称：</label>[[${installationsObj.inTitle}]]
-			</div>
-			<div class="col-xs-6">
-				<label>设施数量：</label>[[${installationsObj.inCount}]]
+		<form id="installationsForm" action="" method="post" class="conForm">
+			<div class="ext-card">
+				<h1 class="title">基本信息</h1>
+				<div class="view-info">
+					<div class="col-xs-6">
+						<label>设施名称：</label>[[${installationsObj.inTitle}]]
+					</div>
+					<div class="col-xs-6">
+						<label>设施数量：</label>[[${installationsObj.inCount}]]
 
+					</div>
+					<div class="col-xs-6">
+						<label>设施面积(㎡)：</label> [[${installationsObj.inArea}]]
+					</div>
+				</div>
 			</div>
-			<div class="col-xs-6">
-				<label>设施面积(㎡)：</label> [[${installationsObj.inArea}]]
+
+			<div class="ext-card">
+				<h1 class="title">设施位置</h1>
+				<div class="view-info">
+					<div class="text">
+						[[${installationsObj.inPosition}]]
+					</div>
+				</div>
 			</div>
-			<h1 class="title">设施位置</h1>
-			<div class="text">
-				[[${installationsObj.inPosition}]]
-			</div>			
-			<h1 class="title">备注信息</h1>
-			<div class="text">
-				[[${installationsObj.remark}]]
+
+			<div class="ext-card">
+				<h1 class="title">备注信息</h1>
+				<div class="view-info">
+					<div class="text">
+						[[${installationsObj.remark}]]
+					</div>
+				</div>
 			</div>
+
 			<div class="btnEnd">
-				<button class="btn btn-primary" type="button"
-					onclick="history.back();">返回</button>
+				<button class="btn btn-primary" type="button" onclick="history.back();">返回</button>
 			</div>
 		</form>
 	</div>
 </body>
+
 </html>

resources/templates/installations/update.html

@@ -1,46 +1,54 @@
 <html lang="zh-CN">
-<head
-	th:replace="common/common_header::common_header(~{},~{},~{},~{::script},'edit')">
-<meta charset="utf-8" />
-<script th:src="@{/js/installations/update.js}"></script>
+
+<head th:replace="common/common_header::common_header(~{},~{},~{},~{::script},'edit')">
+	<meta charset="utf-8" />
+	<script th:src="@{/js/installations/update.js}"></script>
 </head>
-<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">  	
-		<div class="panel-body">
-		<form id="installationsForm"  method="post" class="conForm load-indicator" data-loading="正在处理...">
-		<input type="hidden" id="id" name="id" th:value="${installationsObj.id}" />
-				    		 <input type="hidden" id="oldId" name="oldId" th:value="${installationsObj.oldId}" />
-		
-			<h1 class="title">基本信息</h1>
-			
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">设施名称：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="inTitle" name="inTitle" class="form-control required"  th:value="${installationsObj.inTitle}"
-						 maxlength="30">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">设施数量：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="inCount" name="inCount" class="form-control required digits"  th:value="${installationsObj.inCount}"
-						 maxlength="6">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">设施面积(㎡)：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="inArea" name="inArea" class="form-control required number"  th:value="${#numbers.formatDecimal(installationsObj.inArea,1,2)}"
-						 maxlength="10">
+
+<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
+	<div class="panel-body">
+		<form id="installationsForm" method="post" class="conForm load-indicator" data-loading="正在处理...">
+			<input type="hidden" id="id" name="id" th:value="${installationsObj.id}" />
+			<input type="hidden" id="oldId" name="oldId" th:value="${installationsObj.oldId}" />
+			<div class="ext-card">
+				<h1 class="title">基本信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">设施名称：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="inTitle" name="inTitle" class="form-control required" th:value="${installationsObj.inTitle}"
+								maxlength="30">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">设施数量：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="inCount" name="inCount" class="form-control required digits"
+								th:value="${installationsObj.inCount}" maxlength="6">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">设施面积(㎡)：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="inArea" name="inArea" class="form-control required number"
+								th:value="${#numbers.formatDecimal(installationsObj.inArea,1,2)}" maxlength="10">
+						</div>
+					</div>
 				</div>
 			</div>
-			
-			<h1 class="title">备注信息</h1>
-			<div class="form-group col-xs-12">
-				<div class="col-lg-10 col-xs-12">
-						<textarea style="resize: none;" rows="5" name="remark" th:text="${installationsObj.remark}"
-						maxlength="500" class="form-control"></textarea>
+
+			<div class="ext-card">
+				<h1 class="title">备注信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<div class="col-lg-10 col-xs-12">
+							<textarea style="resize: none;" rows="5" name="remark" th:text="${installationsObj.remark}"
+								maxlength="500" class="form-control"></textarea>
+						</div>
+					</div>
 				</div>
 			</div>
+
 			<div class="btnEnd">
 				<button class="btn btn-primary" id="submitBtn" type="button">保存</button>
 				<button class="btn" type="button" onclick="history.back();">取消</button>

resources/templates/login.html

@@ -9,7 +9,7 @@
 	<link th:href="@{/css/login-page.css}" rel="stylesheet" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<link rel="shortcut icon" th:href="@{/images/favicon.ico}">
-	<title>全国军供保障信息管理系统</title>
+	<title>海安军供保障信息管理系统</title>
 </head>
 
 <body>

resources/templates/main.html

@@ -2,7 +2,6 @@
 <html>
 <head
 	th:replace="common/common_header::common_header(~{},~{},~{::style},~{::script},'')">
-<meta charset="utf-8">
 <script th:src="@{/js/chart/echarts.min.js}" type="text/javascript"></script>
 <script th:src="@{/js/chart/chart.js}"></script>
 <script th:src="@{/js/chart/pie.js}"></script>
@@ -14,367 +13,24 @@
 @media (max-width: 1280px) {
 .panel{margin:30px 0 0 15px;}
 }
+body { background-color: #081A48; }
 </style>
 </head>
-
 <body>
-	<div class="chart-page">
-		<div class="flex-part">
-			<div class="flex-part-3">
-
-				<div class="count">
-					<dl>
-						<dt id="totalTask">0</dt>
-						<dd>任务总数</dd>
-						<img th:src="@{/images/statistic/数字统计.png}" alt="">
-					</dl>
-					<dl>
-						<dt id="totalPerson">0</dt>
-						<dd>接待军人总数</dd>
-						<img th:src="@{/images/statistic/接待军人总数.png}" alt="">
-					</dl>
-					<dl>
-						<dt id="totalOrg">0</dt>
-						<dd>保障机构数</dd>
-						<img th:src="@{/images/statistic/保障机构数.png}" alt="">
-					</dl>
-					<dl>
-						<dt id="totalEquipment">0</dt>
-						<dd>设备数量</dd>
-						<img th:src="@{/images/statistic/设备数量.png}" alt="">
-					</dl>
-				</div>
-			
-				<div class="panelGroup flex-part" style="padding-bottom:0;">
-					<div class="panel flex-part-2 chart-card">
-						<div class="panel-heading">
-							<img th:src="@{/images/statistic/任务统计.png}" />
-							<span>任务统计</span>
-							<!-- <svg>
-								<defs>
-										<linearGradient id="grad" x1="0" y1="100%" x2="0" y2="0">
-												<stop offset="0%" style="stop-color:#6F39B9; stop-opacity:1" />
-												<stop offset="100%" style="stop-color:#1EAED1; stop-opacity:1" />
-										</linearGradient>
-								</defs>
-								<text x="0" y="22" fill="url(#grad)" style="font-size:22px">任务统计</text>
-							</svg> -->
-							<div class="selectGroup">
-								<select class="" id="selYear" onchange="taskTimeReport()">
-										</select>
-							</div>
-						</div>
-						<div class="panel-body">
-							<div class="text-center">
-								<div class="text-center" style="height:300px;" id="taskChart"></div>
-							</div>
-						</div>
-					</div>
-					<div class="flex-part-1">
-						<div class="panel chart-card">
-							<div class="panel-heading">
-								<img th:src="@{/images/statistic/设备分类统计.png}" />
-								<span>设备分类统计</span>
-							</div>
-							<div class="panel-body">
-								<div class="text-center" style="height:260px;" id="devChart"></div>
-							</div>
-						</div>
-					</div>
-				</div>
-
-
-			</div>
-			<div class="flex-part-1">
-				<div class="panel chart-card" style="margin: 15px 30px 0 0; height: calc(100% - 15px)">
-					<div class="panel-heading">
-						<img th:src="@{/images/statistic/军供保障能力.png}" />
-						<span>军供保障能力</span>
-					</div>
-					<div class="panel-body" style="height: calc(100% - 60px);">
-						<div class="info-text">
-							
-						</div>
-						<ul class="info-list" style="overflow-y: auto; height: 100%;">
-							<li title="常规单日整体膳食供应能力(人次)"><span id="ztssgynl">0</span>常规单日整体膳食供应能力(人次)：</li>
-							<li title="常规单次整体膳食供应能力(人)"><span id="dcztssgynl">0</span>常规单次整体膳食供应能力(人)：</li>
-							<li title="应急单日整体膳食供应能力(人次)"><span id="yjztssgynl">0</span>应急单日整体膳食供应能力(人次)：</li>
-							<li title="应急单次整体膳食供应能力(人)"><span id="yjdcztssgynl">0</span>应急单次整体膳食供应能力(人)：</li>
-							<li title="常规整体住宿供应能力(人)"><span id="ztzsgynl">0</span>常规整体住宿供应能力(人)：</li>
-							<li title="应急整体住宿供应能力(人)"><span id="yjztzsgynl">0</span>应急整体住宿供应能力(人)：</li>
-						</ul>
-					</div>
-				</div>
-			</div>
-		</div>
-	<div class="panelGroup">
-		<div class="panel panel-row-2 chart-card">
-			<div class="panel-heading">
-				<img th:src="@{/images/statistic/社会保障机构分类统计.png}" />
-				<span>社会保障机构分类统计</span>
-			</div>
-			<div class="panel-body">
-				<div class="text-center" id="guaChart" style="height:320px"></div>
-			</div>
-		</div>
-		<div class="panel panel-row-2 chart-card">
-			<div class="panel-heading">
-				<img th:src="@{/images/statistic/人员统计.png}" />
-				<span>人员统计</span>
-			</div>
-			<div class="panel-body">
-				<div class="col-sm-6 text-center" id="eduChart" style="height:300px;">
-				</div>
-				<div class="col-sm-6 text-center" id="ageChart" style="height:270px;">
-				</div>
-			</div>
-		</div>
-	</div>
-	
-
-		
-</div>
+	<div th:replace="main/data::main-data"></div>
+	<div th:replace="main/dashboard::main-dashboard"></div>
 </body>
- <script>
-	function loadPage() {
-		let colArr = commentReport();
-		$
-				.ajax({
-					url : urlPre + "getMainData",
-					dataType : 'json',
- 					success : function(data) {
-
-						(function mockData(dt) {
-							function rand() {
-								return Math.floor(100 * Math.random() + 10);
-							}
-
-							dt.countData.ageArrNum = dt.countData.ageArrNum.split(',').map(rand).join(',')
-							dt.countData.devArrNum = dt.countData.devArrNum.split(',').map(rand).join(',')
-							dt.countData.guaArrNum = dt.countData.guaArrNum.split(',').map(rand).join(',')
-							dt.countData.eduNum = dt.countData.eduNum.split(',').map(rand).join(',')
-							dt.countData.guaAbiJson.clzs = rand()
-							dt.countData.guaAbiJson.dcztssgynl = rand()
-							dt.countData.guaAbiJson.yjdcztssgynl = rand()
-							dt.countData.guaAbiJson.yjztssgynl = rand()
-							dt.countData.guaAbiJson.ztssgynl = rand()
-							dt.countData.guaAbiJson.ztzsgynl = rand()
-							dt.yearTask = Object.keys(dt.yearTask).map((key) => {
-								return {[key]: rand()}
-							}).reduce((acc, item) => ({ ...acc, ...item }), {})
-						})(data)
-
-						console.log(data)
-
- 						$("#totalTask").text(data.totalTask);
- 						$("#totalOrg").text(data.totalOrg);
- 						$("#totalPerson").text(data.totalPerson);
- 						$("#totalEquipment").text(data.totalEquipment);
- 						//选择年份 按月统计任务
- 						var myDate = new Date();
-                        var tYear = myDate.getFullYear();
-                        var lasYear = tYear - 1;
-                        $("#selYear").html("<option value='"+tYear+"'>"+tYear+"年</option><option value='"+lasYear+"'>"+lasYear+"年</option>");
- 						var chartData = {};
-                        let yearTask = data.yearTask
-                        let xAxisData = []
-                        let datas = []
-                        for(let key in yearTask){
-                        	xAxisData[xAxisData.length] = key
-                        	datas[datas.length] = yearTask[key]
-                        }                      
- 						chartData.datas = datas;
- 						chartData.xAxisData = xAxisData;
- 						// setLine("taskChart", chartData);
-
-						setChart("#taskChart", getBar1Option(xAxisData, datas))
-                        
- 						var comments = data.comments;
- 						var commentUl = "";
- 						for (var key in comments) {
- 							var tmpData = comments[key];
- 							commentUl += '<li><a href="###"><h2>'+tmpData.taskNumber+'</h2>'
- 							let config_evaluate_item = tmpData.config_evaluate_item.split(",")
- 							for(var ky in colArr){
- 								if(config_evaluate_item.indexOf(colArr[ky].substring(0,2)) !=-1){
- 									if(tmpData[colArr[ky]] != null){
- 	 									let num = tmpData[colArr[ky]];
- 	 	 								let total = tmpData[colArr[ky].substring(0,2)]
- 	 	 								let addNum = (num/total*100).toFixed() + "%"
- 	 	 								commentUl += '<span>'+addNum+'</span>'
- 	 								}else{
- 	 									commentUl += '<span>0%</span>'
- 	 								}
- 								}else{
- 									commentUl += '<span>未选择</span>'
- 								}
- 							
- 								
- 							}
- 							commentUl += '</li>';		
- 						}
- 						$("#commentUl").html(commentUl);
- 						
- 						var taskInfos = data.taskInfos;
- 						var taskInfoUl = "";
- 						for (var key in taskInfos) {
- 							var tmpData = taskInfos[key];
- 							taskInfoUl += '<li><a href="###"><h2>'+tmpData.taskNumber+'</h2><span>'+tmpData.data_date.substring(0,10)+'</span><span>'
- 							               +tmpData.config_supply_main+'</span></a></li>';
- 						}
- 						$("#taskInfoUl").html(taskInfoUl);
- 						//人员学历统计
- 						
- 						chartData = {};
- 						let eduArrNameArr = data.countData.eduArrName.split(",")
- 						let eduNumArr = data.countData.eduNum.split(",")
-  						datas = {};
- 						datas[eduArrNameArr[0]] = eduNumArr[0];
- 						datas[eduArrNameArr[1]] = eduNumArr[1];
- 						datas[eduArrNameArr[2]] = eduNumArr[2];
-						chartData.datas = datas;
-						chartData.subtext = '人员学历统计';
-						chartData.seriesName = "学历";
-						chartData.addNum = 2
-						// setBar("eduChart", chartData);
-						setChart("#eduChart", getBar3Option(eduArrNameArr, eduNumArr))
-
-						
-						//人员年龄统计
-						let ageArrNameArr = data.countData.ageArrName.split(",")
-						let ageArrNum = data.countData.ageArrNum.split(",")
-						datas = {};
-						datas[ageArrNameArr[0]] = ageArrNum[0];
- 						datas[ageArrNameArr[1]] = ageArrNum[1];
- 						datas[ageArrNameArr[2]] = ageArrNum[2];
- 						datas[ageArrNameArr[3]] = ageArrNum[3];
-  					    chartData = {};
-					 	chartData.datas = datas;
-					 	chartData.subtext = '人员年龄统计';
-					 	chartData.seriesName = "年龄";
-					 	chartData.isShowLine= false
-					 	chartData.isShowTooltip = false
-					 	// setPie("ageChart", chartData);	
-						 var pie2 = setChart("#ageChart", getPie2Option(datas))
-						// 默认选中第一个, 并处理选中逻辑
-						var pie2DataIndex = 0
-						pie2.on('mousemove', function(e) {
-							pie2.dispatchAction({ type: 'downplay', dataIndex: pie2DataIndex });
-							pie2.dispatchAction({ type: 'highlight', dataIndex: e.dataIndex });
-							pie2DataIndex = e.dataIndex
-						});
-						pie2.dispatchAction({ type: 'highlight', dataIndex: pie2DataIndex });
-
-					 	//机构分类统计
-					 	let guaArrNameArr = data.countData.guaArrName.split(",");
-					 	let guaArrNumArr = data.countData.guaArrNum.split(",");
-					 	datas = {};						
-					 	for(var i=0;i<guaArrNameArr.length;i++){
-					 		datas[guaArrNameArr[i]] = guaArrNumArr[i];
-					 	}
-					 	chartData = {};
-					 	chartData.datas = datas;
-					 	chartData.subtext = '';
-					 	chartData.seriesName = "保障机构类别";
-					 	chartData.isShowLine= false
-					 	chartData.isShowTooltip = false
-					 	// setBar("guaChart", chartData);
-						setChart("#guaChart", getBar2Option(guaArrNameArr, guaArrNumArr))
-
-					 	//供应设备分类统计
-					 	let devArrName = data.countData.devArrName.split(",");
-					 	let devArrNum = data.countData.devArrNum.split(",");
-					 	datas = {};						
-					 	for(var i=0;i<devArrName.length;i++){
-					 		datas[devArrName[i]] = devArrNum[i];
-					 	}
-					 	chartData = {};
-					 	chartData.datas = datas;
-					 	chartData.subtext = '';
-					 	chartData.seriesName = "设备类别";
-					 	chartData.isShowLine= false
-					 	chartData.isShowTooltip = false
-					 	// setPie("devChart", chartData);
-						var pie1 = setChart("#devChart", getPie1Option(datas));
-						// 默认选中第一个, 并处理选中逻辑
-						var pie1DataIndex = 0
-						pie1.on('mousemove', function(e) {
-							pie1.dispatchAction({ type: 'downplay', dataIndex: pie1DataIndex });
-							pie1.dispatchAction({ type: 'highlight', dataIndex: e.dataIndex });
-							pie1DataIndex = e.dataIndex
-						});
-						pie1.dispatchAction({ type: 'highlight', dataIndex: pie1DataIndex });
-
-					 	let guaAbiJson = data.countData.guaAbiJson
-					 	$(".info-list").find("span").each(function(){
-					 		let objId = $(this).attr("id")
-					 		if(guaAbiJson[objId] != null){
-					 			$(this).text(guaAbiJson[objId]);
-					 		}					 		
-					 	})
-					 	let config_service_ability = guaAbiJson.config_service_ability
-					 	let serviceArr = config_service_ability.split(",")
-					 	for(let key in serviceArr){
-					 		if(serviceArr[key] != null && serviceArr[key] != ""){
-						 		$(".info-text").append('<span class="label">'+serviceArr[key]+'</span>')
-
-					 		}
-					 	}
- 					}
- 				});
-		        
-	}
-	function taskTimeReport() {
-		let year = $("#selYear").val()
-		$
-		.ajax({
-			url : urlPre + "taskTimeReport?yearTime="+year,
-			dataType : 'json',
-				success : function(yearTask) {
-					var chartData = {};
-                    let xAxisData = []
-                    let datas = []
-                    for(let key in yearTask){
-                    	xAxisData[xAxisData.length] = key
-                    	datas[datas.length] = yearTask[key]
-                    }                      
-                    chartData.datas = datas;
-					chartData.xAxisData = xAxisData;
-					chartData.addNum = 2;
-					setLine("taskChart", chartData);	
-				}
-		})
-	}
-	function commentReport(){
-		let queryParams = {};
-		queryParams.schCols = 'itemCode,itemName';
-		queryParams.limit = 200
-		queryParams["sorts[0].field"] = 'sort';
-		queryParams["sorts[0].order"] = 'asc';
-		queryParams.search_LENGTH_itemCode = 2;
-		let colArr = []
-		$.ajax({
-			type : 'post',
-			async : false,
-			url : urlPre + 'api/commentItem/page',
-			data:queryParams,
-			dataType : 'json',
-			success : function(data) {
-				var rows = data.rows;
-				for(var m = 0; m < rows.length; m++){
-					if(m<3){
-						let row = rows[m]
-						let str = '<span>'+row.itemName+'(优)</span>'
-	                    $("#commentLi").append(str)
-	                    colArr[colArr.length] = row.itemCode + "_1"
-					}
-				
-				}
-			}
-		});	
-		return colArr;
+<script>
+	var paramT = '1';
+	var matched = /t=(\d)/.exec(location.search);
+	if (matched) {
+		paramT = matched[1] || '1';
 	}
 
-	console.log('-------->', window)
-</script> 
+	if (paramT == '2') {
+		document.querySelector('#t2').style.display="block"
+	} else {
+		document.querySelector('#t1').style.display="block"
+	}
+</script>
 </html>

resources/templates/main/dashboard.html

@@ -0,0 +1,204 @@
+<!DOCTYPE html>
+<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">
+<div id="t1" th:fragment="main-dashboard" class="dashboard-page" style="display: none;">
+  <script>
+    function onAction(menuId, subMenuName) {
+      // 额外添加, 显示菜单栏
+      parent.onNavMenuClick(menuId);
+      parent.subMenuClick(subMenuName);
+    }
+  </script>
+
+  <div>
+    <div class="dash-carousel">
+      <div class="ratio-static">
+        
+    <div id="myNiceCarousel" class="carousel slide" data-ride="carousel">
+      <!-- 轮播项目 -->
+      <div class="carousel-inner">
+        <div class="item active">
+          <img alt="First slide" src="http://openzui.com/docs/img/slide1.jpg">
+          <div class="carousel-caption">
+            <h3>我是第一张幻灯片</h3>
+            <p>:)</p>
+          </div>
+        </div>
+        <div class="item">
+          <img alt="Second slide" src="http://openzui.com/docs/img/slide2.jpg">
+          <div class="carousel-caption">
+            <h3>我是第二张幻灯片</h3>
+            <p>0.0</p>
+          </div>
+        </div>
+        <div class="item">
+          <img alt="Third slide" src="http://openzui.com/docs/img/slide3.jpg">
+          <div class="carousel-caption">
+            <h3>我是第三张幻灯片</h3>
+            <p>最后一张咯~</p>
+          </div>
+        </div>
+      </div>
+    
+      <!-- 项目切换按钮 -->
+      <a class="left carousel-control" href="#myNiceCarousel" data-slide="prev">
+        <span class="icon icon-chevron-left"></span>
+      </a>
+      <a class="right carousel-control" href="#myNiceCarousel" data-slide="next">
+        <span class="icon icon-chevron-right"></span>
+      </a>
+    </div>
+      </div>
+    </div>
+
+  </div>
+  <div class="act-list">
+    <div class="row">
+      <div class="col-md-3" onclick="onAction('nav-menu-report','年度任务汇总')">
+        <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('nav-menu-report','军供任务明细')">
+        <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('nav-menu-report','军供保障能力')">
+        <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('nav-menu-report','军供保障预案')">
+        <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 class="row">
+      <div class="col-md-3" onclick="onAction('nav-menu-report','社会保障机构')">
+        <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('nav-menu-report','军供供应设备')">
+        <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('nav-menu-government','军供站简介')">
+        <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('nav-menu-government','安防管理')">
+        <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>
+</div>

resources/templates/main/data.html

@@ -0,0 +1,355 @@
+<!DOCTYPE html>
+<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">
+<div id="t2" th:fragment="main-data" class="chart-page" style="display: none;">
+  <div class="flex-part">
+    <div class="flex-part-3">
+      <div class="count">
+        <dl>
+          <dt id="totalTask">0</dt>
+          <dd>任务总数</dd>
+          <img th:src="@{/images/statistic/数字统计.png}" alt="">
+        </dl>
+        <dl>
+          <dt id="totalPerson">0</dt>
+          <dd>接待军人总数</dd>
+          <img th:src="@{/images/statistic/接待军人总数.png}" alt="">
+        </dl>
+        <dl>
+          <dt id="totalOrg">0</dt>
+          <dd>保障机构数</dd>
+          <img th:src="@{/images/statistic/保障机构数.png}" alt="">
+        </dl>
+        <dl>
+          <dt id="totalEquipment">0</dt>
+          <dd>设备数量</dd>
+          <img th:src="@{/images/statistic/设备数量.png}" alt="">
+        </dl>
+      </div>
+    
+      <div class="panelGroup flex-part" style="padding-bottom:0;">
+        <div class="panel flex-part-2 chart-card">
+          <div class="panel-heading">
+            <img th:src="@{/images/statistic/任务统计.png}" />
+            <span>任务统计</span>
+            <!-- <svg>
+              <defs>
+                  <linearGradient id="grad" x1="0" y1="100%" x2="0" y2="0">
+                      <stop offset="0%" style="stop-color:#6F39B9; stop-opacity:1" />
+                      <stop offset="100%" style="stop-color:#1EAED1; stop-opacity:1" />
+                  </linearGradient>
+              </defs>
+              <text x="0" y="22" fill="url(#grad)" style="font-size:22px">任务统计</text>
+            </svg> -->
+            <div class="selectGroup">
+              <select class="" id="selYear" onchange="taskTimeReport()">
+                  </select>
+            </div>
+          </div>
+          <div class="panel-body">
+            <div class="text-center">
+              <div class="text-center" style="height:300px;" id="taskChart"></div>
+            </div>
+          </div>
+        </div>
+        <div class="flex-part-1">
+          <div class="panel chart-card">
+            <div class="panel-heading">
+              <img th:src="@{/images/statistic/设备分类统计.png}" />
+              <span>设备分类统计</span>
+            </div>
+            <div class="panel-body">
+              <div class="text-center" style="height:260px;" id="devChart"></div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+
+    </div>
+    <div class="flex-part-1">
+      <div class="panel chart-card" style="margin: 15px 30px 0 0; height: calc(100% - 15px)">
+        <div class="panel-heading">
+          <img th:src="@{/images/statistic/军供保障能力.png}" />
+          <span>军供保障能力</span>
+        </div>
+        <div class="panel-body" style="height: calc(100% - 60px);">
+          <div class="info-text">
+            
+          </div>
+          <ul class="info-list" style="overflow-y: auto; height: 100%;">
+            <li title="常规单日整体膳食供应能力(人次)"><span id="ztssgynl">0</span>常规单日整体膳食供应能力(人次)：</li>
+            <li title="常规单次整体膳食供应能力(人)"><span id="dcztssgynl">0</span>常规单次整体膳食供应能力(人)：</li>
+            <li title="应急单日整体膳食供应能力(人次)"><span id="yjztssgynl">0</span>应急单日整体膳食供应能力(人次)：</li>
+            <li title="应急单次整体膳食供应能力(人)"><span id="yjdcztssgynl">0</span>应急单次整体膳食供应能力(人)：</li>
+            <li title="常规整体住宿供应能力(人)"><span id="ztzsgynl">0</span>常规整体住宿供应能力(人)：</li>
+            <li title="应急整体住宿供应能力(人)"><span id="yjztzsgynl">0</span>应急整体住宿供应能力(人)：</li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="panelGroup">
+    <div class="panel panel-row-2 chart-card">
+      <div class="panel-heading">
+        <img th:src="@{/images/statistic/社会保障机构分类统计.png}" />
+        <span>社会保障机构分类统计</span>
+      </div>
+      <div class="panel-body">
+        <div class="text-center" id="guaChart" style="height:320px"></div>
+      </div>
+    </div>
+    <div class="panel panel-row-2 chart-card">
+      <div class="panel-heading">
+        <img th:src="@{/images/statistic/人员统计.png}" />
+        <span>人员统计</span>
+      </div>
+      <div class="panel-body">
+        <div class="col-sm-6 text-center" id="eduChart" style="height:300px;">
+        </div>
+        <div class="col-sm-6 text-center" id="ageChart" style="height:270px;">
+        </div>
+      </div>
+    </div>
+  </div>
+  <script>
+   function loadPage() {
+     let colArr = commentReport();
+     $
+         .ajax({
+           url : urlPre + "getMainData",
+           dataType : 'json',
+            success : function(data) {
+ 
+             (function mockData(dt) {
+               function rand() {
+                 return Math.floor(100 * Math.random() + 10);
+               }
+ 
+               dt.countData.ageArrNum = dt.countData.ageArrNum.split(',').map(rand).join(',')
+               dt.countData.devArrNum = dt.countData.devArrNum.split(',').map(rand).join(',')
+               dt.countData.guaArrNum = dt.countData.guaArrNum.split(',').map(rand).join(',')
+               dt.countData.eduNum = dt.countData.eduNum.split(',').map(rand).join(',')
+               dt.countData.guaAbiJson.clzs = rand()
+               dt.countData.guaAbiJson.dcztssgynl = rand()
+               dt.countData.guaAbiJson.yjdcztssgynl = rand()
+               dt.countData.guaAbiJson.yjztssgynl = rand()
+               dt.countData.guaAbiJson.ztssgynl = rand()
+               dt.countData.guaAbiJson.ztzsgynl = rand()
+               dt.yearTask = Object.keys(dt.yearTask).map((key) => {
+                 return {[key]: rand()}
+               }).reduce((acc, item) => ({ ...acc, ...item }), {})
+             })(data)
+ 
+             console.log(data)
+ 
+              $("#totalTask").text(data.totalTask);
+              $("#totalOrg").text(data.totalOrg);
+              $("#totalPerson").text(data.totalPerson);
+              $("#totalEquipment").text(data.totalEquipment);
+              //选择年份 按月统计任务
+              var myDate = new Date();
+                         var tYear = myDate.getFullYear();
+                         var lasYear = tYear - 1;
+                         $("#selYear").html("<option value='"+tYear+"'>"+tYear+"年</option><option value='"+lasYear+"'>"+lasYear+"年</option>");
+              var chartData = {};
+                         let yearTask = data.yearTask
+                         let xAxisData = []
+                         let datas = []
+                         for(let key in yearTask){
+                           xAxisData[xAxisData.length] = key
+                           datas[datas.length] = yearTask[key]
+                         }                      
+              chartData.datas = datas;
+              chartData.xAxisData = xAxisData;
+              // setLine("taskChart", chartData);
+ 
+             setChart("#taskChart", getBar1Option(xAxisData, datas))
+                         
+              var comments = data.comments;
+              var commentUl = "";
+              for (var key in comments) {
+                var tmpData = comments[key];
+                commentUl += '<li><a href="###"><h2>'+tmpData.taskNumber+'</h2>'
+                let config_evaluate_item = tmpData.config_evaluate_item.split(",")
+                for(var ky in colArr){
+                  if(config_evaluate_item.indexOf(colArr[ky].substring(0,2)) !=-1){
+                    if(tmpData[colArr[ky]] != null){
+                       let num = tmpData[colArr[ky]];
+                        let total = tmpData[colArr[ky].substring(0,2)]
+                        let addNum = (num/total*100).toFixed() + "%"
+                        commentUl += '<span>'+addNum+'</span>'
+                     }else{
+                       commentUl += '<span>0%</span>'
+                     }
+                  }else{
+                    commentUl += '<span>未选择</span>'
+                  }
+                
+                  
+                }
+                commentUl += '</li>';		
+              }
+              $("#commentUl").html(commentUl);
+              
+              var taskInfos = data.taskInfos;
+              var taskInfoUl = "";
+              for (var key in taskInfos) {
+                var tmpData = taskInfos[key];
+                taskInfoUl += '<li><a href="###"><h2>'+tmpData.taskNumber+'</h2><span>'+tmpData.data_date.substring(0,10)+'</span><span>'
+                               +tmpData.config_supply_main+'</span></a></li>';
+              }
+              $("#taskInfoUl").html(taskInfoUl);
+              //人员学历统计
+              
+              chartData = {};
+              let eduArrNameArr = data.countData.eduArrName.split(",")
+              let eduNumArr = data.countData.eduNum.split(",")
+               datas = {};
+              datas[eduArrNameArr[0]] = eduNumArr[0];
+              datas[eduArrNameArr[1]] = eduNumArr[1];
+              datas[eduArrNameArr[2]] = eduNumArr[2];
+             chartData.datas = datas;
+             chartData.subtext = '人员学历统计';
+             chartData.seriesName = "学历";
+             chartData.addNum = 2
+             // setBar("eduChart", chartData);
+             setChart("#eduChart", getBar3Option(eduArrNameArr, eduNumArr))
+ 
+             
+             //人员年龄统计
+             let ageArrNameArr = data.countData.ageArrName.split(",")
+             let ageArrNum = data.countData.ageArrNum.split(",")
+             datas = {};
+             datas[ageArrNameArr[0]] = ageArrNum[0];
+              datas[ageArrNameArr[1]] = ageArrNum[1];
+              datas[ageArrNameArr[2]] = ageArrNum[2];
+              datas[ageArrNameArr[3]] = ageArrNum[3];
+                 chartData = {};
+              chartData.datas = datas;
+              chartData.subtext = '人员年龄统计';
+              chartData.seriesName = "年龄";
+              chartData.isShowLine= false
+              chartData.isShowTooltip = false
+              // setPie("ageChart", chartData);	
+              var pie2 = setChart("#ageChart", getPie2Option(datas))
+             // 默认选中第一个, 并处理选中逻辑
+             var pie2DataIndex = 0
+             pie2.on('mousemove', function(e) {
+               pie2.dispatchAction({ type: 'downplay', dataIndex: pie2DataIndex });
+               pie2.dispatchAction({ type: 'highlight', dataIndex: e.dataIndex });
+               pie2DataIndex = e.dataIndex
+             });
+             pie2.dispatchAction({ type: 'highlight', dataIndex: pie2DataIndex });
+ 
+              //机构分类统计
+              let guaArrNameArr = data.countData.guaArrName.split(",");
+              let guaArrNumArr = data.countData.guaArrNum.split(",");
+              datas = {};						
+              for(var i=0;i<guaArrNameArr.length;i++){
+                datas[guaArrNameArr[i]] = guaArrNumArr[i];
+              }
+              chartData = {};
+              chartData.datas = datas;
+              chartData.subtext = '';
+              chartData.seriesName = "保障机构类别";
+              chartData.isShowLine= false
+              chartData.isShowTooltip = false
+              // setBar("guaChart", chartData);
+             setChart("#guaChart", getBar2Option(guaArrNameArr, guaArrNumArr))
+ 
+              //供应设备分类统计
+              let devArrName = data.countData.devArrName.split(",");
+              let devArrNum = data.countData.devArrNum.split(",");
+              datas = {};						
+              for(var i=0;i<devArrName.length;i++){
+                datas[devArrName[i]] = devArrNum[i];
+              }
+              chartData = {};
+              chartData.datas = datas;
+              chartData.subtext = '';
+              chartData.seriesName = "设备类别";
+              chartData.isShowLine= false
+              chartData.isShowTooltip = false
+              // setPie("devChart", chartData);
+             var pie1 = setChart("#devChart", getPie1Option(datas));
+             // 默认选中第一个, 并处理选中逻辑
+             var pie1DataIndex = 0
+             pie1.on('mousemove', function(e) {
+               pie1.dispatchAction({ type: 'downplay', dataIndex: pie1DataIndex });
+               pie1.dispatchAction({ type: 'highlight', dataIndex: e.dataIndex });
+               pie1DataIndex = e.dataIndex
+             });
+             pie1.dispatchAction({ type: 'highlight', dataIndex: pie1DataIndex });
+ 
+              let guaAbiJson = data.countData.guaAbiJson
+              $(".info-list").find("span").each(function(){
+                let objId = $(this).attr("id")
+                if(guaAbiJson[objId] != null){
+                  $(this).text(guaAbiJson[objId]);
+                }					 		
+              })
+              let config_service_ability = guaAbiJson.config_service_ability
+              let serviceArr = config_service_ability.split(",")
+              for(let key in serviceArr){
+                if(serviceArr[key] != null && serviceArr[key] != ""){
+                  $(".info-text").append('<span class="label">'+serviceArr[key]+'</span>')
+ 
+                }
+              }
+            }
+          });
+             
+   }
+   function taskTimeReport() {
+     let year = $("#selYear").val()
+     $
+     .ajax({
+       url : urlPre + "taskTimeReport?yearTime="+year,
+       dataType : 'json',
+         success : function(yearTask) {
+           var chartData = {};
+                     let xAxisData = []
+                     let datas = []
+                     for(let key in yearTask){
+                       xAxisData[xAxisData.length] = key
+                       datas[datas.length] = yearTask[key]
+                     }                      
+                     chartData.datas = datas;
+           chartData.xAxisData = xAxisData;
+           chartData.addNum = 2;
+           setLine("taskChart", chartData);	
+         }
+     })
+   }
+   function commentReport(){
+     let queryParams = {};
+     queryParams.schCols = 'itemCode,itemName';
+     queryParams.limit = 200
+     queryParams["sorts[0].field"] = 'sort';
+     queryParams["sorts[0].order"] = 'asc';
+     queryParams.search_LENGTH_itemCode = 2;
+     let colArr = []
+     $.ajax({
+       type : 'post',
+       async : false,
+       url : urlPre + 'api/commentItem/page',
+       data:queryParams,
+       dataType : 'json',
+       success : function(data) {
+         var rows = data.rows;
+         for(var m = 0; m < rows.length; m++){
+           if(m<3){
+             let row = rows[m]
+             let str = '<span>'+row.itemName+'(优)</span>'
+                       $("#commentLi").append(str)
+                       colArr[colArr.length] = row.itemCode + "_1"
+           }
+         
+         }
+       }
+     });	
+     return colArr;
+   }
+ 
+ </script> 
+</div>

resources/templates/office/add.html

@@ -1,48 +1,59 @@
 <html lang="zh-CN">
-<head
-	th:replace="common/common_header::common_header(~{},~{},~{},~{::script},'edit')">
-<meta charset="utf-8" />
-<script th:src="@{/js/office/add.js}"></script>
+
+<head th:replace="common/common_header::common_header(~{},~{},~{},~{::script},'edit')">
+	<meta charset="utf-8" />
+	<script th:src="@{/js/office/add.js}"></script>
 </head>
-<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">  	
-		<div class="panel-body">
-		<form id="officeForm"  method="post" class="conForm load-indicator" data-loading="正在处理...">
-			<h1 class="title">基本信息</h1>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">科室名称：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="depName" name="depName" class="form-control required" 
-						 maxlength="100">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">科室负责人：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="depfzr" name="depfzr" class="form-control required" 
-						 maxlength="20">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">负责人联系电话：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="tel" name="tel" class="form-control isTel required" 
-						 maxlength="20">
+
+<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
+	<div class="panel-body">
+		<form id="officeForm" method="post" class="conForm load-indicator" data-loading="正在处理...">
+			<div class="ext-card">
+				<h1 class="title">基本信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">科室名称：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="depName" name="depName" class="form-control required" maxlength="100">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">科室负责人：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="depfzr" name="depfzr" class="form-control required" maxlength="20">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">负责人联系电话：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="tel" name="tel" class="form-control isTel required" maxlength="20">
+						</div>
+					</div>
 				</div>
 			</div>
-			<h1 class="title">职责信息</h1>
-			<div class="form-group col-xs-12">
-				<div class="col-lg-10 col-xs-12">
-						<textarea style="resize: none;" rows="5" name="depDuty"
-						maxlength="300" class="form-control"></textarea>
+
+			<div class="ext-card">
+				<h1 class="title">职责信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<div class="col-lg-10 col-xs-12">
+							<textarea style="resize: none;" rows="5" name="depDuty" maxlength="300" class="form-control"></textarea>
+						</div>
+					</div>
 				</div>
 			</div>
-			<h1 class="title">备注信息</h1>
-			<div class="form-group col-xs-12">
-				<div class="col-lg-10 col-xs-12">
-						<textarea style="resize: none;" rows="5" name="remark"
-						maxlength="500" class="form-control"></textarea>
+
+			<div class="ext-card">
+				<h1 class="title">备注信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<div class="col-lg-10 col-xs-12">
+							<textarea style="resize: none;" rows="5" name="remark" maxlength="500" class="form-control"></textarea>
+						</div>
+					</div>
 				</div>
 			</div>
+
 			<div class="btnEnd">
 				<button class="btn btn-primary" id="submitBtn" type="button">保存</button>
 				<button class="btn" type="button" onclick="history.back();">取消</button>

resources/templates/office/details.html

@@ -1,40 +1,55 @@
 <html lang="zh-CN">
-<head
-	th:replace="common/common_header::common_header(~{},~{},~{},~{::script},'')">
-<meta charset="utf-8">
-<script th:src="@{/js/office/details.js}"></script>
+
+<head th:replace="common/common_header::common_header(~{},~{},~{},~{::script},'')">
+	<meta charset="utf-8">
+	<script th:src="@{/js/office/details.js}"></script>
 </head>
+
 <body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
 	<div class="panel-body">
-		<form id="officeForm" action="" method="post"
-			class="conForm view-info">		
-				<h1 class="title">基本信息</h1>	
-			<div class="col-xs-6">
-				<label>科室名称：</label>[[${officeObj.depName}]]
-			</div>
-			<div class="col-xs-6">
-				<label>科室负责人：</label>[[${officeObj.depfzr}]]
+		<form id="officeForm" action="" method="post" class="conForm">
+			<div class="ext-card">
+				<h1 class="title">基本信息</h1>
+				<div class="view-info">
+					<div class="col-xs-6">
+						<label>科室名称：</label>[[${officeObj.depName}]]
+					</div>
+					<div class="col-xs-6">
+						<label>科室负责人：</label>[[${officeObj.depfzr}]]
 
+					</div>
+					<div class="col-xs-6">
+						<label>负责人联系电话：</label> [[${officeObj.tel}]]
+					</div>
+					<div class="col-xs-6">
+						<label>科室人员数：</label>[[${officeObj.depPeo}]]
+					</div>
+				</div>
 			</div>
-			<div class="col-xs-6">
-				<label>负责人联系电话：</label> [[${officeObj.tel}]]
-			</div>
-			<div class="col-xs-6">
-				<label>科室人员数：</label>[[${officeObj.depPeo}]]
-			</div>
-			<h1 class="title">职责信息</h1>
-			<div class="text">
-				[[${officeObj.depDuty}]]
+
+			<div class="ext-card">
+				<h1 class="title">职责信息</h1>
+				<div class="view-info">
+					<div class="text">
+						[[${officeObj.depDuty}]]
+					</div>
+				</div>
 			</div>
-			<h1 class="title">备注信息</h1>
-			<div class="text">
-				[[${officeObj.remark}]]
+
+			<div class="ext-card">
+				<h1 class="title">备注信息</h1>
+				<div class="view-info">
+					<div class="text">
+						[[${officeObj.remark}]]
+					</div>
+				</div>
 			</div>
+
 			<div class="btnEnd">
-				<button class="btn btn-primary" type="button"
-					onclick="history.back();">返回</button>
+				<button class="btn btn-primary" type="button" onclick="history.back();">返回</button>
 			</div>
 		</form>
 	</div>
 </body>
+
 </html>

resources/templates/office/update.html

@@ -1,49 +1,64 @@
 <html lang="zh-CN">
-<head
-	th:replace="common/common_header::common_header(~{},~{},~{},~{::script},'edit')">
-<meta charset="utf-8" />
-<script th:src="@{/js/office/update.js}"></script>
+
+<head th:replace="common/common_header::common_header(~{},~{},~{},~{::script},'edit')">
+	<meta charset="utf-8" />
+	<script th:src="@{/js/office/update.js}"></script>
 </head>
-<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">  	
-		<div class="panel-body">
-		<form id="officeForm"  method="post" class="conForm load-indicator" data-loading="正在处理...">
-		<input type="hidden" id="id" name="id" th:value="${officeObj.id}" />
-			<h1 class="title">基本信息</h1>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">科室名称：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="depName" name="depName" class="form-control required" th:value="${officeObj.depName}"
-						 maxlength="100">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">科室负责人：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="depfzr" name="depfzr" class="form-control required"  th:value="${officeObj.depfzr}"
-						 maxlength="20">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">负责人联系电话：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="tel" name="tel" class="form-control isTel required"  th:value="${officeObj.tel}"
-						 maxlength="20">
+
+<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
+	<div class="panel-body">
+		<form id="officeForm" method="post" class="conForm load-indicator" data-loading="正在处理...">
+			<input type="hidden" id="id" name="id" th:value="${officeObj.id}" />
+			<div class="ext-card">
+				<h1 class="title">基本信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">科室名称：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="depName" name="depName" class="form-control required" th:value="${officeObj.depName}"
+								maxlength="100">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">科室负责人：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="depfzr" name="depfzr" class="form-control required" th:value="${officeObj.depfzr}"
+								maxlength="20">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">负责人联系电话：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="tel" name="tel" class="form-control isTel required" th:value="${officeObj.tel}" maxlength="20">
+						</div>
+					</div>
 				</div>
 			</div>
-			<h1 class="title">职责信息</h1>
-			<div class="form-group col-xs-12">
-				<div class="col-lg-10 col-xs-12">
-						<textarea style="resize: none;" rows="5" name="depDuty"  th:text="${officeObj.depDuty}"
-						maxlength="300" class="form-control"></textarea>
+
+			<div class="ext-card">
+				<h1 class="title">职责信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<div class="col-lg-10 col-xs-12">
+							<textarea style="resize: none;" rows="5" name="depDuty" th:text="${officeObj.depDuty}" maxlength="300"
+								class="form-control"></textarea>
+						</div>
+					</div>
 				</div>
 			</div>
-			<h1 class="title">备注信息</h1>
-			<div class="form-group col-xs-12">
-				<div class="col-lg-10 col-xs-12">
-						<textarea style="resize: none;" rows="5" name="remark"  th:text="${officeObj.remark}"
-						maxlength="500" class="form-control"></textarea>
+
+			<div class="ext-card">
+				<h1 class="title">备注信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<div class="col-lg-10 col-xs-12">
+							<textarea style="resize: none;" rows="5" name="remark" th:text="${officeObj.remark}" maxlength="500"
+								class="form-control"></textarea>
+						</div>
+					</div>
 				</div>
 			</div>
+
 			<div class="btnEnd">
 				<button class="btn btn-primary" id="submitBtn" type="button">保存</button>
 				<button class="btn" type="button" onclick="history.back();">取消</button>

resources/templates/station/add.html

@@ -1,104 +1,126 @@
 <html lang="zh-CN">
-<head
-	th:replace="common/common_header::common_header(~{},~{::link},~{},~{::script},'edit')">
-<meta charset="utf-8" />
-<script
-	th:src="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.js}"></script>
-<link
-	th:href="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.css}"
-	rel="stylesheet" />
-<script th:src="@{/js/station/add.js}"></script>
+
+<head th:replace="common/common_header::common_header(~{},~{::link},~{},~{::script},'edit')">
+	<meta charset="utf-8" />
+	<script th:src="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.js}"></script>
+	<link th:href="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.css}" rel="stylesheet" />
+	<script th:src="@{/js/station/add.js}"></script>
 </head>
-<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">  	
-		<div class="panel-body">
-		<form id="stationForm"  method="post" class="conForm load-indicator" data-loading="正在处理...">
-			<h1 class="title">基本信息</h1>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">是否建设站内监控：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="ifjsznjk" id="ifjsznjk"  class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">厨房是否建设监控：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="ifjscfjk" id="ifjscfjk"  class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">监控存档时间：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="jkcdsj" name="jkcdsj" class="form-control form-date required dateISO">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">大门是否建设门禁安防：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="ifjsdmmjaf" id="ifjsdmmjaf"  class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">大门门禁类别：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_door_type" id="config_door_type"  class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">厨房是否建设门禁安防：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="ifjscfmjaf" id="ifjscfmjaf"  class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">厨房门禁类别：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_kitchen_door_type" id="config_kitchen_door_type"  class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
-				</div>
-			</div>
-			<h1 class="title">运行情况</h1>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">监控是否正常：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="ifzcjk" id="ifzcjk"  class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">大门门禁是否正常：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="ifzcdmmj" id="ifzcdmmj"  class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
+
+<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
+	<div class="panel-body">
+		<form id="stationForm" method="post" class="conForm load-indicator" data-loading="正在处理...">
+
+			<div class="ext-card">
+				<h1 class="title">基本信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">是否建设站内监控：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="ifjsznjk" id="ifjsznjk" class="form-control required" aria-required="true"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">厨房是否建设监控：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="ifjscfjk" id="ifjscfjk" class="form-control required" aria-required="true"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">监控存档时间：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="jkcdsj" name="jkcdsj" class="form-control form-date required dateISO">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">大门是否建设门禁安防：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="ifjsdmmjaf" id="ifjsdmmjaf" class="form-control required" aria-required="true"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">大门门禁类别：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_door_type" id="config_door_type" class="form-control required" aria-required="true"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">厨房是否建设门禁安防：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="ifjscfmjaf" id="ifjscfmjaf" class="form-control required" aria-required="true"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">厨房门禁类别：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_kitchen_door_type" id="config_kitchen_door_type" class="form-control required"
+								aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
 				</div>
 			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">厨房门禁是否正常：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="ifzccfmj" id="ifzccfmj"  class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
+
+			<div class="ext-card">
+				<h1 class="title">运行情况</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">监控是否正常：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="ifzcjk" id="ifzcjk" class="form-control required" aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">大门门禁是否正常：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="ifzcdmmj" id="ifzcdmmj" class="form-control required" aria-required="true"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">厨房门禁是否正常：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="ifzccfmj" id="ifzccfmj" class="form-control required" aria-required="true"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
 				</div>
 			</div>
-			<h1 class="title">异常情况说明</h1>
-			<div class="form-group col-xs-12">
-				<div class="col-lg-10 col-xs-12">
-					<textarea style="resize: none;" rows="5" name="exceptionExplan" maxlength="4000" class="form-control"></textarea>
+
+			<div class="ext-card">
+				<h1 class="title">异常情况说明</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<div class="col-lg-10 col-xs-12">
+							<textarea style="resize: none;" rows="5" name="exceptionExplan" maxlength="4000"
+								class="form-control"></textarea>
+						</div>
+					</div>
 				</div>
 			</div>
-			
+
 			<div class="btnEnd">
 				<button class="btn btn-primary" id="submitBtn" type="button">保存</button>
 				<button class="btn" type="button" onclick="history.back();">取消</button>
@@ -110,17 +132,18 @@
 <script>
 	// 仅选择日期
 	$(".form-date").datetimepicker({
-		language : "zh-CN",
-		weekStart : 1,
-		todayBtn : 1,
-		autoclose : 1,
-		todayHighlight : 1,
-		startView : 2,
-		minView : 2,
-		forceParse : 0,
-		format : "yyyy-mm-dd"
-	}).on('changeDate', function(ev) {
+		language: "zh-CN",
+		weekStart: 1,
+		todayBtn: 1,
+		autoclose: 1,
+		todayHighlight: 1,
+		startView: 2,
+		minView: 2,
+		forceParse: 0,
+		format: "yyyy-mm-dd"
+	}).on('changeDate', function (ev) {
 		$(this).valid();
 	});
 </script>
+
 </html>

resources/templates/station/details.html

@@ -1,73 +1,103 @@
 <html lang="zh-CN">
-<head
-	th:replace="common/common_header::common_header(~{},~{},~{::style},~{::script},'')">
-<meta charset="utf-8">
-<script th:src="@{/js/station/details.js}"></script>
-<style type="text/css">
-.view-info>div>label{min-width: 172px;}
-</style>
+
+<head th:replace="common/common_header::common_header(~{},~{},~{::style},~{::script},'')">
+	<meta charset="utf-8">
+	<script th:src="@{/js/station/details.js}"></script>
+	<style type="text/css">
+		.view-info>div>label {
+			min-width: 172px;
+		}
+	</style>
 </head>
+
 <body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
 	<div class="panel-body">
-		<form id="stationForm" action="" method="post" class="conForm view-info">
-		     <input type="hidden" id="dataFiles" name="dataFiles"  th:value="${files}"/>		
-			<h1 class="title">基本信息</h1>	
-			<div class="col-xs-6">
-				<label>站内是否建设监控：</label><font th:selOpt="${stationObj.ifjsznjk}" id="ifjsznjk"></font>
+		<form id="stationForm" action="" method="post" class="conForm">
+			<input type="hidden" id="dataFiles" name="dataFiles" th:value="${files}" />
+			<div class="ext-card">
+				<h1 class="title">基本信息</h1>
+				<div class="view-info">
+					<div class="col-xs-6">
+						<label>站内是否建设监控：</label>
+						<font th:selOpt="${stationObj.ifjsznjk}" id="ifjsznjk"></font>
+					</div>
+					<div class="col-xs-6">
+						<label>站内监控存档时间：</label>[[${stationObj.jkcdsj}]]
+					</div>
+					<div class="col-xs-6">
+						<label>厨房是否建设监控：</label>
+						<font th:selOpt="${stationObj.ifjscfjk}" id="ifjscfjk"></font>
+					</div>
+
+					<div class="col-xs-6">
+						<label>厨房监控存档时间：</label>
+						<font th:selOpt="${stationObj.cfjkcdsj}" id="cfjkcdsj"></font>
+					</div>
+					<div class="col-xs-6">
+						<label>大门是否建设门禁安防：</label>
+						<font th:selOpt="${stationObj.ifjsdmmjaf}" id="ifjsdmmjaf"></font>
+					</div>
+
+					<div class="col-xs-6">
+						<label>大门门禁类别：</label>
+						<font th:selOpt="${stationObj.config_door_type}" id="config_door_type"></font>
+					</div>
+					<div class="col-xs-6">
+						<label>厨房是否建设门禁安防：</label>
+						<font th:selOpt="${stationObj.ifjscfmjaf}" id="ifjscfmjaf"></font>
+					</div>
+
+					<div class="col-xs-6">
+						<label>厨房门禁类别：</label>
+						<font th:selOpt="${stationObj.config_kitchen_door_type}" id="config_kitchen_door_type"></font>
+					</div>
+				</div>
 			</div>
-			<div class="col-xs-6">
-				<label>站内监控存档时间：</label>[[${stationObj.jkcdsj}]]
+
+			<div class="ext-card">
+				<h1 class="title">运行情况</h1>
+				<div class="view-info">
+					<div class="col-xs-6">
+						<label>记录时间：</label>[[${stationObj.full_date}]]
+					</div>
+					<div class="col-xs-6">
+						<label>站内监控是否正常：</label>
+						<font th:selOpt="${stationObj.ifzcjk}" id="ifzcjk"></font>
+					</div>
+					<div class="col-xs-6">
+						<label>厨房监控是否正常：</label>
+						<font th:selOpt="${stationObj.ifzcjkcf}" id="ifzcjkcf"></font>
+					</div>
+					<div class="col-xs-6">
+						<label>大门门禁是否正常：</label>
+						<font th:selOpt="${stationObj.ifzcdmmj}" id="ifzcdmmj"></font>
+					</div>
+					<div class="col-xs-6">
+						<label>厨房门禁是否正常：</label>
+						<font th:selOpt="${stationObj.ifzccfmj}" id="ifzccfmj"></font>
+					</div>
+				</div>
 			</div>
-			<div class="col-xs-6">
-				<label>厨房是否建设监控：</label><font th:selOpt="${stationObj.ifjscfjk}" id="ifjscfjk"></font>
+
+			<div class="ext-card">
+				<h1 class="title">异常情况说明</h1>
+				<div class="view-info">
+					<div class="text">
+						[[${stationObj.exceptionExplan}]]
+					</div>
+					<h1 class="title" style="display:none">设备异常图片</h1>
+					<div style="text-align:center;display:none">
+						<div class="form-group " id="imgDiv" style="display: inline-block;padding: 0;margin: 0;">
+						</div>
+					</div>
+				</div>
 			</div>
-			
-			<div class="col-xs-6">
-				<label>厨房监控存档时间：</label><font th:selOpt="${stationObj.cfjkcdsj}" id="cfjkcdsj"></font>
-			</div>
-				<div class="col-xs-6">
-				<label>大门是否建设门禁安防：</label><font th:selOpt="${stationObj.ifjsdmmjaf}" id="ifjsdmmjaf"></font>
-			</div>
-			
-			<div class="col-xs-6">
-				<label>大门门禁类别：</label><font th:selOpt="${stationObj.config_door_type}" id="config_door_type"></font>
-			</div>
-				<div class="col-xs-6">
-				<label>厨房是否建设门禁安防：</label><font th:selOpt="${stationObj.ifjscfmjaf}" id="ifjscfmjaf"></font>
-			</div>
-					
-			<div class="col-xs-6">
-				<label>厨房门禁类别：</label><font th:selOpt="${stationObj.config_kitchen_door_type}" id="config_kitchen_door_type"></font>
-			</div>
-			<h1 class="title">运行情况</h1>
-			<div class="col-xs-6">
-				<label>记录时间：</label>[[${stationObj.full_date}]]
-			</div>
-			<div class="col-xs-6">
-				<label>站内监控是否正常：</label><font th:selOpt="${stationObj.ifzcjk}" id="ifzcjk"></font>
-			</div>
-			<div class="col-xs-6">
-				<label>厨房监控是否正常：</label><font th:selOpt="${stationObj.ifzcjkcf}" id="ifzcjkcf"></font>
-			</div>	
-			<div class="col-xs-6">
-				<label>大门门禁是否正常：</label><font th:selOpt="${stationObj.ifzcdmmj}" id="ifzcdmmj"></font>
-			</div>
-			<div class="col-xs-6">
-				<label>厨房门禁是否正常：</label><font th:selOpt="${stationObj.ifzccfmj}" id="ifzccfmj"></font>
-			</div>
-			<h1 class="title">异常情况说明</h1>
-			<div class="text">
-				[[${stationObj.exceptionExplan}]]
-			</div>
-			<h1 class="title" style="display:none">设备异常图片</h1>
-			<div style="text-align:center;display:none" >
-				<div class="form-group " id="imgDiv" style="display: inline-block;padding: 0;margin: 0;">										
-				</div>	
-			</div>	
+
 			<div class="btnEnd">
 				<button class="btn btn-primary" type="button" onclick="history.back();">取消</button>
 			</div>
 		</form>
 	</div>
 </body>
+
 </html>

resources/templates/station/update.html

@@ -1,104 +1,129 @@
 <html lang="zh-CN">
-<head
-	th:replace="common/common_header::common_header(~{},~{::link},~{},~{::script},'edit')">
-<meta charset="utf-8" />
-<script
-	th:src="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.js}"></script>
-<link
-	th:href="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.css}"
-	rel="stylesheet" />
-<script th:src="@{/js/station/update.js}"></script>
+
+<head th:replace="common/common_header::common_header(~{},~{::link},~{},~{::script},'edit')">
+	<meta charset="utf-8" />
+	<script th:src="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.js}"></script>
+	<link th:href="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.css}" rel="stylesheet" />
+	<script th:src="@{/js/station/update.js}"></script>
 </head>
-<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">  	
-		<div class="panel-body">
-		<form id="stationForm"  method="post" class="conForm load-indicator" data-loading="正在处理...">
-		<input type="hidden" id="id" name="id" th:value="${stationObj.id}" />
-			<h1 class="title">基本信息</h1>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">是否建设站内监控：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="ifjsznjk" id="ifjsznjk" th:selOpt="${stationObj.ifjsznjk}" class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">厨房是否建设监控：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="ifjscfjk" id="ifjscfjk" th:selOpt="${stationObj.ifjscfjk}"  class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">监控存档时间：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="jkcdsj" name="jkcdsj" th:value="${#dates.format(stationObj.jkcdsj, 'yyyy-MM-dd')}" class="form-control form-date required dateISO">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">大门是否建设门禁安防：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="ifjsdmmjaf" id="ifjsdmmjaf" th:selOpt="${stationObj.ifjsdmmjaf}" class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">大门门禁类别：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_door_type" id="config_door_type" th:selOpt="${stationObj.config_door_type}" class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">厨房是否建设门禁安防：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="ifjscfmjaf" id="ifjscfmjaf" th:selOpt="${stationObj.ifjscfmjaf}" class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">厨房门禁类别：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_kitchen_door_type" th:selOpt="${stationObj.config_kitchen_door_type}" id="config_kitchen_door_type"  class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
-				</div>
-			</div>
-			<h1 class="title">运行情况</h1>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">监控是否正常：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="ifzcjk" id="ifzcjk" th:selOpt="${stationObj.ifzcjk}" class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">大门门禁是否正常：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="ifzcdmmj" id="ifzcdmmj" th:selOpt="${stationObj.ifzcdmmj}" class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
+
+<body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
+	<div class="panel-body">
+		<form id="stationForm" method="post" class="conForm load-indicator" data-loading="正在处理...">
+			<input type="hidden" id="id" name="id" th:value="${stationObj.id}" />
+
+			<div class="ext-card">
+				<h1 class="title">基本信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">是否建设站内监控：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="ifjsznjk" id="ifjsznjk" th:selOpt="${stationObj.ifjsznjk}" class="form-control required"
+								aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">厨房是否建设监控：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="ifjscfjk" id="ifjscfjk" th:selOpt="${stationObj.ifjscfjk}" class="form-control required"
+								aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">监控存档时间：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="jkcdsj" name="jkcdsj" th:value="${#dates.format(stationObj.jkcdsj, 'yyyy-MM-dd')}"
+								class="form-control form-date required dateISO">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">大门是否建设门禁安防：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="ifjsdmmjaf" id="ifjsdmmjaf" th:selOpt="${stationObj.ifjsdmmjaf}"
+								class="form-control required" aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">大门门禁类别：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_door_type" id="config_door_type" th:selOpt="${stationObj.config_door_type}"
+								class="form-control required" aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">厨房是否建设门禁安防：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="ifjscfmjaf" id="ifjscfmjaf" th:selOpt="${stationObj.ifjscfmjaf}"
+								class="form-control required" aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">厨房门禁类别：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_kitchen_door_type" th:selOpt="${stationObj.config_kitchen_door_type}"
+								id="config_kitchen_door_type" class="form-control required" aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
 				</div>
 			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">厨房门禁是否正常：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="ifzccfmj" id="ifzccfmj" th:selOpt="${stationObj.ifzccfmj}" class="form-control required" aria-required="true" aria-invalid="false">
-						<option value="" selected="">--请选择--</option>
-					</select>
+
+			<div class="ext-card">
+				<h1 class="title">运行情况</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">监控是否正常：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="ifzcjk" id="ifzcjk" th:selOpt="${stationObj.ifzcjk}" class="form-control required"
+								aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">大门门禁是否正常：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="ifzcdmmj" id="ifzcdmmj" th:selOpt="${stationObj.ifzcdmmj}" class="form-control required"
+								aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">厨房门禁是否正常：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="ifzccfmj" id="ifzccfmj" th:selOpt="${stationObj.ifzccfmj}" class="form-control required"
+								aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
 				</div>
 			</div>
-			<h1 class="title">异常情况说明</h1>
-			<div class="form-group col-xs-12">
-				<div class="col-lg-10 col-xs-12">
-					<textarea style="resize: none;" rows="5" name="exceptionExplan" th:text="${stationObj.exceptionExplan}" maxlength="4000" class="form-control"></textarea>
+
+			<div class="ext-card">
+				<h1 class="title">异常情况说明</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<div class="col-lg-10 col-xs-12">
+							<textarea style="resize: none;" rows="5" name="exceptionExplan" th:text="${stationObj.exceptionExplan}"
+								maxlength="4000" class="form-control"></textarea>
+						</div>
+					</div>
 				</div>
 			</div>
+
 			<div class="btnEnd">
 				<button class="btn btn-primary" id="submitBtn" type="button">保存</button>
 				<button class="btn" type="button" onclick="history.back();">取消</button>
@@ -110,17 +135,18 @@
 <script>
 	// 仅选择日期
 	$(".form-date").datetimepicker({
-		language : "zh-CN",
-		weekStart : 1,
-		todayBtn : 1,
-		autoclose : 1,
-		todayHighlight : 1,
-		startView : 2,
-		minView : 2,
-		forceParse : 0,
-		format : "yyyy-mm-dd"
-	}).on('changeDate', function(ev) {
+		language: "zh-CN",
+		weekStart: 1,
+		todayBtn: 1,
+		autoclose: 1,
+		todayHighlight: 1,
+		startView: 2,
+		minView: 2,
+		forceParse: 0,
+		format: "yyyy-mm-dd"
+	}).on('changeDate', function (ev) {
 		$(this).valid();
 	});
 </script>
+
 </html>

resources/templates/worker/add.html

@@ -1,172 +1,180 @@
 <html lang="zh-CN">
-<head
-	th:replace="common/common_header::common_header(~{},~{::link},~{},~{::script},'edit')">
-<meta charset="utf-8" />
-<script
-	th:src="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.js}"></script>
-<link
-	th:href="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.css}"
-	rel="stylesheet" />
-<script th:src="@{/js/idcard.js}" type="text/javascript"></script>
-<script th:src="@{/js/worker/add.js}"></script>
-<link th:href="@{/js/zui/dist/lib/uploader/zui.uploader.min.css}"
-	rel="stylesheet">
-<script th:src="@{/js/zui/dist/lib/uploader/zui.uploader.min.js}"></script>
+
+<head th:replace="common/common_header::common_header(~{},~{::link},~{},~{::script},'edit')">
+	<meta charset="utf-8" />
+	<script th:src="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.js}"></script>
+	<link th:href="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.css}" rel="stylesheet" />
+	<script th:src="@{/js/idcard.js}" type="text/javascript"></script>
+	<script th:src="@{/js/worker/add.js}"></script>
+	<link th:href="@{/js/zui/dist/lib/uploader/zui.uploader.min.css}" rel="stylesheet">
+	<script th:src="@{/js/zui/dist/lib/uploader/zui.uploader.min.js}"></script>
 
 </head>
+
 <body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
 	<div class="panel-body">
 		<form id="workerForm" method="post" class="conForm load-indicator" data-loading="正在处理...">
-			<h1 class="title">基本信息</h1>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">姓名：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="uName" name="uName" class="form-control required"
-						maxlength="10">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">性别：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_gender" id="config_gender"  class="form-control required" 
-						aria-required="true" aria-invalid="false"><option
-							value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class=" required">民族：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_nation" id="config_nation"  class="form-control required" 
-						aria-required="true" aria-invalid="false"><option
-							value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">血型：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_bltype" id="config_bltype" class="form-control required"
-						 aria-required="true"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">身份证号：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="idNumber" name="idNumber" class="form-control required"
-						maxlength="20">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">出生日期：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="birth_date" name="birth_date" class="form-control form-date required dateISO" >
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">文化程度：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_education" id="config_education" class="form-control required"
-						 aria-required="true"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">政治面貌：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_polity" id="config_polity" class="form-control required"
-						aria-required="true"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">人员身份：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_peoidentity" id="config_peoidentity" class="form-control required"
-						 aria-required="true"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">工作岗位：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_workstation" id="config_workstation" class="form-control required"
-						 aria-required="true"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">编制性质：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_worker_formation_prop" id="config_worker_formation_prop" class="form-control required"
-						 aria-required="true"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">行政级别：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_level" id="config_level" class="form-control required"
-						 aria-required="true"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="col-sm-4">家庭住址：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="address" name="address" class="form-control "
-						maxlength="50">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="col-sm-4">籍贯：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="native_place" name="native_place" class="form-control "
-						maxlength="50">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">办公电话：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="officeTel" name="officeTel" class="form-control isTel required"
-						maxlength="20">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">移动电话：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="mobile" name="mobile" class="form-control isMobile required"
-						maxlength="30">
+			<div class="ext-card">
+				<h1 class="title">基本信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">姓名：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="uName" name="uName" class="form-control required" maxlength="10">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">性别：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_gender" id="config_gender" class="form-control required" aria-required="true"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class=" required col-sm-4">民族：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_nation" id="config_nation" class="form-control required" aria-required="true"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">血型：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_bltype" id="config_bltype" class="form-control required" aria-required="true"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">身份证号：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="idNumber" name="idNumber" class="form-control required" maxlength="20">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">出生日期：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="birth_date" name="birth_date" class="form-control form-date required dateISO">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">文化程度：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_education" id="config_education" class="form-control required" aria-required="true"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">政治面貌：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_polity" id="config_polity" class="form-control required" aria-required="true"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">人员身份：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_peoidentity" id="config_peoidentity" class="form-control required"
+								aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">工作岗位：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_workstation" id="config_workstation" class="form-control required"
+								aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">编制性质：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_worker_formation_prop" id="config_worker_formation_prop"
+								class="form-control required" aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">行政级别：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_level" id="config_level" class="form-control required" aria-required="true"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="col-sm-4">家庭住址：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="address" name="address" class="form-control " maxlength="50">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="col-sm-4">籍贯：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="native_place" name="native_place" class="form-control " maxlength="50">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">办公电话：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="officeTel" name="officeTel" class="form-control isTel required" maxlength="20">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">移动电话：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="mobile" name="mobile" class="form-control isMobile required" maxlength="30">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="col-sm-4">电子邮箱：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="email" name="email" class="form-control email" maxlength="50">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">所属科室：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="officeId" id="officeId" class="form-control required" aria-required="true"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-lg-8 col-xs-12">
+						<label class="col-sm-4">个人照片：</label>
+						<div class="col-lg-10 col-xs-10">
+							<div th:replace="common/common_file::common_file('photo','')"></div>
+						</div>
+					</div>
 				</div>
 			</div>
-			<div class="form-group col-xs-12">
-				<label class="col-sm-4">电子邮箱：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="email" name="email" class="form-control email"
-						maxlength="50">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">所属科室：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="officeId" id="officeId" class="form-control required"
-						aria-required="true"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-lg-8 col-xs-12">
-				<label class="col-sm-4">个人照片：</label>
-				<div class="col-lg-10 col-xs-10">
-					<div
-						th:replace="common/common_file::common_file('photo','')"></div>
-				</div>
-			</div>
-			<h1 class="title">备注信息</h1>
-			<div class="form-group col-xs-12">
-				<div class="col-lg-10 col-xs-12">
-					<textarea style="resize: none;" rows="5" name="remark"
-						maxlength="500" class="form-control"></textarea>
+
+			<div class="ext-card">
+				<h1 class="title">备注信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<div class="col-lg-10 col-xs-12">
+							<textarea style="resize: none;" rows="5" name="remark" maxlength="500" class="form-control"></textarea>
+						</div>
+					</div>
 				</div>
 			</div>
+
 			<div class="btnEnd">
 				<button class="btn btn-primary" id="submitBtn" type="button">保存</button>
 				<button class="btn" type="button" onclick="history.back();">取消</button>
@@ -177,18 +185,20 @@
 <script>
 	// 仅选择日期
 	$(".form-date").datetimepicker({
-		language : "zh-CN",
-		weekStart : 1,
-		todayBtn : 1,
-		autoclose : 1,
-		todayHighlight : 1,
-		startView : 2,
-		minView : 2,
-		forceParse : 0,
-		format : "yyyy-mm-dd"
-	}).on('changeDate', function(ev) {
+		language: "zh-CN",
+		weekStart: 1,
+		todayBtn: 1,
+		autoclose: 1,
+		todayHighlight: 1,
+		startView: 2,
+		minView: 2,
+		forceParse: 0,
+		format: "yyyy-mm-dd"
+	}).on('changeDate', function (ev) {
 		$(this).valid();
 	});
 </script>
+
 </html>
+
 </html>

resources/templates/worker/details.html

@@ -1,88 +1,113 @@
 <html lang="zh-CN">
-<head
-	th:replace="common/common_header::common_header(~{},~{::link},~{},~{::script},'')">
-<meta charset="utf-8">
-<script th:src="@{/js/worker/details.js}"></script>
-<script th:src="@{/js/pictureViewer/js/pictureViewer.js}"></script>
-<script th:src="@{/js/pictureViewer/js/jquery.mousewheel.min.js}"></script>
-<script th:src="@{/js/pictureViewer/js/pictureViewer.js}"></script>
-<link rel="stylesheet" type="text/css" th:href="@{/js/pictureViewer/css/pictureViewer.css}">
+
+<head th:replace="common/common_header::common_header(~{},~{::link},~{},~{::script},'')">
+	<meta charset="utf-8">
+	<script th:src="@{/js/worker/details.js}"></script>
+	<script th:src="@{/js/pictureViewer/js/pictureViewer.js}"></script>
+	<script th:src="@{/js/pictureViewer/js/jquery.mousewheel.min.js}"></script>
+	<script th:src="@{/js/pictureViewer/js/pictureViewer.js}"></script>
+	<link rel="stylesheet" type="text/css" th:href="@{/js/pictureViewer/css/pictureViewer.css}">
 </head>
+
 <body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
 	<div class="panel-body">
-		<form id="officeForm" action="" method="post"
-			class="conForm view-info">		
-			<h1 class="title">基本信息</h1>	
-			<div class="col-xs-6">
-				<label>姓名：</label>[[${workerObj.uName}]]
-			</div>
-			<div class="col-xs-6">
-				<label>身份证号：</label>[[${workerObj.idNumber}]]
-			</div>
-			<div class="col-xs-6">
-				<label>性别：</label><font th:selOpt="${workerObj.config_gender}" id="config_gender"></font>
-			</div>
-			<div class="col-xs-6">
-				<label>出生日期：</label>[[${#dates.format(workerObj.birth_date, 'yyyy-MM-dd')}]]
-			</div>
-			<div class="col-xs-6">
-				<label>民族：</label><font th:selOpt="${workerObj.config_nation}" id="config_nation"></font>
-			</div>
-			<div class="col-xs-6">
-				<label>血型：</label><font th:selOpt="${workerObj.config_bltype}" id="config_bltype"></font>
-			</div>
-			<div class="col-xs-6">
-				<label>文化程度：</label><font th:selOpt="${workerObj.config_education}" id="config_education"></font>
-			</div>
-			<div class="col-xs-6">
-				<label>政治面貌：</label><font th:selOpt="${workerObj.config_polity}" id="config_polity"></font>
-			</div>
-			<div class="col-xs-6">
-				<label>人员身份：</label><font th:selOpt="${workerObj.config_peoidentity}" id="config_peoidentity"></font>
-			</div>
-			<div class="col-xs-6">
-				<label>工作岗位：</label><font th:selOpt="${workerObj.config_workstation}" id="config_workstation"></font>
-			</div>
-			<div class="col-xs-6">
-				<label>编制性质：</label><font th:selOpt="${workerObj.config_worker_formation_prop}" id="config_worker_formation_prop"></font>
-			</div>
-			<div class="col-xs-6">
-				<label>行政级别：</label><font th:selOpt="${workerObj.config_admin_grade}" id="config_admin_grade"></font>
-			</div>
-			<div class="col-xs-6">
-				<label>家庭住址：</label>[[${workerObj.address}]]
-			</div>
-			<div class="col-xs-6">
-				<label>籍贯：</label>[[${workerObj.native_place}]]
-			</div>
-			<div class="col-xs-6">
-				<label>办公电话：</label>[[${workerObj.officeTel}]]
-			</div>
-			<div class="col-xs-6">
-				<label>移动电话：</label>[[${workerObj.mobile}]]
-			</div>
-			<div class="col-xs-6">
-				<label>电子邮箱：</label>[[${workerObj.email}]]
-			</div>
-			<div class="col-xs-6">
-				<label>所属科室：</label><font th:selOpt="${(workerObj.officeid != null)?workerObj.officeid:''}" id="officeId"></font>
-			</div>
-			<h1 class="title">照片信息</h1>	
-			<div class="col-xs-12 image-list"
-				th:if="${not #strings.isEmpty(workerObj.photo)}">
-				<label>个人照片：</label>
-				<span class="cover"><img th:src="@{/} + 'api/file/getFile?filePath=' + ${workerObj.photo}"  th:imgName="${workerObj.uName}"
-				alt="个人照片" style="width:200px;height:200px;border:#ddd 1px solid; vertical-align: text-top;"></span>
-			</div>
-			<h1 class="title">备注信息</h1>
-			<div class="text">
-				[[${workerObj.remark}]]
-			</div>
+		<form id="officeForm" action="" method="post" class="conForm">
+			<div class="ext-card">
+				<h1 class="title">基本信息</h1>
+				<div class="view-info">
+					<div class="col-xs-6">
+						<label>姓名：</label>[[${workerObj.uName}]]
+					</div>
+					<div class="col-xs-6">
+						<label>身份证号：</label>[[${workerObj.idNumber}]]
+					</div>
+					<div class="col-xs-6">
+						<label>性别：</label>
+						<font th:selOpt="${workerObj.config_gender}" id="config_gender"></font>
+					</div>
+					<div class="col-xs-6">
+						<label>出生日期：</label>[[${#dates.format(workerObj.birth_date, 'yyyy-MM-dd')}]]
+					</div>
+					<div class="col-xs-6">
+						<label>民族：</label>
+						<font th:selOpt="${workerObj.config_nation}" id="config_nation"></font>
+					</div>
+					<div class="col-xs-6">
+						<label>血型：</label>
+						<font th:selOpt="${workerObj.config_bltype}" id="config_bltype"></font>
+					</div>
+					<div class="col-xs-6">
+						<label>文化程度：</label>
+						<font th:selOpt="${workerObj.config_education}" id="config_education"></font>
+					</div>
+					<div class="col-xs-6">
+						<label>政治面貌：</label>
+						<font th:selOpt="${workerObj.config_polity}" id="config_polity"></font>
+					</div>
+					<div class="col-xs-6">
+						<label>人员身份：</label>
+						<font th:selOpt="${workerObj.config_peoidentity}" id="config_peoidentity"></font>
+					</div>
+					<div class="col-xs-6">
+						<label>工作岗位：</label>
+						<font th:selOpt="${workerObj.config_workstation}" id="config_workstation"></font>
+					</div>
+					<div class="col-xs-6">
+						<label>编制性质：</label>
+						<font th:selOpt="${workerObj.config_worker_formation_prop}" id="config_worker_formation_prop"></font>
+					</div>
+					<div class="col-xs-6">
+						<label>行政级别：</label>
+						<font th:selOpt="${workerObj.config_admin_grade}" id="config_admin_grade"></font>
+					</div>
+					<div class="col-xs-6">
+						<label>家庭住址：</label>[[${workerObj.address}]]
+					</div>
+					<div class="col-xs-6">
+						<label>籍贯：</label>[[${workerObj.native_place}]]
+					</div>
+					<div class="col-xs-6">
+						<label>办公电话：</label>[[${workerObj.officeTel}]]
+					</div>
+					<div class="col-xs-6">
+						<label>移动电话：</label>[[${workerObj.mobile}]]
+					</div>
+					<div class="col-xs-6">
+						<label>电子邮箱：</label>[[${workerObj.email}]]
+					</div>
+					<div class="col-xs-6">
+						<label>所属科室：</label>
+						<font th:selOpt="${(workerObj.officeid != null)?workerObj.officeid:''}" id="officeId"></font>
+					</div>
+				</div>
+			</div>
+
+			<div class="ext-card">
+				<h1 class="title">照片信息</h1>
+				<div class="view-info">
+					<div class="col-xs-12 image-list" th:if="${not #strings.isEmpty(workerObj.photo)}">
+						<label>个人照片：</label>
+						<span class="cover"><img th:src="@{/} + 'api/file/getFile?filePath=' + ${workerObj.photo}"
+								th:imgName="${workerObj.uName}" alt="个人照片"
+								style="width:200px;height:200px;border:#ddd 1px solid; vertical-align: text-top;"></span>
+					</div>
+				</div>
+			</div>
+
+			<div class="ext-card">
+				<h1 class="title">备注信息</h1>
+				<div class="view-info">
+					<div class="text">
+						[[${workerObj.remark}]]
+					</div>
+				</div>
+			</div>
+
 			<div class="btnEnd">
-				<button class="btn btn-primary" type="button"
-					onclick="history.back();">返回</button>
+				<button class="btn btn-primary" type="button" onclick="history.back();">返回</button>
 			</div>
 		</form>
 	</div>
 </body>
+
 </html>

resources/templates/worker/update.html

@@ -1,181 +1,194 @@
 <html lang="zh-CN">
-<head
-	th:replace="common/common_header::common_header(~{},~{::link},~{},~{::script},'edit')">
-<meta charset="utf-8" />
-<script
-	th:src="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.js}"></script>
-<link
-	th:href="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.css}"
-	rel="stylesheet" />
-<script th:src="@{/js/idcard.js}" type="text/javascript"></script>
-<script th:src="@{/js/worker/update.js}"></script>
-<link th:href="@{/js/zui/dist/lib/uploader/zui.uploader.min.css}"
-	rel="stylesheet">
-<script th:src="@{/js/zui/dist/lib/uploader/zui.uploader.min.js}"></script>
+
+<head th:replace="common/common_header::common_header(~{},~{::link},~{},~{::script},'edit')">
+	<meta charset="utf-8" />
+	<script th:src="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.js}"></script>
+	<link th:href="@{/js/zui/dist/lib/datetimepicker/datetimepicker.min.css}" rel="stylesheet" />
+	<script th:src="@{/js/idcard.js}" type="text/javascript"></script>
+	<script th:src="@{/js/worker/update.js}"></script>
+	<link th:href="@{/js/zui/dist/lib/uploader/zui.uploader.min.css}" rel="stylesheet">
+	<script th:src="@{/js/zui/dist/lib/uploader/zui.uploader.min.js}"></script>
 
 </head>
+
 <body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
 	<div class="panel-body">
 		<form id="workerForm" method="post" class="conForm load-indicator" data-loading="正在处理...">
-			<h1 class="title">基本信息</h1>
-			<input type="hidden" id="id" name= "id" th:value="${workerObj.id}" />
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">姓名：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="uName" name="uName" class="form-control required" th:value="${workerObj.uName}"
-						maxlength="10">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">性别：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_gender" id="config_gender"  class="form-control required" th:selOpt="${workerObj.config_gender}"
-						aria-required="true" aria-invalid="false"><option
-							value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class=" required">民族：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_nation" id="config_nation"  class="form-control required" th:selOpt="${workerObj.config_nation}" 
-						aria-required="true" aria-invalid="false"><option
-							value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">血型：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_bltype" id="config_bltype" class="form-control required" th:selOpt="${workerObj.config_bltype}"
-						 aria-required="true"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">身份证号：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="idNumber" name="idNumber" class="form-control required" th:value="${workerObj.idNumber}"
-						maxlength="20" th:selOpt="${workerObj.idNumber}">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">出生日期：</label>
-				<div class="col-lg-6 col-xs-8"> 
-					<input id="birth_date" name="birth_date" class="form-control form-date required dateISO" 
-					th:value="${#dates.format(workerObj.birth_date, 'yyyy-MM-dd')}">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">文化程度：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_education" id="config_education" class="form-control required" th:selOpt="${workerObj.config_education}"
-						 aria-required="true"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">政治面貌：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_polity" id="config_polity" class="form-control required" th:selOpt="${workerObj.config_polity}"
-						aria-required="true"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="col-sm-4">人员身份：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_peoidentity" id="config_peoidentity" class="form-control required" th:selOpt="${workerObj.config_peoidentity}"
-						 aria-required="true"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">工作岗位：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_workstation" id="config_workstation" class="form-control required" th:selOpt="${workerObj.config_workstation}"
-						 aria-required="true"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">编制性质：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_worker_formation_prop" id="config_worker_formation_prop" class="form-control required"
-						 aria-required="true" th:selOpt="${workerObj.config_worker_formation_prop}"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
+			<div class="ext-card">
+				<h1 class="title">基本信息</h1>
+				<div class="wd-m">
+					<input type="hidden" id="id" name="id" th:value="${workerObj.id}" />
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">姓名：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="uName" name="uName" class="form-control required" th:value="${workerObj.uName}" maxlength="10">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">性别：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_gender" id="config_gender" class="form-control required"
+								th:selOpt="${workerObj.config_gender}" aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class=" required col-sm-4">民族：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_nation" id="config_nation" class="form-control required"
+								th:selOpt="${workerObj.config_nation}" aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">血型：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_bltype" id="config_bltype" class="form-control required"
+								th:selOpt="${workerObj.config_bltype}" aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">身份证号：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="idNumber" name="idNumber" class="form-control required" th:value="${workerObj.idNumber}"
+								maxlength="20" th:selOpt="${workerObj.idNumber}">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">出生日期：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="birth_date" name="birth_date" class="form-control form-date required dateISO"
+								th:value="${#dates.format(workerObj.birth_date, 'yyyy-MM-dd')}">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">文化程度：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_education" id="config_education" class="form-control required"
+								th:selOpt="${workerObj.config_education}" aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">政治面貌：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_polity" id="config_polity" class="form-control required"
+								th:selOpt="${workerObj.config_polity}" aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="col-sm-4">人员身份：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_peoidentity" id="config_peoidentity" class="form-control required"
+								th:selOpt="${workerObj.config_peoidentity}" aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">工作岗位：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_workstation" id="config_workstation" class="form-control required"
+								th:selOpt="${workerObj.config_workstation}" aria-required="true" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">编制性质：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_worker_formation_prop" id="config_worker_formation_prop"
+								class="form-control required" aria-required="true" th:selOpt="${workerObj.config_worker_formation_prop}"
+								aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="col-sm-4">行政级别：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="config_level" id="config_level" class="form-control required" aria-required="true"
+								th:selOpt="${workerObj.config_level}" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="col-sm-4">家庭住址：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="address" name="address" class="form-control " th:value="${workerObj.address}" maxlength="50">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="col-sm-4">籍贯：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="native_place" name="native_place" class="form-control " th:value="${workerObj.native_place}"
+								maxlength="50">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="col-sm-4">办公电话：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="officeTel" name="officeTel" class="form-control isTel required"
+								th:value="${workerObj.officeTel}" maxlength="20">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">移动电话：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="mobile" name="mobile" class="form-control isMobile required" th:value="${workerObj.mobile}"
+								maxlength="30">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="col-sm-4">电子邮箱：</label>
+						<div class="col-lg-6 col-xs-8">
+							<input id="email" name="email" class="form-control email" th:value="${workerObj.email}" maxlength="50">
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="required col-sm-4">所属科室：</label>
+						<div class="col-lg-6 col-xs-8">
+							<select name="officeId" id="officeId" class="form-control required" aria-required="true"
+								th:selOpt="${(workerObj.officeid != null)?workerObj.officeid:''}" aria-invalid="false">
+								<option value="" selected="">--请选择--</option>
+							</select>
+						</div>
+					</div>
+					<div class="form-group col-xs-12">
+						<label class="col-sm-4">个人照片：</label>
+						<div class="col-lg-10 col-xs-10" th:if="${not #strings.isEmpty(workerObj.photo)}">
+							<div th:replace="common/common_file::common_file('photo',${workerObj.photo})"></div>
+						</div>
+						<div class="col-lg-10 col-xs-10" th:if="${#strings.isEmpty(workerObj.photo)}">
+							<div th:if="${#strings.isEmpty(workerObj.photo)}"
+								th:replace="common/common_file::common_file('photo','')"></div>
+						</div>
+					</div>
 				</div>
 			</div>
-			<div class="form-group col-xs-12">
-				<label class="col-sm-4">行政级别：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="config_level" id="config_level" class="form-control required"
-						 aria-required="true" th:selOpt="${workerObj.config_level}"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="col-sm-4">家庭住址：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="address" name="address" class="form-control " th:value="${workerObj.address}"
-						maxlength="50">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="col-sm-4">籍贯：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="native_place" name="native_place" class="form-control " th:value="${workerObj.native_place}"
-						maxlength="50">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="col-sm-4">办公电话：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="officeTel" name="officeTel" class="form-control isTel required" th:value="${workerObj.officeTel}"
-						maxlength="20">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">移动电话：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="mobile" name="mobile" class="form-control isMobile required" th:value="${workerObj.mobile}"
-						maxlength="30">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="col-sm-4">电子邮箱：</label>
-				<div class="col-lg-6 col-xs-8">
-					<input id="email" name="email" class="form-control email" th:value="${workerObj.email}"
-						maxlength="50">
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="required col-sm-4">所属科室：</label>
-				<div class="col-lg-6 col-xs-8">
-					<select name="officeId" id="officeId" class="form-control required"
-						aria-required="true" th:selOpt="${(workerObj.officeid != null)?workerObj.officeid:''}"
-						aria-invalid="false"><option value="" selected="">--请选择--</option></select>
-				</div>
-			</div>
-			<div class="form-group col-xs-12">
-				<label class="col-sm-4">个人照片：</label>
-				<div class="col-lg-10 col-xs-10" th:if="${not #strings.isEmpty(workerObj.photo)}">
-					<div   
-						th:replace="common/common_file::common_file('photo',${workerObj.photo})"></div> 
-				</div>
-				<div class="col-lg-10 col-xs-10" th:if="${#strings.isEmpty(workerObj.photo)}">					
-					<div th:if="${#strings.isEmpty(workerObj.photo)}"
-						th:replace="common/common_file::common_file('photo','')"></div>
-				</div>
-			</div>
-			<h1 class="title">备注信息</h1>
-			<div class="form-group col-xs-12">
-				<div class="col-lg-10 col-xs-12">
-					<textarea style="resize: none;" rows="5" name="remark"
-						maxlength="500" class="form-control"></textarea>
+
+			<div class="ext-card">
+				<h1 class="title">备注信息</h1>
+				<div class="wd-m">
+					<div class="form-group col-xs-12">
+						<div class="col-lg-10 col-xs-12">
+							<textarea style="resize: none;" rows="5" name="remark" maxlength="500" class="form-control"></textarea>
+						</div>
+					</div>
 				</div>
 			</div>
+
 			<div class="btnEnd">
 				<button class="btn btn-primary" id="submitBtn" type="button">保存</button>
-				<button class="btn" type="button" onclick="history.back();">取消</button>	
+				<button class="btn" type="button" onclick="history.back();">取消</button>
 			</div>
 		</form>
 	</div>
@@ -183,18 +196,20 @@
 <script>
 	// 仅选择日期
 	$(".form-date").datetimepicker({
-		language : "zh-CN",
-		weekStart : 1,
-		todayBtn : 1,
-		autoclose : 1,
-		todayHighlight : 1,
-		startView : 2,
-		minView : 2,
-		forceParse : 0,
-		format : "yyyy-mm-dd"
-	}).on('changeDate', function(ev) {
+		language: "zh-CN",
+		weekStart: 1,
+		todayBtn: 1,
+		autoclose: 1,
+		todayHighlight: 1,
+		startView: 2,
+		minView: 2,
+		forceParse: 0,
+		format: "yyyy-mm-dd"
+	}).on('changeDate', function (ev) {
 		$(this).valid();
 	});
 </script>
+
 </html>
+
 </html>