张延森 2 vuotta sitten
vanhempi
commit
9ff5cbf849

+ 24
- 0
resources/static/css/common.css Näytä tiedosto

@@ -268,6 +268,30 @@
268 268
 .ext-page .btn-group .btn + .btn {
269 269
   margin-left: 1em;
270 270
 }
271
+.ext-page .wd-m {
272
+  width: 1000px;
273
+}
274
+.ext-page .ext-card {
275
+  margin: 10px;
276
+  margin-bottom: 30px;
277
+  box-shadow: 0px 8px 20px 0px rgba(0, 0, 0, 0.08);
278
+  border-radius: 20px;
279
+  overflow: hidden;
280
+}
281
+.ext-page .ext-card h1 {
282
+  margin: 0;
283
+  margin-bottom: 30px;
284
+  background: rgba(66, 118, 245, 0.08);
285
+  font-size: 22px;
286
+  line-height: 60px;
287
+  height: 60px;
288
+  font-weight: 500;
289
+  color: #121212;
290
+  padding: 0 20px;
291
+}
292
+.ext-page .ext-card .icon-info-sign {
293
+  color: rgba(0, 0, 0, 0.2);
294
+}
271 295
 .editBar {
272 296
   display: flex;
273 297
   flex-direction: row-reverse;

+ 2
- 0
resources/static/js/common.js Näytä tiedosto

@@ -2,6 +2,8 @@ var urlPre = "";
2 2
 var myModalTrigger;
3 3
 const uploadFile = "/uploadFile"
4 4
 window.onload = function() {
5
+	$('[data-toggle="tooltip"]').tooltip();
6
+
5 7
 	urlPre = getRootPath();
6 8
 	var pathname = location.pathname;
7 9
 	var urlArray = pathname.split("/");

+ 84
- 72
resources/templates/jtaskYear/add.html Näytä tiedosto

@@ -7,80 +7,92 @@
7 7
 <body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">  	
8 8
 		<div class="panel-body">
9 9
 		<form id="jtaskYearForm"  method="post" class="conForm load-indicator" data-loading="正在处理...">
10
-			<h1 class="title">基本信息</h1>
11
-			<div class="form-group col-xs-12" style="float: none;">
12
-				<label class="required col-sm-4">登记年份:<div class="help"><i class="icon icon-question-sign"></i>
13
-			    <div class="popover">
14
-			      <div class="arrow"></div>
15
-			      <h3 class="popover-title">提示信息</h3>
16
-			      <div class="popover-content">请选择数据时间</div>
17
-			    </div>
18
-			  </div></label>
19
-				<div class="col-lg-6 col-xs-8">
20
-					<select name="taskYear" id="taskYear"  class="form-control required" onchange="changeYear()"
21
-						aria-required="true" aria-invalid="false"></select>
10
+			<div class="ext-card">
11
+				<h1 class="title">基本信息</h1>
12
+				<div class="wd-m">
13
+					<div class="form-group col-xs-12" style="float: none;">
14
+						<label class="required col-sm-4">登记年份:<div class="help" data-toggle="tooltip" data-placement="bottom" title="请选择数据时间">
15
+							<i class="icon icon-info-sign"></i>
16
+							<!-- <div class="popover">
17
+								<div class="arrow"></div>
18
+								<h3 class="popover-title">提示信息</h3>
19
+								<div class="popover-content">请选择数据时间</div>
20
+							</div> -->
21
+						</div></label>
22
+						<div class="col-lg-6 col-xs-8">
23
+							<select name="taskYear" id="taskYear"  class="form-control required" onchange="changeYear()"
24
+								aria-required="true" aria-invalid="false"></select>
25
+						</div>
26
+					</div>
27
+					<div class="form-group col-xs-12">
28
+						<label class="required col-sm-4">全年接待过往部队(批次):<div class="help" data-toggle="tooltip" data-placement="bottom" title="请填写全年接待过往部队,单位:批次">
29
+							<i class="icon icon-info-sign"></i>
30
+							<!-- <div class="popover">
31
+								<div class="arrow"></div>
32
+								<h3 class="popover-title">提示信息</h3>
33
+								<div class="popover-content">请填写全年接待过往部队,单位:批次</div>
34
+							</div> -->
35
+						</div></label>
36
+						<div class="col-lg-6 col-xs-8">
37
+							<input id="qnjdgwbd" name="qnjdgwbd" class="form-control required digits" maxlength="9">
38
+						</div>
39
+					</div>			
40
+					<div class="form-group col-xs-12">
41
+						<label class="required col-sm-4">全年接待过往部队饮食饮水(人次):<div class="help" data-toggle="tooltip" data-placement="bottom" title="请填写全年接待过往部队,单位:批次">
42
+							<i class="icon icon-info-sign"></i>
43
+							<!-- <div class="popover">
44
+								<div class="arrow"></div>
45
+								<h3 class="popover-title">提示信息</h3>
46
+								<div class="popover-content">请填写全年接待过往部队饮食饮水,单位:人次</div>
47
+							</div> -->
48
+						</div></label>
49
+						<div class="col-lg-6 col-xs-8">
50
+							<input id="qnjdgwbdyshi" name="qnjdgwbdyshi" class="form-control required digits" maxlength="9">
51
+						</div>
52
+					</div>
53
+					<div class="form-group col-xs-12">
54
+						<label class="required col-sm-4">全年接待过往部队饮水(人次):<div class="help" data-toggle="tooltip" data-placement="bottom" title="请填写全年接待过往部队饮水,单位:人次">
55
+							<i class="icon icon-info-sign"></i>
56
+							<!-- <div class="popover">
57
+								<div class="arrow"></div>
58
+								<h3 class="popover-title">提示信息</h3>
59
+								<div class="popover-content">请填写全年接待过往部队饮水,单位:人次</div>
60
+							</div> -->
61
+						</div></label>
62
+						<div class="col-lg-6 col-xs-8">
63
+							<input id="qnjdgwbdyshui" name="qnjdgwbdyshui" class="form-control required digits" maxlength="9">
64
+						</div>
65
+					</div>
66
+					<div class="form-group col-xs-12">
67
+						<label class="col-sm-4">全年接待过往部队住宿(人次):</label>
68
+						<div class="col-lg-6 col-xs-8">
69
+							<input id="qnjdgwbdzs" name="qnjdgwbdzs" class="form-control  digits" maxlength="9">
70
+						</div>
71
+					</div>
72
+					<div class="form-group col-xs-12">
73
+						<label class="col-sm-4">全年接待过往部队物资(元):</label>
74
+						<div class="col-lg-6 col-xs-8">
75
+							<input id="qnjdgwbdwz" name="qnjdgwbdwz" class="form-control  number" maxlength="12">
76
+						</div>
77
+					</div>
22 78
 				</div>
23 79
 			</div>
24
-			<div class="form-group col-xs-12">
25
-				<label class="required col-sm-4">全年接待过往部队(批次):<div class="help"><i class="icon icon-question-sign"></i>
26
-			    <div class="popover">
27
-			      <div class="arrow"></div>
28
-			      <h3 class="popover-title">提示信息</h3>
29
-			      <div class="popover-content">请填写全年接待过往部队,单位:批次</div>
30
-			    </div>
31
-			  </div></label>
32
-				<div class="col-lg-6 col-xs-8">
33
-					<input id="qnjdgwbd" name="qnjdgwbd" class="form-control required digits" maxlength="9">
34
-				</div>
35
-			</div>			
36
-			<div class="form-group col-xs-12">
37
-				<label class="required col-sm-4">全年接待过往部队饮食饮水(人次):<div class="help"><i class="icon icon-question-sign"></i>
38
-			    <div class="popover">
39
-			      <div class="arrow"></div>
40
-			      <h3 class="popover-title">提示信息</h3>
41
-			      <div class="popover-content">请填写全年接待过往部队饮食饮水,单位:人次</div>
42
-			    </div>
43
-			  </div></label>
44
-				<div class="col-lg-6 col-xs-8">
45
-					<input id="qnjdgwbdyshi" name="qnjdgwbdyshi" class="form-control required digits" maxlength="9">
46
-				</div>
47
-			</div>
48
-			<div class="form-group col-xs-12">
49
-				<label class="required col-sm-4">全年接待过往部队饮水(人次):<div class="help"><i class="icon icon-question-sign"></i>
50
-			    <div class="popover">
51
-			      <div class="arrow"></div>
52
-			      <h3 class="popover-title">提示信息</h3>
53
-			      <div class="popover-content">请填写全年接待过往部队饮水,单位:人次</div>
54
-			    </div>
55
-			  </div></label>
56
-				<div class="col-lg-6 col-xs-8">
57
-					<input id="qnjdgwbdyshui" name="qnjdgwbdyshui" class="form-control required digits" maxlength="9">
58
-				</div>
59
-			</div>
60
-			<div class="form-group col-xs-12">
61
-				<label class="col-sm-4">全年接待过往部队住宿(人次):</label>
62
-				<div class="col-lg-6 col-xs-8">
63
-					<input id="qnjdgwbdzs" name="qnjdgwbdzs" class="form-control  digits" maxlength="9">
64
-				</div>
65
-			</div>
66
-			<div class="form-group col-xs-12">
67
-				<label class="col-sm-4">全年接待过往部队物资(元):</label>
68
-				<div class="col-lg-6 col-xs-8">
69
-					<input id="qnjdgwbdwz" name="qnjdgwbdwz" class="form-control  number" maxlength="12">
70
-				</div>
71
-			</div>
72
-			<h1 class="title">军供演练</h1>
73
-			<div class="form-group col-xs-12">
74
-				<label class="col-sm-4">组织军供保障演练次数:</label>
75
-				<div class="col-lg-6 col-xs-8">
76
-					<input id="zzjgbzylcs" name="zzjgbzylcs" class="form-control  digits" maxlength="9">
77
-				</div>
78
-			</div>
79
-			
80
-			<div class="form-group col-xs-12">
81
-				<label class="col-sm-4">参加实战化军供保障演练次数:</label>
82
-				<div class="col-lg-6 col-xs-8">
83
-					<input id="cjszhjgbzylcs" name="cjszhjgbzylcs" class="form-control  digits" maxlength="9">
80
+			<div class="ext-card">
81
+				<h1 class="title">军供演练</h1>
82
+				<div class="wd-m">
83
+					<div class="form-group col-xs-12">
84
+						<label class="col-sm-4">组织军供保障演练次数:</label>
85
+						<div class="col-lg-6 col-xs-8">
86
+							<input id="zzjgbzylcs" name="zzjgbzylcs" class="form-control  digits" maxlength="9">
87
+						</div>
88
+					</div>
89
+					
90
+					<div class="form-group col-xs-12">
91
+						<label class="col-sm-4">参加实战化军供保障演练次数:</label>
92
+						<div class="col-lg-6 col-xs-8">
93
+							<input id="cjszhjgbzylcs" name="cjszhjgbzylcs" class="form-control  digits" maxlength="9">
94
+						</div>
95
+					</div>
84 96
 				</div>
85 97
 			</div>
86 98
 			<div class="btnEnd">

+ 1
- 1
resources/templates/jtaskYear/update.html Näytä tiedosto

@@ -16,7 +16,7 @@
16 16
 		<input type="hidden" id="oldId" name="oldId" th:value="${jtaskYearObj.oldId}" />
17 17
 			<h1 class="title">基本信息</h1>
18 18
 			<div class="form-group col-xs-12" style="float: none;">
19
-				<label class="required col-sm-4">登记年份:<div class="help"><i class="icon icon-question-sign"></i>
19
+				<label class="required col-sm-4">登记年份:<div class="help"><i class="icon icon-info-sign"></i>
20 20
 			    <div class="popover">
21 21
 			      <div class="arrow"></div>
22 22
 			      <h3 class="popover-title">提示信息</h3>