H5
/
jgz
关注 2
点赞 0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

feats

张延森 2 年前
父节点
268768cf2f
当前提交
fe8d13c21a
共有 30 个文件被更改，包括 312 次插入 和 140 次删除
分列视图 显示文件统计
  1. 54
    10
      resources/static/css/common.css
  2. 1
    0
      resources/static/js/jsmpeg.min.js
  3. 22
    17
      resources/static/less/chart-card.less
  4. 2
    1
      resources/static/less/index.less
  5. 50
    0
      resources/static/less/monitor-page.less
  6. 1
    1
      resources/templates/commentItem/list.html
  7. 1
    1
      resources/templates/commentItem/selItemList.html
  8. 1
    1
      resources/templates/commentRecord/list.html
  9. 0
    7
      resources/templates/common/common_entity.html
  10. 67
    66
      resources/templates/common/common_list.html
  11. 1
    1
      resources/templates/dataManager/list.html
  12. 1
    1
      resources/templates/dict/list.html
  13. 1
    1
      resources/templates/equipment/list.html
  14. 1
    1
      resources/templates/guaranteeOrg/list.html
  15. 1
    1
      resources/templates/guaranteeOrgPerson/list.html
  16. 1
    1
      resources/templates/guaranteeOrgRecord/list.html
  17. 1
    1
      resources/templates/guaranteePlan/list.html
  18. 6
    1
      resources/templates/index.html
  19. 1
    1
      resources/templates/installations/list.html
  20. 1
    1
      resources/templates/jintro/selJintro.html
  21. 1
    1
      resources/templates/jtaskYear/list.html
  22. 16
    19
      resources/templates/main/dashboard.html
  23. 1
    1
      resources/templates/office/list.html
  24. 1
    1
      resources/templates/operator/list.html
  25. 19
    1
      resources/templates/station/list.html
  26. 0
    0
      resources/templates/station/list_normal.html
  27. 57
    0
      resources/templates/station/monitor.html
  28. 1
    1
      resources/templates/task/list.html
  29. 1
    1
      resources/templates/worker/list.html
  30. 1
    1
      resources/templates/worker/officeWorkerList.html

+ 54
- 10
resources/static/css/common.css 查看文件 

@@ -72,25 +72,28 @@
72 72 
 .nav-menu-submenu.active {
73 73 
   display: block;
74 74 
 }
