H5
/
jgz
關註 2
收藏 0
複製 0
程式碼 問題管理 0 合併請求 0 版本發佈 0 Wiki Activity
瀏覽代碼

feats

张延森 2 年之前
父節點
3a840d93b9
當前提交
ad4f31a372
共有 4 個文件被更改，包括 119 次插入 和 82 次删除
分割檢視 顯示文件統計
  1. 6
    1
      resources/static/css/common.css
  2. 7
    1
      resources/static/less/ext-page.less
  3. 49
    41
      resources/templates/jintro/edit.html
  4. 57
    39
      resources/templates/task/details.html

+ 6
- 1
resources/static/css/common.css 查看文件 

@@ -264,6 +264,7 @@
264 264 
 .ext-page .search-bar .input-group-addon {
265 265 
   background: transparent;
266 266 
   border: none;
267 
+  font-size: 16px;
267 268 
 }
268 269 
 .ext-page .btn-group .btn + .btn {
269 270 
   margin-left: 1em;
 
@@ -271,6 +272,10 @@
271 272 
 .ext-page .wd-m {
272 273 
   width: 1000px;
273 274 
 }
275 
+.ext-page .pd-m {
276 
+  box-sizing: border-box;
277 
+  padding: 30px;
278 
+}
274 279 
 .ext-page .ext-card {
275 280 
   margin: 10px;
276 281 
   margin-bottom: 30px;
 
@@ -304,7 +309,7 @@
304 309 
   height: 36px;
305 310 
 }
306 311 
 .ext-page .ext-card .view-info .info-text {
307 
-  font-size: 20px;
312 
+  font-size: 18px;
308 313 
   color: #121212;
309 314 
   line-height: 36px;
310 315 
   height: 36px;

+ 7
- 1
resources/static/less/ext-page.less 查看文件 

@@ -16,6 +16,7 @@
16 16 
     .input-group-addon {
17 17 
       background: transparent;
18 18 
       border: none;
19 
+      font-size: 16px;
19 20 
     }
20 21 
   }
21 22 
 
@@ -29,6 +30,11 @@
29 30 
     width: 1000px;
30 31 
   }
31 32
33 
+  .pd-m {
34 
+    box-sizing: border-box;
35 
+    padding: 30px;
36 
+  }
37 
+
32 38 
   .ext-card {
33 39 
     margin: 10px;
34 40 
     margin-bottom: 30px;
 
@@ -65,7 +71,7 @@
65 71 
       }
