张延森 2 年前
父节点
当前提交
82bb1a545d

二进制
db/db.mv.db 查看文件


+ 17
- 0
resources/static/css/common.css 查看文件

@@ -292,6 +292,23 @@
292 292
 .ext-page .ext-card .icon-info-sign {
293 293
   color: rgba(0, 0, 0, 0.2);
294 294
 }
295
+.ext-page .ext-card .view-info {
296
+  margin-top: -1em;
297
+  padding-bottom: 30px;
298
+  overflow: hidden;
299
+}
300
+.ext-page .ext-card .view-info .info-title {
301
+  font-size: 16px;
302
+  color: #999999;
303
+  line-height: 36px;
304
+  height: 36px;
305
+}
306
+.ext-page .ext-card .view-info .info-text {
307
+  font-size: 20px;
308
+  color: #121212;
309
+  line-height: 36px;
310
+  height: 36px;
311
+}
295 312
 .editBar {
296 313
   display: flex;
297 314
   flex-direction: row-reverse;

+ 24
- 2
resources/static/less/ext-page.less 查看文件

@@ -1,8 +1,10 @@
1 1
 
2
+@ext-txt-color: #121212;
3
+
2 4
 .ext-page {
3 5
   .page-title {
4 6
     font-size: 20px;
5
-    color: #121212;
7
+    color: @ext-txt-color;
6 8
     margin: 0;
7 9
   }
8 10
   
@@ -42,13 +44,33 @@
42 44
       line-height: 60px;
43 45
       height: 60px;
44 46
       font-weight: 500;
45
-      color: #121212;
47
+      color: @ext-txt-color;
46 48
       padding: 0 20px;
47 49
     }
48 50
 
49 51
     .icon-info-sign {
50 52
       color: rgba(0,0,0, .2);
51 53
     }
54
+
55
+    .view-info {
56
+      margin-top: -1em;
57
+      padding-bottom: 30px;
58
+      overflow: hidden;
59
+
60
+      .info-title {
61
+        font-size: 16px;
62
+        color: #999999;
63
+        line-height: 36px;
64
+        height: 36px;
65
+      }
66
+
67
+      .info-text {
68
+        font-size: 20px;
69
+        color: @ext-txt-color;
70
+        line-height: 36px;
71
+        height: 36px;
72
+      }
73
+    }
52 74
   }
53 75
 }
54 76
 

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

@@ -36,10 +36,10 @@
36 36
 		<div class="panel-body">
37 37
 			<div class="editBar" id="schBar">
38 38
 				<span class="btn-group"  id="btnSpan" th:if="${haveAuth != null && haveAuth == '1'}">
39
-		                <a class="btn" onclick="toAdd();" id="addBtn"><i class="icon icon-plus"></i>添加</a>
40
-						<!-- <a class="btn" onclick="toUpdate();" id="updateBtn"><i class="icon icon-edit"></i> 编辑</a>
41
-		               	<a class="btn" onclick="deleteObj();" id="deleteBtn"><i class="icon icon-trash"></i>删除</a> -->
42
-		        </span>
39
+		        <a class="btn" onclick="toAdd();" id="addBtn"><i class="icon icon-plus"></i>添加</a>
40
+						<a class="btn" onclick="toUpdate();" id="updateBtn"><i class="icon icon-edit"></i> 编辑</a>
41
+						<a class="btn" onclick="deleteObj();" id="deleteBtn"><i class="icon icon-trash"></i>删除</a>
42
+				</span>
43 43
 				
44 44
 			</div>
45 45
 			<div class="conCoverTable">

+ 43
- 25
resources/templates/jtaskYear/details.html 查看文件

@@ -9,32 +9,50 @@
9 9
 </head>
10 10
 <body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
11 11
 	<div class="panel-body">