75 
-.chart-page {
76 
-  width: 100%;
77 
-  height: 100%;
78 
-  overflow-y: auto;
79 
-  background: #071C51;
80 
-}
81 
-.chart-page .flex-part {
75 
+.flex-part {
82 76 
   display: flex;
83 77 
   justify-content: space-between;
84 78 
 }
85 
-.chart-page .flex-part .flex-part-3 {
79 
+.flex-part .flex-part-3 {
86 80 
   flex: 3;
87 81 
 }
88 
-.chart-page .flex-part .flex-part-2 {
82 
+.flex-part .flex-part-2 {
89 83 
   flex: 3;
90 84 
 }
91 
-.chart-page .flex-part .flex-part-1 {
85 
+.flex-part .flex-part-1 {
92 86 
   flex: 1;
93 87 
 }
88 
+.flex-part .flex-part-0 {
89 
+  flex: none;
90 
+}
91 
+.chart-page {
92 
+  width: 100%;
93 
+  height: 100%;
94 
+  overflow-y: auto;
95 
+  background: #071C51;
96 
+}
94 97 
 .chart-page .count {
95 98 
   border-radius: 20px;
96 99 
 }
 
@@ -461,3 +464,44 @@
461 464 
   color: #fff;
462 465 
   background: none;
463 466 
 }
467 
+.monitor-page #video-canvas {
468 
+  width: 800px;
469 
+  height: 450px;
470 
+}
471 
+.monitor-page .modal-dialog {
472 
+  width: fit-content;
473 
+}
474 
+.monitor-page .monitor-list {
475 
+  flex-wrap: wrap;
476 
+  justify-content: start;
477 
+}
478 
+.monitor-page .monitor-list .monitor-item {
479 
+  margin-top: 2em;
480 
+  margin-left: 2em;
481 
+  width: 360px;
482 
+  height: 202.5px;
483 
+  position: relative;
484 
+  background: #003a8c;
485 
+}
486 
+.monitor-page .monitor-list .monitor-item h2 {
487 
+  color: #fff;
488 
+  text-align: center;
489 
+  position: absolute;
490 
+  width: 100%;
491 
+  left: 0;
492 
+  bottom: 20px;
493 
+  font-weight: normal;
494 
+  letter-spacing: 2px;
495 
+}
496 
+.monitor-page .monitor-list .monitor-item .monitor-play {
497 
+  position: absolute;
498 
+  width: 64px;
499 
+  height: 64px;
500 
+  left: calc(50% - 32px);
501 
+  top: calc(50% - 48px);
502 
+  text-align: center;
503 
+}
504 
+.monitor-page .monitor-list .monitor-item .monitor-play .icon {
505 
+  font-size: 60px;
506 
+  color: #fff;
507 
+}

+ 1
- 0
resources/static/js/jsmpeg.min.js
文件差异内容过多而无法显示
查看文件


+ 22
- 17
resources/static/less/chart-card.less 查看文件 

@@ -2,29 +2,34 @@
2 2 
 @chart-card-bg: #071C51;
3 3 
 @chart-card-radius: 20px;
4 4
5 
-.chart-page {
6 
-  width: 100%;
7 
-  height: 100%;
8 
-  overflow-y: auto;
9 
-  background: @chart-card-bg;
10 5
11 
-  .flex-part {
12 
-    display: flex;
13 
-    justify-content: space-between;
6 
+.flex-part {
7 
+  display: flex;
8 
+  justify-content: space-between;
14 9
15 
-    .flex-part-3 {
16 
-      flex: 3;
17 
-    }
10 
+  .flex-part-3 {
11 
+    flex: 3;
12 
+  }
18 13
19 
-    .flex-part-2 {
20 
-      flex: 3;
21 
-    }
14 
+  .flex-part-2 {
15 
+    flex: 3;
16 
+  }
22 17
23 
-    .flex-part-1 {
24 
-      flex: 1;
25 
-    }
18 
+  .flex-part-1 {
19 
+    flex: 1;
26 20 
   }
27 21
22 
+  .flex-part-0 {
23 
+    flex: none;
24 
+  }
25 
+}
26 
+
27 
+.chart-page {
28 
+  width: 100%;
29 
+  height: 100%;
30 
+  overflow-y: auto;
31 
+  background: @chart-card-bg;
32 
+
28 33 
   .count {
29 34 
     border-radius: 20px;
30 35

+ 2
- 1
resources/static/less/index.less 查看文件 

@@ -2,4 +2,5 @@
2 2 
 @import './zui-theme.less';
3 3 
 @import './nav-menu.less';
4 4 
 @import './chart-card.less';
5 
-@import './ext-page.less';
5 
+@import './ext-page.less';
6 
+@import './monitor-page.less';

+ 50
- 0
resources/static/less/monitor-page.less 查看文件 

@@ -0,0 +1,50 @@
1 
+.monitor-page {
2 
+
3 
+  #video-canvas {
4 
+    width: 800px;
5 
+    height: 450px;
6 
+  }
7 
+
8 
+  .modal-dialog {
9 
+    width: fit-content;
10 
+  }
11 
+
12 
+  .monitor-list {
13 
+    flex-wrap: wrap;
14 
+    justify-content: start;
15 
+
16 
+    .monitor-item {
17 
+      margin-top: 2em;
18 
+      margin-left: 2em;
19 
+      width: 360px;
20 
+      height: 202.5px;
21 
+      position: relative;
22 
+      background: #003a8c;
23 
+
24 
+      h2 {
25 
+        color: #fff;
26 
+        text-align: center;
27 
+        position: absolute;
28 
+        width: 100%;
29 
+        left: 0;
30 
+        bottom: 20px;
31 
+        font-weight: normal;
32 
+        letter-spacing: 2px;
33 
+      }
34 
+
35 
+      .monitor-play {
36 
+        position: absolute;
37 
+        width: 64px;
38 
+        height: 64px;
39 
+        left: calc(50% - 32px);
40 
+        top: calc(50% - 48px);
41 
+        text-align: center;
42 
+
43 
+        .icon {
44 
+          font-size: 60px;
45 
+          color: #fff;
46 
+        }
47 
+      }
48 
+    }
49 
+  }
50 
+}

+ 1
- 1
resources/templates/commentItem/list.html 查看文件 

@@ -3,6 +3,6 @@
3 3 
 <meta charset="utf-8">
4 4 
 <script th:src="@{/js/commentItem/list.js}"></script>
5 5 
 </head>
6 
-<body th:replace="common/common_list::common_list('评价项目管理',~{},'1')">
6 
+<body th:insert="common/common_list::common_list('评价项目管理',~{},'1')">
7 7 
 </body>
8 8 
 </html>

+ 1
- 1
resources/templates/commentItem/selItemList.html 查看文件 

@@ -3,5 +3,5 @@
3 3 
 <meta charset="utf-8">
4 4 
 <script th:src="@{/js/commentItem/selItemList.js}"></script>
5 5 
 </head>
6 
-<body th:replace="common/common_list::common_list('选择上级项目',~{},'1')">
6 
+<body th:insert="common/common_list::common_list('选择上级项目',~{},'1')">
7 7 
 </body>

+ 1
- 1
resources/templates/commentRecord/list.html 查看文件 

@@ -3,7 +3,7 @@
3 3 
 <meta charset="utf-8">
4 4 
 <script th:src="@{/js/commentRecord/list.js}"></script>
5 5 
 </head>
6 
-<body th:replace="common/common_list::common_list('任务评价',~{::div},'1')">
6 
+<body th:insert="common/common_list::common_list('任务评价',~{::div},'1')">
7 7 
     <div>
8 8 
        <input type="hidden" id="itemCodes" name="itemCodes" th:value="${itemCodes}" />
9 9 
        <input type="hidden" id="taskId" name="taskId" th:value="${taskId}" />

+ 0
- 7
resources/templates/common/common_entity.html 查看文件 

@@ -11,11 +11,4 @@
11 11 
 	<div class="panel">
12 12 
 		<th:block th:replace="${div}" />
13 13 
 	</div>
14 
-	<!-- <div class="content">
15 
-		<h1 class="title" id="title_h1">
16 
-			<span class="pull-right" id="title_span">
17 
-			</span>
18 
-		</h1>
19 
-		<th:block th:replace="${div}" />
20 
-	</div> -->
21 14 
 </body>

+ 67
- 66
resources/templates/common/common_list.html 查看文件 

@@ -1,76 +1,77 @@
1 1 
 <!DOCTYPE html>
2 2 
 <html lang="zh-CN" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
3 
-
4 
-<body th:fragment="common_list(title,div,haveAuth)" class="ext-page">
5 
-	<input id="resCode" type="hidden" th:value="${resCode}" />
6 
-	<th:block th:replace="${div}" />
7 
-	<div class="panel">
8 
-		<div class="panel-body">
9 
-			<h2 class="page-title">[[${title}]]</h2>
10 
-		</div>
11 
-	</div>
12 
-	<div class="panel" style="position: relative; z-index: 20;">
13 
-		<div class="panel-body search-bar">
14 
-			<!--<span id="schSpan"
15 
-				class="input-group"> <span class="input-group-addon">
16 
-					<span class="pull-right" id="schCol_span">
17 
-								</span> </span> <input type="text" name="schVal" id="schVal" value=""
18 
-				class="form-control  "><input type="hidden" id="searchCols" />
19 
-				<span class="input-group-btn"> <a class="btn btn-primary"
20 
-					onclick="queryDatas()" id="ordinary"><i class="icon icon-search"></i>搜索</a>
21 
-			</span>
22 
-			</span>-->
23 
-			<span id="schSpan" class="input-group">
24 
-				<span class="input-group-addon" id="selSapn" style="display:none"></span>
25 
-				<select data-placeholder="请选择查询项..." class="chosen-select form-control" tabindex="2" multiple="" id="schSel"
26 
-					style="display:none">
27 
-
28 
-				</select>
29 
-				<span class="input-group-addon" id="schCol_span"></span>
30 
-				<input type="text" name="schVal" id="schVal" value="" class="form-control ">
31 
-				<input type="hidden" id="searchCols" />
32 
-				<span class="input-group-btn"><a class="input-group-btn btn btn-primary" onclick="queryDatas()"
33 
-						id="ordinary">搜索</a></span>
34 
-			</span>
3 
+<body>
4 
+	<div id="listp" th:fragment="common_list(title,div,haveAuth)" class="ext-page">
5 
+		<input id="resCode" type="hidden" th:value="${resCode}" />
6 
+		<th:block th:replace="${div}" />
7 
+		<div class="panel">
8 
+			<div class="panel-body">
9 
+				<h2 class="page-title">[[${title}]]</h2>
10 
+			</div>
35 11 
 		</div>
36 
-	</div>
37 
-	<div class="panel">
38 
-		<div class="panel-body">
39 
-			<div class="editBar" id="schBar">
40 
-				<span class="btn-group"  id="btnSpan" th:if="${haveAuth != null && haveAuth == '1'}">
41 
-		        <a class="btn btn-primary" onclick="toAdd();" id="addBtn"><i class="icon icon-plus"></i>添加</a>
42 
-						<!-- <a class="btn btn-info" onclick="toUpdate();" id="updateBtn"><i class="icon icon-edit"></i> 编辑</a>
43 
-						<a class="btn btn-danger" onclick="deleteObj();" id="deleteBtn"><i class="icon icon-trash"></i>删除</a> -->
12 
+		<div class="panel" style="position: relative; z-index: 20;">
13 
+			<div class="panel-body search-bar">
14 
+				<!--<span id="schSpan"
15 
+					class="input-group"> <span class="input-group-addon">
16 
+						<span class="pull-right" id="schCol_span">
17 
+									</span> </span> <input type="text" name="schVal" id="schVal" value=""
18 
+					class="form-control  "><input type="hidden" id="searchCols" />
19 
+					<span class="input-group-btn"> <a class="btn btn-primary"
20 
+						onclick="queryDatas()" id="ordinary"><i class="icon icon-search"></i>搜索</a>
21 
+				</span>
22 
+				</span>-->
23 
+				<span id="schSpan" class="input-group">
24 
+					<span class="input-group-addon" id="selSapn" style="display:none"></span>
25 
+					<select data-placeholder="请选择查询项..." class="chosen-select form-control" tabindex="2" multiple="" id="schSel"
26 
+						style="display:none">
27 
+
28 
+					</select>
29 
+					<span class="input-group-addon" id="schCol_span"></span>
30 
+					<input type="text" name="schVal" id="schVal" value="" class="form-control ">
31 
+					<input type="hidden" id="searchCols" />
32 
+					<span class="input-group-btn"><a class="input-group-btn btn btn-primary" onclick="queryDatas()"
33 
+							id="ordinary">搜索</a></span>
44 34 
 				</span>
45 
-
46 
-			</div>
47 
-			<div class="conCoverTable">
48 
-				<input id="datas" type="hidden" value="">
49 
-				<table id="commpersonyTable" class="table datatable">
50 
-					<thead id="tbThead"></thead>
51 
-					<tbody id="tbTbody"></tbody>
52 
-				</table>
53 35 
 			</div>
54 
-
55 
-			<div class="mainPager" id="pageDiv">
56 
-				<div class="pull-right">
57 
-					<ul class="pager">
58 
-						<li id="begLi"><a href="javascript:jumpPage('beg')">首页</a></li>
59 
-						<li id="prevLi"><a href="javascript:jumpPage('prev')">上一页</a></li>
60 
-						<li id="nextLi"><a href="javascript:jumpPage('next')">下一页</a></li>
61 
-						<li id="lastLi"><a href="javascript:jumpPage('last')">末页</a></li>
62 
-					</ul>
63 
-					<span class="form-condensed floatL"> <input id="currentPage" type="hidden" value=""> <input id="totalPage"
64 
-							type="hidden" value=""> <input id="totalNum" type="hidden" value="">
65 
-						转至第<input id="jumppage" class="form-control" size="2" maxlength="5" value="">页
66 
-					</span> <span class="floatL"> <input name="pagesubmit" class="btn btn-sm btn-primary"
67 
-							onclick="return gotoPage()" type="button" value="跳转">
36 
+		</div>
37 
+		<div class="panel">
38 
+			<div class="panel-body">
39 
+				<div class="editBar" id="schBar">
40 
+					<span class="btn-group"  id="btnSpan" th:if="${haveAuth != null && haveAuth == '1'}">
41 
+							<a class="btn btn-primary" onclick="toAdd();" id="addBtn"><i class="icon icon-plus"></i>添加</a>
42 
+							<!-- <a class="btn btn-info" onclick="toUpdate();" id="updateBtn"><i class="icon icon-edit"></i> 编辑</a>
43 
+							<a class="btn btn-danger" onclick="deleteObj();" id="deleteBtn"><i class="icon icon-trash"></i>删除</a> -->
44 
+					</span>
45 
+
46 
+				</div>
47 
+				<div class="conCoverTable">
48 
+					<input id="datas" type="hidden" value="">
49 
+					<table id="commpersonyTable" class="table datatable">
50 
+						<thead id="tbThead"></thead>
51 
+						<tbody id="tbTbody"></tbody>
52 
+					</table>
53 
+				</div>
54 
+
55 
+				<div class="mainPager" id="pageDiv">
56 
+					<div class="pull-right">
57 
+						<ul class="pager">
58 
+							<li id="begLi"><a href="javascript:jumpPage('beg')">首页</a></li>
59 
+							<li id="prevLi"><a href="javascript:jumpPage('prev')">上一页</a></li>
60 
+							<li id="nextLi"><a href="javascript:jumpPage('next')">下一页</a></li>
61 
+							<li id="lastLi"><a href="javascript:jumpPage('last')">末页</a></li>
62 
+						</ul>
63 
+						<span class="form-condensed floatL"> <input id="currentPage" type="hidden" value=""> <input id="totalPage"
64 
+								type="hidden" value=""> <input id="totalNum" type="hidden" value="">
65 
+							转至第<input id="jumppage" class="form-control" size="2" maxlength="5" value="">页
66 
+						</span> <span class="floatL"> <input name="pagesubmit" class="btn btn-sm btn-primary"
67 
+								onclick="return gotoPage()" type="button" value="跳转">
68 
+					</div>
69 
+					</span><span class="pull-left">总共<font class="text-red" id="totalNumFont"></font>条记录&nbsp; 共<font
70 
+							class="text-red" id="totalPageFont"></font>页&nbsp; 当前所在第<font class="text-red" id="currentPageFont"></font>页
71 
+					</span>
68 72 
 				</div>
69 
-				</span><span class="pull-left">总共<font class="text-red" id="totalNumFont"></font>条记录&nbsp; 共<font
70 
-						class="text-red" id="totalPageFont"></font>页&nbsp; 当前所在第<font class="text-red" id="currentPageFont"></font>页
71 
-				</span>
72 73 
 			</div>
74 
+
73 75 
 		</div>
74 
-
75 76 
 	</div>
76 77 
 </body>

+ 1
- 1
resources/templates/dataManager/list.html 查看文件 

@@ -3,6 +3,6 @@
3 3 
 <meta charset="utf-8">
4 4 
 <script th:src="@{/js/dataManager/list.js}"></script>
5 5 
 </head>
6 
-<body th:replace="common/common_list::common_list('资料管理',~{},'')">
6 
+<body th:insert="common/common_list::common_list('资料管理',~{},'')">
7 7 
 </body>
8 8 
 </html>

+ 1
- 1
resources/templates/dict/list.html 查看文件 

@@ -3,6 +3,6 @@
3 3 
 <meta charset="utf-8">
4 4 
 <script th:src="@{/js/equipment/list.js}"></script>
5 5 
 </head>
6 
-<body th:replace="common/common_list::common_list('军供供应设备数据上报',~{})">
6 
+<body th:insert="common/common_list::common_list('军供供应设备数据上报',~{})">
7 7 
 </body>
8 8 
 </html>

+ 1
- 1
resources/templates/equipment/list.html 查看文件 

@@ -9,7 +9,7 @@
9 9 
 <script type="text/javascript" th:src="@{/js/zui/dist/lib/chosen/chosen.min.js}"></script>
10 10 
 <link th:href="@{/js/zui/dist/lib/chosen/chosen.min.css}" rel="stylesheet" type="text/css"/>
11 11 
 </head>
12 
-<body th:replace="common/common_list::common_list('军供供应设备',~{::div},'1')" class="ext-page">
12 
+<body th:insert="common/common_list::common_list('军供供应设备',~{::div},'1')" class="ext-page">
13 13 
     <div id="uploaderExample" class="uploader" style="display:none">
14 14 
 	  <div class="file-list" data-drag-placeholder="请拖拽文件到此处"></div>
15 15 
 	  <button type="button" class="btn btn-primary uploader-btn-browse" id="uploadBtn"><i class="icon icon-cloud-upload"></i>导入</button>

+ 1
- 1
resources/templates/guaranteeOrg/list.html 查看文件 

@@ -5,6 +5,6 @@
5 5 
 <script type="text/javascript" th:src="@{/js/zui/dist/lib/chosen/chosen.min.js}"></script>
6 6 
 <link th:href="@{/js/zui/dist/lib/chosen/chosen.min.css}" rel="stylesheet" type="text/css"/>
7 7 
 </head>
8 
-<body th:replace="common/common_list::common_list('社会保障机构',~{},'1')">
8 
+<body th:insert="common/common_list::common_list('社会保障机构',~{},'1')">
9 9 
 </body>
10 10 
 </html>

+ 1
- 1
resources/templates/guaranteeOrgPerson/list.html 查看文件 

@@ -3,7 +3,7 @@
3 3 
 <meta charset="utf-8">
4 4 
 <script th:src="@{/js/guaranteeOrgPerson/list.js}"></script>
5 5 
 </head>
6 
-<body th:replace="common/common_list::common_list('社会保障机构~人员管理',~{::div},'1')">
6 
+<body th:insert="common/common_list::common_list('社会保障机构~人员管理',~{::div},'1')">
7 7 
 <div>
8 8 
   <input type="hidden" id="org_id" th:value="${org_id}"/>
9 9 
 </div>

+ 1
- 1
resources/templates/guaranteeOrgRecord/list.html 查看文件 

@@ -3,7 +3,7 @@
3 3 
 <meta charset="utf-8">
4 4 
 <script th:src="@{/js/guaranteeOrgRecord/list.js}"></script>
5 5 
 </head>
6 
-<body th:replace="common/common_list::common_list('社会保障机构~审核记录',~{::div},'1')">
6 
+<body th:insert="common/common_list::common_list('社会保障机构~审核记录',~{::div},'1')">
7 7 
 <div>
8 8 
   <input type="hidden" id="org_id" th:value="${org_id}"/>
9 9 
 </div>

+ 1
- 1
resources/templates/guaranteePlan/list.html 查看文件 

@@ -3,6 +3,6 @@
3 3 
 <meta charset="utf-8">
4 4 
 <script th:src="@{/js/guaranteePlan/list.js}"></script>
5 5 
 </head>
6 
-<body th:replace="common/common_list::common_list('军供保障预案',~{},'1')">
6 
+<body th:insert="common/common_list::common_list('军供保障预案',~{},'1')">
7 7 
 </body>
8 8 
 </html>

+ 6
- 1
resources/templates/index.html 查看文件 

@@ -52,7 +52,12 @@
52 52 
 						</th:block>
53 53 
 					</ul>
54 54 
 					<ul id="treeMenu" class="tree tree-menu nav-menu-submenu nav-menu-government" data-ride="tree">
55 
-						<th:block th:each="menu:${user.menus}">
55 
+						<th:block th:each="menu,state:${user.menus}">
56 
+							<li id="tmp111" th:if="${state.index == 0}">
57 
+								<a href="javascript:childMenuHandle('tmp111','api/station/toList?t=1','监控管理','icon-station-o', 'nav-menu-government')">
58 
+									<i class="iconfont icon-film"></i><i class="iconfont icon-film"></i>监控管理
59 
+								</a>
60 
+							</li>
56 61 
 								<li th:id="${menu.oldId}" th:if="${menu.oldId == '100003' || menu.oldId == '100007' || menu.oldId == '100005' || menu.oldId == '100004' || menu.oldId == '100010' || menu.oldId == '100380'}">
57 62 
 										<a th:href="@{'javascript:childMenuHandle(\''+ ${menu.oldId} + '\',\'' + ${menu.nodepath} + '\',\'' + ${menu.nodename} + '\',\'' + ${menu.openimg} + '\', \'nav-menu-government\')'}">
58 63 
 												<i th:class="'iconfont '+${menu.nodeimg}"></i><i th:class="'iconfont '+${menu.openimg}"></i>[[${menu.nodename}]]

+ 1
- 1
resources/templates/installations/list.html 查看文件 

@@ -3,6 +3,6 @@
3 3 
 <meta charset="utf-8">
4 4 
 <script th:src="@{/js/installations/list.js}"></script>
5 5 
 </head>
6 
-<body th:replace="common/common_list::common_list('基础设施',~{},'')">
6 
+<body th:insert="common/common_list::common_list('基础设施',~{},'')">
7 7 
 </body>
8 8 
 </html>

+ 1
- 1
resources/templates/jintro/selJintro.html 查看文件 

@@ -3,7 +3,7 @@
3 3 
 <meta charset="utf-8">
4 4 
 <script th:src="@{/js/jintro/selJintro.js}"></script>
5 5 
 </head>
6 
-<body th:replace="common/common_list::common_list('选择友邻军供站',~{::div},'1')">
6 
+<body th:insert="common/common_list::common_list('选择友邻军供站',~{::div},'1')">
7 7 
    <div>
8 8 
     <input type="hidden" id="divId" th:value = "${divId}" />
9 9 
    </div>

+ 1
- 1
resources/templates/jtaskYear/list.html 查看文件 

@@ -3,6 +3,6 @@
3 3 
 <meta charset="utf-8">
4 4 
 <script th:src="@{/js/jtaskYear/list.js}"></script>
5 5 
 </head>
6 
-<body th:replace="common/common_list::common_list('年度任务汇总',~{},'1')">
6 
+<body th:insert="common/common_list::common_list('年度任务汇总',~{},'1')">
7 7 
 </body>
8 8 
 </html>

+ 16
- 19
resources/templates/main/dashboard.html 查看文件 

@@ -1,19 +1,11 @@
1 1 
 <!DOCTYPE html>
2 2 
 <html lang="zh-CN" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
3 3 
 <div id="t1" th:fragment="main-dashboard" class="dashboard-page" style="display: none;">
4 
-  <script>
5 
-    function onAction(menuId, subMenuName) {
6 
-      // 额外添加, 显示菜单栏
7 
-      parent.onNavMenuClick(menuId);
8 
-      parent.subMenuClick(subMenuName);
9 
-    }
10 
-  </script>
11 
-
12 4 
   <div>
13 5 
     <div class="dash-carousel">
14 6 
       <div class="ratio-static">
15 7
16 
-
8 
+
17 9 
     <div id="myNiceCarousel" class="carousel slide">
18 10 
       <!-- 轮播项目 -->
19 11 
       <div class="carousel-inner">
 
@@ -29,7 +21,7 @@
29 21 
     </div>
30 22 
       </div>
31 23 
     </div>
32 
-
24 
+
33 25 
   </div>
34 26 
   <div class="act-list">
35 27 
     <div class="row">
 
@@ -38,7 +30,7 @@
38 30 
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
39 31 
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
40 32 
         </div>
41 
-
33 
+
42 34 
         <div class="act-body">
43 35 
           <div class="act-icon">
44 36 
             <img th:src="@{/images/dashboard/年度任务汇总.png}" alt="">
 
@@ -56,7 +48,7 @@
56 48 
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
57 49 
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
58 50 
         </div>
59 
-
51 
+
60 52 
         <div class="act-body">
61 53 
           <div class="act-icon">
62 54 
             <img th:src="@{/images/dashboard/军供任务明细.png}" alt="">
 
@@ -74,7 +66,7 @@
74 66 
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
75 67 
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
76 68 
         </div>
77 
-
69 
+
78 70 
         <div class="act-body">
79 71 
           <div class="act-icon">
80 72 
             <img th:src="@{/images/dashboard/军供保障能力.png}" alt="">
 
@@ -92,7 +84,7 @@
92 84 
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
93 85 
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
94 86 
         </div>
95 
-
87 
+
96 88 
         <div class="act-body">
97 89 
           <div class="act-icon">
98 90 
             <img th:src="@{/images/dashboard/社会保障预案.png}" alt="">
 
@@ -112,7 +104,7 @@
112 104 
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
113 105 
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
114 106 
         </div>
115 
-
107 
+
116 108 
         <div class="act-body">
117 109 
           <div class="act-icon">
118 110 
             <img th:src="@{/images/dashboard/社会保障机构.png}" alt="">
 
@@ -130,7 +122,7 @@
130 122 
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
131 123 
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
132 124 
         </div>
133 
-
125 
+
134 126 
         <div class="act-body">
135 127 
           <div class="act-icon">
136 128 
             <img th:src="@{/images/dashboard/军供供应设备.png}" alt="">
 
@@ -148,7 +140,7 @@
148 140 
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
149 141 
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
150 142 
         </div>
151 
-
143 
+
152 144 
         <div class="act-body">
153 145 
           <div class="act-icon">
154 146 
             <img th:src="@{/images/dashboard/军供站简介.png}" alt="">
 
@@ -166,7 +158,7 @@
166 158 
           <img th:src="@{/images/dashboard/menu_bg.png}" alt="">
167 159 
           <img th:src="@{/images/dashboard/menu_bg_active.png}" alt="">
168 160 
         </div>
169 
-
161 
+
170 162 
         <div class="act-body">
171 163 
           <div class="act-icon">
172 164 
             <img th:src="@{/images/dashboard/安防管理.png}" alt="">
 
@@ -181,8 +173,13 @@
181 173 
       </div>
182 174 
     </div>
183 175 
   </div>
184 
-
185 176 
   <script>
177 
+    function onAction(menuId, subMenuName) {
178 
+      // 额外添加, 显示菜单栏
179 
+      parent.onNavMenuClick(menuId);
180 
+      parent.subMenuClick(subMenuName);
181 
+    }
182 
+
186 183 
     function loadPage2() {
187 184 
       var TH_SERVER = 'http://192.168.89.147:8087/api'
188 185

+ 1
- 1
resources/templates/office/list.html 查看文件 

@@ -3,6 +3,6 @@
3 3 
 <meta charset="utf-8">
4 4 
 <script th:src="@{/js/office/list.js}"></script>
5 5 
 </head>
6 
-<body th:replace="common/common_list::common_list('科室管理',~{},'')">
6 
+<body th:insert="common/common_list::common_list('科室管理',~{},'')">
7 7 
 </body>
8 8 
 </html>

+ 1
- 1
resources/templates/operator/list.html 查看文件 

@@ -3,6 +3,6 @@
3 3 
 <meta charset="utf-8">
4 4 
 <script  th:src="@{/js/operator/list.js}"></script>
5 5 
 </head>
6 
-<body th:replace="common/common_list::common_list('用户管理',~{},'1')">
6 
+<body th:insert="common/common_list::common_list('用户管理',~{},'1')">
7 7 
 </body>
8 8 
 </html>

+ 19
- 1
resources/templates/station/list.html 查看文件 

@@ -2,7 +2,25 @@
2 2 
 <head th:replace="common/common_header::common_header(~{},~{},~{},~{::script},'')">
3 3 
 <meta charset="utf-8">
4 4 
 <script th:src="@{/js/station/list.js}"></script>
5 
+<script th:src="@{/js/jsmpeg.min.js}"></script>
5 6 
 </head>
6 
-<body th:replace="common/common_list::common_list('安防管理',~{},'')">
7 
+<body>
8 
+  <div th:replace="common/common_list::common_list('安防管理',~{},'')"></div>
9 
+	<div th:replace="station/monitor::monitor_list"></div>
10 
+  <script>
11 
+    document.querySelector('#listp').style.display="none"
12 
+
13 
+    var paramT = '';
14 
+    var matched = /t=(\d)/.exec(location.search);
15 
+    if (matched) {
16 
+      paramT = matched[1];
17 
+    }
18 
+
19 
+    if (paramT == '1') {
20 
+      document.querySelector('#t2').style.display="block"
21 
+    } else {
22 
+      document.querySelector('#listp').style.display="block"
23 
+    }
24 
+  </script>
7 25 
 </body>
8 26 
 </html>

+ 0
- 0
resources/templates/station/list_normal.html 查看文件


+ 57
- 0
resources/templates/station/monitor.html 查看文件 

@@ -0,0 +1,57 @@
1 
+<!DOCTYPE html>
2 
+<html lang="zh-CN" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
3 
+<body>
4 
+  <div div="t1" th:fragment="monitor_list" class="ext-page monitor-page pannel">
5 
+    <div class="modal fade" id="monitorModal">
6 
+      <div class="modal-dialog">
7 
+        <div class="modal-content">
8 
+          <!-- <canvas id="video-canvas"></canvas> -->
9 
+        </div>
10 
+      </div>
11 
+    </div>
12 
+    <div class="flex-part monitor-list">
13 
+      <div class="flex-part-0 monitor-item">
14 
+        <div class="monitor-play" data-position="100px" data-toggle="modal" data-target="#monitorModal">
15 
+          <i class="icon icon-play-circle"></i>
16 
+        </div>
17 
+        <h2>#1</h2>
18 
+      </div>
19 
+      <div class="flex-part-0 monitor-item">
20 
+        <div class="monitor-play" data-position="100px" data-toggle="modal" data-target="#monitorModal">
21 
+          <i class="icon icon-play-circle"></i>
22 
+        </div>
23 
+        <h2>大门</h2>
24 
+      </div>
25 
+      <div class="flex-part-0 monitor-item">
26 
+        <h2>厨房</h2>
27 
+      </div>
28 
+      <div class="flex-part-0 monitor-item">
29 
+        <h2>大厅</h2>
30 
+      </div>
31 
+      <div class="flex-part-0 monitor-item">
32 
+        <h2>门卫</h2>
33 
+      </div>
34 
+    </div>
35 
+
36 
+    <script>
37 
+      let player = null;
38 
+      function showMonitorModal() {
39 
+        const canvas = document.createElement('canvas');
40 
+        canvas.id = "video-canvas";
41 
+          console.log('--------canvas-------', canvas)
42 
+        document.querySelector("#monitorModal .modal-content").appendChild(canvas);
43 
+        const url = 'ws://192.168.89.147:8888/ws/rtsp://admin:abcd12345678@192.168.89.203';
44 
+        player = new JSMpeg.Player(url, { canvas: canvas });
45 
+      }
46 
+
47 
+      function loadPage2() {
48 
+        $('#monitorModal').on('shown.zui.modal', function() {
49 
+          showMonitorModal()
50 
+        });
51 
+        $('#monitorModal').on('hide.zui.modal', function() {
52 
+          player.destroy();
53 
+        });
54 
+      }
55 
+    </script>
56 
+  </div>
57 
+</body>

+ 1
- 1
resources/templates/task/list.html 查看文件 

@@ -3,6 +3,6 @@
3 3 
 <meta charset="utf-8">
4 4 
 <script th:src="@{/js/task/list.js}"></script>
5 5 
 </head>
6 
-<body th:replace="common/common_list::common_list('军供任务明细',~{},'1')">
6 
+<body th:insert="common/common_list::common_list('军供任务明细',~{},'1')">
7 7 
 </body>
8 8 
 </html>

+ 1
- 1
resources/templates/worker/list.html 查看文件 

@@ -3,6 +3,6 @@
3 3 
 <meta charset="utf-8">
4 4 
 <script th:src="@{/js/worker/list.js}"></script>
5 5 
 </head>
6 
-<body th:replace="common/common_list::common_list('人员管理',~{},'')">
6 
+<body th:insert="common/common_list::common_list('人员管理',~{},'')">
7 7 
 </body>
8 8 
 </html>

+ 1
- 1
resources/templates/worker/officeWorkerList.html 查看文件 

@@ -55,7 +55,7 @@ function confirm(){
55 55 
 }
56 56 
 </script>
57 57 
 </head>
58 
-<body th:replace="common/common_list::common_list('科室工作人员',~{::div},'1')">
58 
+<body th:insert="common/common_list::common_list('科室工作人员',~{::div},'1')">
59 59 
    <div>
60 60 
       <input type="hidden" id="officeId" th:value="${officeId}" />
61 61 
    </div>