66 72
67 73 
       .info-text {
68 
-        font-size: 20px;
74 
+        font-size: 18px;
69 75 
         color: @ext-txt-color;
70 76 
         line-height: 36px;
71 77 
         height: 36px;

+ 49
- 41
resources/templates/jintro/edit.html 查看文件 

@@ -23,7 +23,7 @@
23 23 
 <body th:replace="common/common_entity::common_entity(~{::div})" class="ext-page">
24 24
25 25 
 	<div class="panel-body">
26 
-		<form id="jintroForm" action="api/jintro/saveData" method="post" class="conForm view-info">
26 
+		<form id="jintroForm" action="api/jintro/saveData" method="post" class="conForm">
27 27 
 			<input type="hidden" name="communityID" th:value="${jintro.id}" />
28 28 
 			<input type="hidden" name="version_no" value="2" />
29 29 
 			<input type="hidden" name="id" th:value="${jintro.id}" />

@@ -36,48 +36,56 @@
36 36 
 					<a class="changeBtn" id="toAfter" disabled><i class="arrow-right"></i></a>
37 37 
 				</span>
38 38 
 			</div>
39 
-
40 
-			<h1 class="title">基本信息</h1>
41 
-			<div class="col-xs-6">
42 
-				<label class="col-sm-4">单位名称：</label>[[${jintro.unitName}]]
43 
-			</div>
44 
-			<div class="col-xs-6">
45 
-				<label class="col-sm-4">建立时间：</label>[[${#dates.format(jintro.cltime, 'yyyy-MM-dd')}]]
46 
-			</div>
47 
-			<div class="col-xs-6">
48 
-				<label class="col-sm-4">组织机构代码：</label>[[${jintro.org_code}]]
49 
-			</div>
50 
-			<div class="col-xs-6">
51 
-				<label class="col-sm-4">省级直管：</label><font th:selOpt="${jintro.ifsjzg}" id="ifsjzg"></font>
52 
-			</div>
53 
-			<div class="col-xs-6">
54 
-				<label class="col-sm-4">国家重点军供站：</label><font th:selOpt="${jintro.ifstressjgz}" id="ifstressjgz"></font>
55 
-			</div>
56 
-			<div class="col-xs-6">
57 
-				<label class="col-sm-4">重点军供站批准时间：</label>[[${#dates.format(jintro.apptime, 'yyyy-MM-dd')}]]
58 
-			</div>
59 
-			<div class="col-xs-6">
60 
-				<label class="col-sm-4">军供站级别：</label><font th:selOpt="${jintro.configGrade}" id="configGrade"></font>
61 
-			</div>
62 
-			<div class="col-xs-6">
63 
-				<label class="col-sm-4">军供站性质：</label><font th:selOpt="${jintro.configjgNature}" id="configjgNature"></font>
64 
-			</div>
65 
-			<div class="col-xs-6">
66 
-				<label class="col-sm-4">军供站所在线路：</label>[[${jintro.szline}]]
67 
-			</div>
68 
-			<div class="col-xs-6">
69 
-				<label class="col-sm-4">是否实行"平战结合"：</label><font th:selOpt="${jintro.ifsxpzjh}" id="ifsxpzjh"></font>
70 
-			</div>
71 
-			<div class="col-xs-6">
72 
-				<label class="col-sm-4">通讯地址：</label>[[${jintro.address}]]
73 
-			</div>
74 
-			<div class="col-xs-6">
75 
-				<label class="col-sm-4">邮政编码：</label>[[${jintro.postCode}]]
76 
-			</div>
77 
-			<div class="col-xs-6">
78 
-				<label class="col-sm-4">值班电话：</label>[[${jintro.duty_phone}]]
39 
+
40 
+			<div class="ext-card">
41 
+				<h1 class="title">基本信息</h1>
42 
+
43 
+				<div class="view-info">
44 
+					<div class="col-xs-6">
45 
+						<label class="col-sm-4 info-title">单位名称：</label>
46 
+						<span class="info-text">[[${jintro.unitName}]]</span>
47 
+					</div>
48 
+					<div class="col-xs-6">
49 
+						<label class="col-sm-4 info-title">建立时间：</label>
50 
+						<span class="info-title">[[${#dates.format(jintro.cltime, 'yyyy-MM-dd')}]]</span>
51 
+					</div>
52 
+					<div class="col-xs-6">
53 
+						<label class="col-sm-4 info-title">组织机构代码：</label>[[${jintro.org_code}]]
54 
+					</div>
55 
+					<div class="col-xs-6">
56 
+						<label class="col-sm-4 info-title">省级直管：</label><font th:selOpt="${jintro.ifsjzg}" id="ifsjzg"></font>
57 
+					</div>
58 
+					<div class="col-xs-6">
59 
+						<label class="col-sm-4 info-title">国家重点军供站：</label><font th:selOpt="${jintro.ifstressjgz}" id="ifstressjgz"></font>
60 
+					</div>
61 
+					<div class="col-xs-6">
62 
+						<label class="col-sm-4 info-title">重点军供站批准时间：</label>[[${#dates.format(jintro.apptime, 'yyyy-MM-dd')}]]
63 
+					</div>
64 
+					<div class="col-xs-6">
65 
+						<label class="col-sm-4 info-title">军供站级别：</label><font th:selOpt="${jintro.configGrade}" id="configGrade"></font>
66 
+					</div>
67 
+					<div class="col-xs-6">
68 
+						<label class="col-sm-4 info-title">军供站性质：</label><font th:selOpt="${jintro.configjgNature}" id="configjgNature"></font>
69 
+					</div>
70 
+					<div class="col-xs-6">
71 
+						<label class="col-sm-4 info-title">军供站所在线路：</label>[[${jintro.szline}]]
72 
+					</div>
73 
+					<div class="col-xs-6">
74 
+						<label class="col-sm-4 info-title">是否实行"平战结合"：</label><font th:selOpt="${jintro.ifsxpzjh}" id="ifsxpzjh"></font>
75 
+					</div>
76 
+					<div class="col-xs-6">
77 
+						<label class="col-sm-4 info-title">通讯地址：</label>[[${jintro.address}]]
78 
+					</div>
79 
+					<div class="col-xs-6">
80 
+						<label class="col-sm-4 info-title">邮政编码：</label>[[${jintro.postCode}]]
81 
+					</div>
82 
+					<div class="col-xs-6">
83 
+						<label class="col-sm-4 info-title">值班电话：</label>[[${jintro.duty_phone}]]
84 
+					</div>
85 
+				</div>
79 86 
 			</div>
80 87
88 
+
81 89 
 			<h1 class="title">建筑信息</h1>
82 90 
 			<div class="col-xs-6">
83 91 
 				<label class="col-sm-4">占地面积(㎡)：</label>[[${jintro.zdArea}]]

+ 57
- 39
resources/templates/task/details.html 查看文件 

@@ -9,46 +9,64 @@
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="taskInfoForm" method="post" 	class="conForm view-info">
12 
+		<form id="taskInfoForm" method="post" 	class="conForm">
13 13 
 		   <input type="hidden" id="oldId" th:value="${taskObj.oldId}"  />
14 
-			<h1 class="title">基本信息</h1>
15 
-			<div class="col-xs-6">
16 
-				<label>任务编号：</label>
17 
-				[[${taskObj.taskNumber}]]
18 
-			</div>
19 
-			<div class="col-xs-6">
20 
-				<label>任务时间：</label>
21 
-				[[${#dates.format(taskObj.dataDate, 'yyyy-MM-dd')}]]
22 
-			</div>
23 
-
24 
-
25 
-			<div class="col-xs-6">
26 
-				<label>供应主体：</label><font th:selOpt="${taskObj.config_supply_main}" id="config_supply_main"></font>
27 
-			</div>
28 
-			<div class="col-xs-6">
29 
-				<label>供应性质：</label><font th:selOpt="${taskObj.config_supply_nature}" id="config_supply_nature"></font>
30 
-			</div>
31 
-
32 
-			<div class="col-xs-6">
33 
-				<label>食材成品是否留样：</label><font th:selOpt="${taskObj.iflyyl}" id="iflyyl"></font>
34 
-			</div>
35 
-			<div class="col-xs-6">
36 
-				<label>食材成品是否检疫：</label><font th:selOpt="${taskObj.ifjyyl}" id="ifjyyl"></font>
37 
-			</div>
38 
-			<div class="col-xs-6">
39 
-				<label>本次任务负责人：</label>
40 
-			    [[${taskObj.superintendent}]]
41 
-			</div>
42 
-			<div class="col-xs-6">
43 
-				<label>留样检疫负责人：</label>
44 
-			    [[${taskObj.jyfzr}]]
45 
-			</div>
46 
-			<div class="col-xs-6">
47 
-				<label>服务项目：</label><font th:selOpt="${taskObj.config_evaluate_item}" id="config_evaluate_item"></font>
48 
-			</div>
49 
-			<h1 class="title">任务评价</h1>
50 
-			<div class="serve" id="commentDiv">
51 
-	        </div>
14 
+			 <div class="ext-card">
15 
+				<h1 class="title">基本信息</h1>
16 
+				<div class="view-info">
17 
+
18 
+					<div class="col-xs-6">
19 
+						<label class="info-title">任务编号：</label>
20 
+						<span class="info-text">[[${taskObj.taskNumber}]]</span>
21 
+					</div>
22 
+					<div class="col-xs-6">
23 
+						<label class="info-title">任务时间：</label>
24 
+						<span class="info-text">[[${#dates.format(taskObj.dataDate, 'yyyy-MM-dd')}]]</span>
25 
+					</div>
26 
+					<div class="col-xs-6">
27 
+						<label class="info-title">供应主体：</label>
28 
+						<span class="info-text">
29 
+							<font th:selOpt="${taskObj.config_supply_main}" id="config_supply_main"></font>
30 
+						</span>
31 
+					</div>
32 
+					<div class="col-xs-6">
33 
+						<label class="info-title">供应性质：</label>
34 
+						<span class="info-text">
35 
+							<font th:selOpt="${taskObj.config_supply_nature}" id="config_supply_nature"></font>
36 
+						</span>
37 
+					</div>
38 
+					<div class="col-xs-6">
39 
+						<label class="info-title">食材成品是否留样：</label>
40 
+						<span class="info-text">
41 
+							<font th:selOpt="${taskObj.iflyyl}" id="iflyyl"></font>
42 
+						</span>
43 
+					</div>
44 
+					<div class="col-xs-6">
45 
+						<label class="info-title">食材成品是否检疫：</label>
46 
+						<span class="info-text">
47 
+							<font th:selOpt="${taskObj.ifjyyl}" id="ifjyyl"></font>
48 
+						</span>
49 
+					</div>
50 
+					<div class="col-xs-6">
51 
+						<label class="info-title">本次任务负责人：</label>
52 
+						<span class="info-text">[[${taskObj.superintendent}]]</span>
53 
+					</div>
54 
+					<div class="col-xs-6">
55 
+						<label class="info-title">留样检疫负责人：</label>
56 
+						<span class="info-text">[[${taskObj.jyfzr}]]</span>
57 
+					</div>
58 
+					<div class="col-xs-6">
59 
+						<label class="info-title">服务项目：</label>
60 
+						<span class="info-text">
61 
+							<font th:selOpt="${taskObj.config_evaluate_item}" id="config_evaluate_item"></font>
62 
+						</span>
63 
+					</div>
64 
+				</div>
65 
+			 </div>
66 
+			 <div class="ext-card">
67 
+				<h1 class="title">任务评价</h1>
68 
+				<div class="pd-m" style="padding-top: 0;"><div class="serve" id="commentDiv"></div></div>
69 
+			 </div>
52 70 
 			<div class="btnEnd">
53 71 
 				<button class="btn btn-primary" type="button" onclick="history.back();">返回</button>
54 72 
 			</div>