12
-		<form id="jtaskYearForm" action="" method="post" class="conForm view-info">		
13
-			<h1 class="title">基本信息</h1>
14
-			<div class="col-xs-12">
15
-				<label>登记年份:</label>[[${jtaskYearObj.taskYear}]]
12
+		<form id="jtaskYearForm" action="" method="post" class="conForm">		
13
+			<div class="ext-card">
14
+				<h1 class="title">基本信息</h1>
15
+				<div class="view-info">
16
+					<div class="col-xs-6">
17
+						<label class="info-title">登记年份:</label>
18
+						<span class="info-text">
19
+							[[${jtaskYearObj.taskYear}]]
20
+						</span>					
21
+					</div>
22
+					<div class="col-xs-6">
23
+						<label class="info-title">全年接待过往部队(批次):</label>
24
+						<span class="info-text">[[${jtaskYearObj.qnjdgwbd}]]</span>
25
+					</div>			
26
+					<div class="col-xs-6">
27
+						<label class="info-title">全年接待过往部队饮食(人次):</label>
28
+						<span class="info-text">[[${jtaskYearObj.qnjdgwbdyshi}]]</span>
29
+					</div>
30
+					<div class="col-xs-6">
31
+						<label class="info-title">全年接待过往部队饮水(人次):</label>
32
+						<span class="info-text">[[${jtaskYearObj.qnjdgwbdyshui}]]</span>
33
+					</div>
34
+					<div class="col-xs-6">
35
+						<label class="info-title">全年接待过往部队住宿(人次):</label>
36
+						<span class="info-text">[[${jtaskYearObj.qnjdgwbdzs}]]</span>
37
+					</div>
38
+					<div class="col-xs-6">
39
+						<label class="info-title">全年接待过往部队物资(元):</label>
40
+						<span class="info-text">[[${#numbers.formatDecimal(jtaskYearObj.qnjdgwbdwz,1,2)}]]</span>
41
+					</div>
42
+				</div>
16 43
 			</div>
17
-			<div class="col-xs-6">
18
-				<label>全年接待过往部队(批次):</label>[[${jtaskYearObj.qnjdgwbd}]]
19
-			</div>			
20
-			<div class="col-xs-6">
21
-				<label>全年接待过往部队饮食(人次):</label>[[${jtaskYearObj.qnjdgwbdyshi}]]
22
-			</div>
23
-			<div class="col-xs-6">
24
-				<label>全年接待过往部队饮水(人次):</label>[[${jtaskYearObj.qnjdgwbdyshui}]]
25
-			</div>
26
-			<div class="col-xs-6">
27
-				<label>全年接待过往部队住宿(人次):</label>[[${jtaskYearObj.qnjdgwbdzs}]]
28
-			</div>
29
-			<div class="col-xs-6">
30
-				<label>全年接待过往部队物资(元):</label>[[${#numbers.formatDecimal(jtaskYearObj.qnjdgwbdwz,1,2)}]]
31
-			</div>
32
-			<h1 class="title">军供演练</h1>
33
-			<div class="col-xs-6">
34
-				<label>组织军供保障演练次数:</label>[[${jtaskYearObj.zzjgbzylcs}]]
35
-			</div>
36
-			<div class="col-xs-6">
37
-				<label>参加实战化军供保障演练次数:</label>[[${jtaskYearObj.cjszhjgbzylcs}]]
44
+			<div class="ext-card">
45
+				<h1 class="title">军供演练</h1>
46
+				<div class="view-info">
47
+					<div class="col-xs-6">
48
+						<label class="info-title">组织军供保障演练次数:</label>
49
+						<span class="info-text">[[${jtaskYearObj.zzjgbzylcs}]]</span>
50
+					</div>
51
+					<div class="col-xs-6">
52
+						<label class="info-title">参加实战化军供保障演练次数:</label>
53
+						<span class="info-text">[[${jtaskYearObj.cjszhjgbzylcs}]]</span>
54
+					</div>
55
+				</div>
38 56
 			</div>				
39 57
 			<div class="btnEnd">
40 58
 				<button class="btn btn-primary" type="button" onclick="history.back();">取消</button>