张延森 před 2 roky
rodič
revize
a9e1c46554

+ 6
- 6
file.properties Zobrazit soubor

@@ -1,11 +1,11 @@
1 1
 #update properties
2
-#Mon Aug 08 10:38:56 CST 2022
2
+#Thu Aug 18 09:51:41 CST 2022
3 3
 table_jtask=OLD_ID,tasknumber,state,remark,data_write_time,operatorID,communityID,superintendent,config_supply_main,config_supply_nature,iflyyl,ifjyyl,data_date,jyfzr,config_evaluate_item
4 4
 table_equipment=OLD_ID,eptitle,epcount,epspec,bzability,epmodel,epvalue,state,data_write_time,operatorID,communityID,buydate,config_dev_type
5 5
 import_type=outside
6 6
 table_office_type=varchar,varchar,int,varchar,varchar,varchar,varchar,char,timestamp,varchar,varchar
7
-table_file_modify=OLD_ID,table_name,file_id,file_path,modify_time,communityID,system_type,is_done,state
8 7
 table_office=OLD_ID,depname,deppeo,depfzr,tel,depduty,remark,state,data_write_time,operatorID,communityID
8
+table_file_modify=OLD_ID,table_name,file_id,file_path,modify_time,communityID,system_type,is_done,state
9 9
 json.file.name=json
10 10
 cerPwd=zzcy47365
11 11
 table_jintro_trip_type=varchar,char,double,varchar,char,timestamp,varchar,varchar,varchar,varchar
@@ -36,12 +36,12 @@ table_comment_record_type=varchar,char,timestamp,varchar,varchar,int,varchar,var
36 36
 table_jintro=OLD_ID,unitname,address,postcode,frdb,zbstaff,toiletarea,buildingarea,config_jgnature,szline,cltime,config_jintro_grade,zdarea,totalassets,employedry,restaurantarea,introtxt,config_jintro_formation_prop,ifstressjgz,apptime,state,data_write_time,operatorID,communityID,ondutyry,ifsjzg,facilitiesarea,operating_room_area,entertainment_room_area,lounge_area,config_superior_dept,config_level,org_code,ifwmsydw,config_advanced_unit_level,superior_financial_allocation,year_financial_allocation,annual_income_generation,liabilities,current_year_liabilities,duty_phone,hdstaff,leader_staff,administration_staff,bachelor_degree_or_above,college__degree,high_school_and_below,age1,age2,age3,age4,secretary,secretary_phone,stationmaster,stationmaster_phone,data_date,fill_in_date,ifsxpzjh,bathroomarea,massarea,washroomarea,cxxjc,zgzyjsrs
37 37
 upload.file={"upload"\:"inside","import"\:"uploaded","export"\:"tmp"}
38 38
 table_datafile_type=varchar,char,timestamp,varchar,varchar,varchar,varchar,varchar,varchar,varchar,varchar
39
-table_datafile=OLD_ID,state,data_write_time,operatorID,communityID,file_type,data_type,file_name,file_path,file_size,data_id
40
-table_guarantee_org_person=OLD_ID,org_id,uname,config_gender,config_nation,idnumber,config_polity,family_addr,mobile,ifyjkz,state,data_write_time,operatorID,communityID
41 39
 table_jintro_img_type=varchar,varchar,varchar,longtext,datetime,varchar,varchar,varchar,char
40
+table_guarantee_org_person=OLD_ID,org_id,uname,config_gender,config_nation,idnumber,config_polity,family_addr,mobile,ifyjkz,state,data_write_time,operatorID,communityID
41
+table_datafile=OLD_ID,state,data_write_time,operatorID,communityID,file_type,data_type,file_name,file_path,file_size,data_id
42 42
 table_datamanage_type=varchar,varchar,char,varchar,char,varchar,char,timestamp,varchar,varchar
43
-export.date=
43
+export.date=20220818000001
44 44
 table_jintro_trip=OLD_ID,config_traffic_way,driving_distance,travel_time,state,data_write_time,operatorID,communityID,jintroID,traffic_name
45
-export.data.file={"guarantee_plan_file"\:{"columns"\:"file_path","uploadFile"\:"inside"},"datafile"\:{"columns"\:"file_path","uploadFile"\:"inside"}}
46 45
 table_station=OLD_ID,ifjsznjk,ifjscfjk,ifzcjk,ifjsdmmjaf,config_door_type,ifzcdmmj,ifjscfmjaf,config_kitchen_door_type,ifzccfmj,exceptionExplan,state,data_write_time,operatorID,communityID,full_date,cfjkcdsj,ifzcjkcf,jkcdsj
46
+export.data.file={"guarantee_plan_file"\:{"columns"\:"file_path","uploadFile"\:"inside"},"datafile"\:{"columns"\:"file_path","uploadFile"\:"inside"}}
47 47
 table_jintro_type=varchar,varchar,varchar,varchar,varchar,varchar,double,double,char,varchar,date,char,double,double,varchar,double,varchar,char,char,date,char,timestamp,varchar,varchar,int,char,double,double,double,double,char,char,varchar,char,char,double,double,double,double,double,varchar,int,int,int,int,int,int,int,int,int,int,varchar,varchar,varchar,varchar,varchar,date,char,double,double,double,varchar,int

+ 50
- 46
resources/static/css/common.css Zobrazit soubor

@@ -1,6 +1,6 @@
1 1
 :root {
2
-  --main-bg: #0D267C;
3
-  --primary-bg: #4276F5;
2
+  --main-bg: #0d267c;
3
+  --primary-bg: #4276f5;
4 4
 }
5 5
 .panel {
6 6
   border-radius: 12px;
@@ -51,14 +51,14 @@
51 51
 }
52 52
 .nav-menu .nav-menu-item.active div {
53 53
   position: relative;
54
-  border-bottom: 4px solid #3CBAF5;
54
+  border-bottom: 4px solid #3cbaf5;
55 55
 }
56 56
 .nav-menu .nav-menu-item.active div::after {
57
-  content: "";
57
+  content: '';
58 58
   width: 0;
59 59
   height: 0;
60 60
   border: 8px solid transparent;
61
-  border-bottom-color: #3CBAF5;
61
+  border-bottom-color: #3cbaf5;
62 62
   position: absolute;
63 63
   left: calc(50% - 8px);
64 64
   bottom: 0;
@@ -92,7 +92,7 @@
92 92
   width: 100%;
93 93
   height: 100%;
94 94
   overflow-y: auto;
95
-  background: #071C51;
95
+  background: #071c51;
96 96
 }
97 97
 .chart-page .count {
98 98
   border-radius: 20px;
@@ -117,9 +117,9 @@
117 117
 }
118 118
 .chart-page .count dl::before,
119 119
 .chart-page .count dl::after {
120
-  content: "";
120
+  content: '';
121 121
   position: absolute;
122
-  background: #FFFFFF;
122
+  background: #ffffff;
123 123
   opacity: 0.1;
124 124
   border-radius: 50%;
125 125
   font-size: 0;
@@ -138,16 +138,16 @@
138 138
   top: 81px;
139 139
 }
140 140
 .chart-page .count dl:nth-child(1) {
141
-  background: linear-gradient(90deg, #3886D6, #003789);
141
+  background: linear-gradient(90deg, #3886d6, #003789);
142 142
 }
143 143
 .chart-page .count dl:nth-child(2) {
144
-  background: linear-gradient(90deg, #29A0B1, #3C1A63);
144
+  background: linear-gradient(90deg, #29a0b1, #3c1a63);
145 145
 }
146 146
 .chart-page .count dl:nth-child(3) {
147
-  background: linear-gradient(90deg, #1570AB, #343894);
147
+  background: linear-gradient(90deg, #1570ab, #343894);
148 148
 }
149 149
 .chart-page .count dl:nth-child(4) {
150
-  background: linear-gradient(90deg, #2788B6, #083A8C);
150
+  background: linear-gradient(90deg, #2788b6, #083a8c);
151 151
 }
152 152
 .chart-card {
153 153
   position: relative;
@@ -175,7 +175,7 @@
175 175
 .chart-card.panel .panel-heading .selectGroup select {
176 176
   background: transparent;
177 177
   border: 0;
178
-  color: #FFFFFF;
178
+  color: #ffffff;
179 179
 }
180 180
 .chart-card.panel .panel-heading img {
181 181
   width: 28px;
@@ -188,14 +188,14 @@
188 188
   font-size: 22px;
189 189
   font-weight: 500;
190 190
   color: transparent;
191
-  background-image: linear-gradient(0deg, #6F39B9 0%, #1EAED1 100%);
191
+  background-image: linear-gradient(0deg, #6f39b9 0%, #1eaed1 100%);
192 192
   vertical-align: middle;
193 193
   background-clip: text;
194 194
   -webkit-background-clip: text;
195 195
 }
196 196
 .chart-card.panel .panel-body {
197 197
   padding: 0;
198
-  background: #071C51;
198
+  background: #071c51;
199 199
 }
200 200
 .chart-card.panel .panel-body .info-list li {
201 201
   color: rgba(255, 255, 255, 0.6);
@@ -238,10 +238,16 @@
238 238
   top: -450%;
239 239
   width: 1000%;
240 240
   height: 1000%;
241
-  background-color: #1E5983;
241
+  background-color: #1e5983;
242 242
   background-repeat: no-repeat;
243 243
   background-position: 0 0, 100% 100%;
244
-  background-image: conic-gradient(from 0, transparent, #a8efff, transparent 20%), conic-gradient(from 180deg, transparent, #a8efff, transparent 20%);
244
+  background-image: conic-gradient(
245
+      from 0,
246
+      transparent,
247
+      #a8efff,
248
+      transparent 20%
249
+    ),
250
+    conic-gradient(from 180deg, transparent, #a8efff, transparent 20%);
245 251
   animation: chart-card-rotate 10s linear infinite;
246 252
 }
247 253
 .chart-card::after {
@@ -252,9 +258,10 @@
252 258
   top: 2px;
253 259
   width: calc(100% - 4px);
254 260
   height: calc(100% - 4px);
255
-  background: #071C51;
261
+  background: #071c51;
256 262
   border-radius: 18px;
257
-  box-shadow: 2px 2px 10px rgba(255, 255, 255, 0.2) inset, -2px -2px 10px rgba(255, 255, 255, 0.2) inset;
263
+  box-shadow: 2px 2px 10px rgba(255, 255, 255, 0.2) inset,
264
+    -2px -2px 10px rgba(255, 255, 255, 0.2) inset;
258 265
 }
259 266
 .ext-page .page-title {
260 267
   font-size: 20px;
@@ -317,14 +324,6 @@
317 324
   line-height: 36px;
318 325
   height: 36px;
319 326
 }
320
-.ext-page .chosen-container.form-control {
321
-  padding: 0;
322
-}
323
-.ext-page .chosen-container.form-control.chosen-container-active .chosen-choices,
324
-.ext-page .chosen-container.form-control.chosen-container-multi .chosen-choices {
325
-  border: none;
326
-  box-shadow: none;
327
-}
328 327
 .editBar {
329 328
   display: flex;
330 329
   flex-direction: row-reverse;
@@ -343,7 +342,7 @@
343 342
 }
344 343
 .dashboard-page {
345 344
   height: 100%;
346
-  background-color: #081A48;
345
+  background-color: #081a48;
347 346
 }
348 347
 .dashboard-page > div {
349 348
   height: 50%;
@@ -380,16 +379,16 @@
380 379
 .dashboard-page .act-list .row + .row {
381 380
   margin-top: 64px;
382 381
 }
383
-.dashboard-page .act-list div[class^="col"] {
382
+.dashboard-page .act-list div[class^='col'] {
384 383
   min-width: 280px;
385 384
   width: calc(25% - 48px);
386 385
   height: 100%;
387 386
   position: relative;
388 387
 }
389
-.dashboard-page .act-list div[class^="col"] + div {
388
+.dashboard-page .act-list div[class^='col'] + div {
390 389
   margin-left: 64px;
391 390
 }
392
-.dashboard-page .act-list div[class^="col"] .act-body {
391
+.dashboard-page .act-list div[class^='col'] .act-body {
393 392
   z-index: 1;
394 393
   width: 100%;
395 394
   height: 100%;
@@ -398,14 +397,14 @@
398 397
   justify-content: center;
399 398
   align-items: center;
400 399
 }
401
-.dashboard-page .act-list div[class^="col"] .act-body .act-icon {
400
+.dashboard-page .act-list div[class^='col'] .act-body .act-icon {
402 401
   position: relative;
403 402
   width: 64px;
404 403
   height: 64px;
405 404
   min-height: 64px;
406 405
   flex: 0;
407 406
 }
408
-.dashboard-page .act-list div[class^="col"] .act-body .act-icon img {
407
+.dashboard-page .act-list div[class^='col'] .act-body .act-icon img {
409 408
   position: absolute;
410 409
   left: calc(50% - 32px);
411 410
   top: 0;
@@ -414,25 +413,30 @@
414 413
   height: 100%;
415 414
   object-fit: contain;
416 415
 }
417
-.dashboard-page .act-list div[class^="col"] .act-body .act-icon img:nth-child(2) {
416
+.dashboard-page
417
+  .act-list
418
+  div[class^='col']
419
+  .act-body
420
+  .act-icon
421
+  img:nth-child(2) {
418 422
   display: none;
419 423
 }
420
-.dashboard-page .act-list div[class^="col"] .act-body .act-content {
424
+.dashboard-page .act-list div[class^='col'] .act-body .act-content {
421 425
   flex: 0;
422 426
   text-align: center;
423 427
 }
424
-.dashboard-page .act-list div[class^="col"] .act-body .act-content span {
428
+.dashboard-page .act-list div[class^='col'] .act-body .act-content span {
425 429
   display: inline-block;
426 430
   padding: 0 1em;
427 431
   font-size: 24px;
428 432
   font-weight: 500;
429 433
   color: transparent;
430
-  background: linear-gradient(0deg, #2362E4 0%, #00D5FB 100%);
434
+  background: linear-gradient(0deg, #2362e4 0%, #00d5fb 100%);
431 435
   vertical-align: middle;
432 436
   background-clip: text;
433 437
   -webkit-background-clip: text;
434 438
 }
435
-.dashboard-page .act-list div[class^="col"] .act-bg {
439
+.dashboard-page .act-list div[class^='col'] .act-bg {
436 440
   position: absolute;
437 441
   width: 100%;
438 442
   height: 100%;
@@ -440,27 +444,27 @@
440 444
   left: 0;
441 445
   top: 0;
442 446
 }
443
-.dashboard-page .act-list div[class^="col"] .act-bg img {
447
+.dashboard-page .act-list div[class^='col'] .act-bg img {
444 448
   display: block;
445 449
   width: 100%;
446 450
   height: 100%;
447 451
   object-fit: contain;
448 452
 }
449
-.dashboard-page .act-list div[class^="col"] .act-bg img:nth-child(2) {
453
+.dashboard-page .act-list div[class^='col'] .act-bg img:nth-child(2) {
450 454
   display: none;
451 455
 }
452
-.dashboard-page .act-list div[class^="col"]:hover {
456
+.dashboard-page .act-list div[class^='col']:hover {
453 457
   cursor: pointer;
454 458
 }
455
-.dashboard-page .act-list div[class^="col"]:hover .act-bg img:nth-child(1),
456
-.dashboard-page .act-list div[class^="col"]:hover .act-icon img:nth-child(1) {
459
+.dashboard-page .act-list div[class^='col']:hover .act-bg img:nth-child(1),
460
+.dashboard-page .act-list div[class^='col']:hover .act-icon img:nth-child(1) {
457 461
   display: none;
458 462
 }
459
-.dashboard-page .act-list div[class^="col"]:hover .act-bg img:nth-child(2),
460
-.dashboard-page .act-list div[class^="col"]:hover .act-icon img:nth-child(2) {
463
+.dashboard-page .act-list div[class^='col']:hover .act-bg img:nth-child(2),
464
+.dashboard-page .act-list div[class^='col']:hover .act-icon img:nth-child(2) {
461 465
   display: block;
462 466
 }
463
-.dashboard-page .act-list div[class^="col"]:hover .act-content span {
467
+.dashboard-page .act-list div[class^='col']:hover .act-content span {
464 468
   color: #fff;
465 469
   background: none;
466 470
 }

+ 325
- 296
resources/templates/data/exportData.html Zobrazit soubor

@@ -1,323 +1,352 @@
1 1
 <html lang="zh-CN">
2
-<head
3
-	th:replace="common/common_header::common_header(~{},~{::link},~{::style},~{::script},'')">
4
-<meta charset="utf-8" />
5
-<head>
6
-<script type="text/javascript" th:src="@{/js/jquery.smartWizard-2.0.min.js}"></script>
7
-<link th:href="@{/style/smartwizard/smart_wizard.css}" rel="stylesheet" type="text/css"/>
8
-<link th:href="@{/js/bootstrap/css/bootstrap.min.css}" rel="stylesheet" type="text/css"/>
9
-<script type="text/javascript" th:src="@{/js/treeview/js/bootstrap-treeview.js}"></script>
10
-<script type="text/javascript">
11
-	$(document).ready(function() {
12
-		// Smart Wizard 	
13
-		$('#wizard').smartWizard({
14
-			labelNext : '下一步',
15
-			labelPrevious : '上一步',
16
-			labelFinish : '导出',
17
-			onLeaveStep:leaveAStepCallback,
18
-			onFinish:onFinishCallback ,
19
-			enableFinishButton:false
20
-		});
21 2
 
22
-		function leaveAStepCallback(obj){
23
-	        var step_num= obj.attr('rel');
24
-	        return validateSteps(step_num);
25
-	     }
26
-		
27
-		function onFinishCallback() {
28
-			if (validateAllSteps()){
29
-				$('.actionBar a.buttonFinish').addClass("buttonDisabled");
30
-				form_submit();
31
-		    }
32
-		}
33
-		//导出数据 
34
-		function form_submit(){
35
-			
36
-			var formdata = $("#mForm").serializeArray();
37
-			var json = {};
38
-			$(formdata).each(function(index, obj) {
39
-				if(obj.name == "modes"){
40
-					let modes = $("#modes").val();
41
-					modes = modes.substring(1);
42
-					json[obj.name] = modes;
43
-				}else{
44
-					json[obj.name] = obj.value;
3
+<head th:replace="common/common_header::common_header(~{},~{::link},~{::style},~{::script},'')">
4
+	<meta charset="utf-8" />
5
+
6
+	<head>
7
+		<script type="text/javascript" th:src="@{/js/jquery.smartWizard-2.0.min.js}"></script>
8
+		<link th:href="@{/style/smartwizard/smart_wizard.css}" rel="stylesheet" type="text/css" />
9
+		<link th:href="@{/js/bootstrap/css/bootstrap.min.css}" rel="stylesheet" type="text/css" />
10
+		<script type="text/javascript" th:src="@{/js/treeview/js/bootstrap-treeview.js}"></script>
11
+		<script type="text/javascript">
12
+			$(document).ready(function () {
13
+				// Smart Wizard
14
+				$('#wizard').smartWizard({
15
+					transitionEffect: 'slideleft',
16
+					theme: 'dots',
17
+					labelNext: '下一步',
18
+					labelPrevious: '上一步',
19
+					labelFinish: '导出',
20
+					onLeaveStep: leaveAStepCallback,
21
+					onFinish: onFinishCallback,
22
+					enableFinishButton: false
23
+				});
24
+
25
+				function leaveAStepCallback (obj) {
26
+					var step_num = obj.attr('rel');
27
+					return validateSteps(step_num);
45 28
 				}
46
-			});
47
-			$.ajax({
48
-				url:ctxPath + 'api/exportData/downLoad',
49
-				type:'post',
50
-				beforeSend: function () {
51
-					$("#step").hide();
52
-					$(".buttonPrevious").addClass("buttonDisabled");
53
-				},
54
-				complete: function () {
55
-					$("#step").show();
56
-				},
57
-				data:{params:JSON.stringify(json)},
58
-				dataType:'json',
59
-				success:function(result){
60
-					var json = result
61
-					if(json.msg){
62
-						$("#step").html("正在进行数据库导出。。。");
63
-						let time = 300
64
-						setTimeout(function(){
65
-							changeMsg('正在进行图片、文档等资料导出。。。')
66
-						},time);
67
-						time += 300
68
-						setTimeout(function(){
69
-							changeMsg('正在进行数据压缩。。。')						
70
-						},time);
71
-						time += 1500
72
-						setTimeout(function(){
73
-							changeMsg('正在加载数字证书。。。')
74
-						},time);
75
-						time += 100
76
-						setTimeout(function(){
77
-							changeMsg('正在进行数据加密。。。')							
78
-						},time);
79
-						time += 1300
80
-						setTimeout(function(){
81
-							ajaxPostLoadFile(json.zippath);						
82
-							top.bootbox.alert('数据导出成功,正在下载!', function(result){							
29
+
30
+				function onFinishCallback () {
31
+					if (validateAllSteps()) {
32
+						$('.actionBar a.buttonFinish').addClass("buttonDisabled");
33
+						form_submit();
34
+					}
35
+				}
36
+				//导出数据
37
+				function form_submit () {
38
+
39
+					var formdata = $("#mForm").serializeArray();
40
+					var json = {};
41
+					$(formdata).each(function (index, obj) {
42
+						if (obj.name == "modes") {
43
+							let modes = $("#modes").val();
44
+							modes = modes.substring(1);
45
+							json[obj.name] = modes;
46
+						} else {
47
+							json[obj.name] = obj.value;
48
+						}
49
+					});
50
+					$.ajax({
51
+						url: ctxPath + 'api/exportData/downLoad',
52
+						type: 'post',
53
+						beforeSend: function () {
54
+							$("#step").hide();
55
+							$(".buttonPrevious").addClass("buttonDisabled");
56
+						},
57
+						complete: function () {
58
+							$("#step").show();
59
+						},
60
+						data: { params: JSON.stringify(json) },
61
+						dataType: 'json',
62
+						success: function (result) {
63
+							var json = result
64
+							if (json.msg) {
65
+								$("#step").html("正在进行数据库导出。。。");
66
+								let time = 300
67
+								setTimeout(function () {
68
+									changeMsg('正在进行图片、文档等资料导出。。。')
69
+								}, time);
70
+								time += 300
71
+								setTimeout(function () {
72
+									changeMsg('正在进行数据压缩。。。')
73
+								}, time);
74
+								time += 1500
75
+								setTimeout(function () {
76
+									changeMsg('正在加载数字证书。。。')
77
+								}, time);
78
+								time += 100
79
+								setTimeout(function () {
80
+									changeMsg('正在进行数据加密。。。')
81
+								}, time);
82
+								time += 1300
83
+								setTimeout(function () {
84
+									ajaxPostLoadFile(json.zippath);
85
+									top.bootbox.alert('数据导出成功,正在下载!', function (result) {
86
+										top.toMain();
87
+									});
88
+								}, time);
89
+
90
+							} else {
91
+								top.bootbox.alert("导出文件出错,请联系管理员!", function () {
92
+									top.toMain();
93
+								});
94
+							}
95
+						},
96
+						error: function (XMLHttpRequest, textStatus, errorThrown) {
97
+							top.bootbox.alert("导出文件出错,请联系管理员!", function () {
83 98
 								top.toMain();
84 99
 							});
85
-						},time);
86
-						
87
-					}else{
88
-						top.bootbox.alert("导出文件出错,请联系管理员!",function(){
89
-							top.toMain();
90
-						});
91
-					}  
92
-				},
93
-				error: function(XMLHttpRequest, textStatus, errorThrown) {
94
-					top.bootbox.alert("导出文件出错,请联系管理员!",function(){
95
-						top.toMain();
96
-					});
100
+						}
101
+					})
97 102
 				}
98
-			})	
99
-		}
100
-		
101
-		function validateAllSteps() {
102
-			var isStepValid = true;
103
-			if ($('#regionid').val() == "" || $('#modes').val() == "") {
104
-				isStepValid = false;
105
-				$('#wizard').smartWizard('setError', {
106
-					stepnum : 1,
107
-					iserror : true
108
-				});
109
-			} else {
110
-				$('#wizard').smartWizard('setError', {
111
-					stepnum : 1,
112
-					iserror : false
113
-				});
114
-			}
115
-			if (!isStepValid) {
116
-				//$('#wizard').smartWizard('showMessage', '请您先行执行第一步、第二步。');
117
-				$('#wizard').smartWizard('showMessage', '请您先行执行第一步。');
118 103
 
119
-			}
104
+				function validateAllSteps () {
105
+					var isStepValid = true;
106
+					if ($('#regionid').val() == "" || $('#modes').val() == "") {
107
+						isStepValid = false;
108
+						$('#wizard').smartWizard('setError', {
109
+							stepnum: 1,
110
+							iserror: true
111
+						});
112
+					} else {
113
+						$('#wizard').smartWizard('setError', {
114
+							stepnum: 1,
115
+							iserror: false
116
+						});
117
+					}
118
+					if (!isStepValid) {
119
+						//$('#wizard').smartWizard('showMessage', '请您先行执行第一步、第二步。');
120
+						$('#wizard').smartWizard('showMessage', '请您先行执行第一步。');
120 121
 
121
-			return isStepValid;
122
-		}
122
+					}
123 123
 
124
-		function validateSteps(step) {
125
-			var isStepValid = true;
126
-			// validate step 1
127
-			if (step == 1) {
128
-			/* 	if ($('#regionid').val() == "") {
129
-					isStepValid = false;
130
-					$('#wizard').smartWizard('showMessage', '请您选择要进行数据导出的区域。');
131
-					$('#wizard').smartWizard('setError', {
132
-						stepnum : step,
133
-						iserror : true
134
-					});
135
-				} else {
136
-					isStepValid = true;
137
-					$(".msgBox").hide();
138
-					$('#wizard').smartWizard('setError', {
139
-						stepnum : step,
140
-						iserror : false
141
-					});
124
+					return isStepValid;
142 125
 				}
143
-			} else if (step == 2) { */
144
-				//setFormModeV();
145
-				let modesVal = $('#modes').val()
146
-				    
147
-				if (modesVal == "") {
148
-					isStepValid = false;
149
-					$('#wizard').smartWizard('showMessage', '请您选择要进行数据导出的模块。');
150
-					$('#wizard').smartWizard('setError', {
151
-						stepnum : step,
152
-						iserror : true
153
-					});
154
-				} else {
155
-					$(".msgBox").hide();
156
-					$('#wizard').smartWizard('setError', {
157
-						stepnum : step,
158
-						iserror : false
159
-					});
160
-				}
161
-			} 
162
-			return isStepValid;
163
-		}
164
-		$('#regionid').val(top.$("#regionId").val());
165
-	    $('#regionname').val(top.$("#regionName").val());
166
-		$.ajax({
167
-			url:ctxPath + 'api/menu/getOAMenu',
168
-			type:'post',
169
-			data:{},
170
-			dataType:'json',
171
-			success:function(result){
172
-				$('#mode_tree').treeview({
173
-					data:result,
174
-					showCheckbox: true,
175
-					onNodeChecked: function(event, data) {
176
-						var modes = $('#modes').val().split(",");
177
-						var mode_enname =[];
178
-						if(data.mode_enname != ""){
179
-							mode_enname = data.mode_enname.split(",");
180
-						}
181
-					    for(var key in mode_enname){
182
-					    	var isBol = true;
183
-					    	for(var key2 in modes){
184
-					    		if(modes[key2] == mode_enname[key]){
185
-					    			isBol = false;
186
-					    			break;
187
-					    		}
188
-					    	}
189
-					    	if(isBol && mode_enname[key] != null && mode_enname[key] != ""){
190
-					    		modes[modes.length] = mode_enname[key];
191
-					    	}
192
-					    }
193
-						$('#modes').val(modes.toString());
194
-					},
195
-					onNodeUnchecked: function(event, data) {
196
-						var modes = $('#modes').val().split(",");
197
-						var mode_enname = [];
198
-						if(data.mode_enname != ""){
199
-							mode_enname = data.mode_enname.split(",");
126
+
127
+				function validateSteps (step) {
128
+					var isStepValid = true;
129
+					// validate step 1
130
+					if (step == 1) {
131
+						/* 	if ($('#regionid').val() == "") {
132
+								isStepValid = false;
133
+								$('#wizard').smartWizard('showMessage', '请您选择要进行数据导出的区域。');
134
+								$('#wizard').smartWizard('setError', {
135
+									stepnum : step,
136
+									iserror : true
137
+								});
138
+							} else {
139
+								isStepValid = true;
140
+								$(".msgBox").hide();
141
+								$('#wizard').smartWizard('setError', {
142
+									stepnum : step,
143
+									iserror : false
144
+								});
145
+							}
146
+						} else if (step == 2) { */
147
+						//setFormModeV();
148
+						let modesVal = $('#modes').val()
149
+
150
+						if (modesVal == "") {
151
+							isStepValid = false;
152
+							$('#wizard').smartWizard('showMessage', '请您选择要进行数据导出的模块。');
153
+							$('#wizard').smartWizard('setError', {
154
+								stepnum: step,
155
+								iserror: true
156
+							});
157
+						} else {
158
+							$(".msgBox").hide();
159
+							$('#wizard').smartWizard('setError', {
160
+								stepnum: step,
161
+								iserror: false
162
+							});
200 163
 						}
201
-						var newModes = [];
202
-						for(var key2 in modes){
203
-							var isBol = true;
204
-							for(var key in mode_enname){
205
-					    		if(modes[key2] == mode_enname[key]){
206
-					    			isBol = false;
207
-					    			break;
208
-					    		}
209
-					    		if(isBol  && modes[key2] != null && modes[key2] != ""){
210
-					    			newModes[newModes.length] = modes[key2];
211
-						    	}
164
+					}
165
+					return isStepValid;
166
+				}
167
+				$('#regionid').val(top.$("#regionId").val());
168
+				$('#regionname').val(top.$("#regionName").val());
169
+				$.ajax({
170
+					url: ctxPath + 'api/menu/getOAMenu',
171
+					type: 'post',
172
+					data: {},
173
+					dataType: 'json',
174
+					success: function (result) {
175
+						$('#mode_tree').treeview({
176
+							data: result,
177
+							showCheckbox: true,
178
+							onNodeChecked: function (event, data) {
179
+								var modes = $('#modes').val().split(",");
180
+								var mode_enname = [];
181
+								if (data.mode_enname != "") {
182
+									mode_enname = data.mode_enname.split(",");
183
+								}
184
+								for (var key in mode_enname) {
185
+									var isBol = true;
186
+									for (var key2 in modes) {
187
+										if (modes[key2] == mode_enname[key]) {
188
+											isBol = false;
189
+											break;
190
+										}
191
+									}
192
+									if (isBol && mode_enname[key] != null && mode_enname[key] != "") {
193
+										modes[modes.length] = mode_enname[key];
194
+									}
195
+								}
196
+								$('#modes').val(modes.toString());
197
+							},
198
+							onNodeUnchecked: function (event, data) {
199
+								var modes = $('#modes').val().split(",");
200
+								var mode_enname = [];
201
+								if (data.mode_enname != "") {
202
+									mode_enname = data.mode_enname.split(",");
203
+								}
204
+								var newModes = [];
205
+								for (var key2 in modes) {
206
+									var isBol = true;
207
+									for (var key in mode_enname) {
208
+										if (modes[key2] == mode_enname[key]) {
209
+											isBol = false;
210
+											break;
211
+										}
212
+										if (isBol && modes[key2] != null && modes[key2] != "") {
213
+											newModes[newModes.length] = modes[key2];
214
+										}
215
+									}
216
+								}
217
+								$('#modes').val(newModes.toString());
212 218
 							}
213
-				    	}
214
-						$('#modes').val(newModes.toString());
219
+						})
215 220
 					}
216 221
 				})
222
+			});
223
+			/**
224
+				 *参数说明: url:下载地址,val:需要提交的参数值,具体类型和个数自行扩展
225
+				 * 参数可以用obj = {url:""",val1:"111",val2:"222",...}这样的 格式,也可以用(url,val1,val2....)根据自己喜好来
226
+				 */
227
+			function ajaxPostLoadFile (val) {
228
+				var fileName = val.substring(val.lastIndexOf("/") + 1, val.length);
229
+				var filePath = val.substring(0, val.lastIndexOf("/"))
230
+				var form = $("<form>");//定义一个form表单
231
+				form.attr("id", "downloadform");
232
+				form.attr("style", "display:none");//将表单隐藏
233
+				form.attr("target", "");
234
+				form.attr("method", "post");
235
+				form.attr("action", ctxPath + "api/file/downloadFile");
236
+
237
+				var input1 = $("<input>");
238
+				input1.attr("type", "hidden");
239
+				input1.attr("name", "fileName");
240
+				input1.attr("value", fileName);
241
+				//如果有多个参数,参照上面input1 的写法
242
+				var input2 = $("<input>");
243
+				input2.attr("type", "hidden");
244
+				input2.attr("name", "filePath");
245
+				input2.attr("value", filePath);
246
+
247
+				form.append(input1);//一定要把参数添加到form里
248
+				form.append(input2);
249
+				$("body").append(form);//将表单放置在页面中
250
+				form.submit();//表单提交
251
+				$("#downloadform").remove();//移除表单
252
+			}
253
+			function changeMsg (msg) {
254
+				let stepMsg = $("#step").html();
255
+				stepMsg += "<br>" + msg;
256
+				$("#step").html(stepMsg);
257
+			}
258
+
259
+
260
+		</script>
261
+		<style type="text/css">
262
+			.list-group {
263
+				padding: 15px 20px;
217 264
 			}
218
-		})	
219
-	});
220
-	 /**
221
-	    *参数说明: url:下载地址,val:需要提交的参数值,具体类型和个数自行扩展
222
-	    * 参数可以用obj = {url:""",val1:"111",val2:"222",...}这样的 格式,也可以用(url,val1,val2....)根据自己喜好来
223
-	    */
224
-	function ajaxPostLoadFile(val){	    
225
-	    var fileName=val.substring(val.lastIndexOf("/")+1,val.length);
226
-	    var filePath = val.substring(0,val.lastIndexOf("/"))
227
-	    var form = $("<form>");//定义一个form表单
228
-	    form.attr("id", "downloadform");
229
-	    form.attr("style", "display:none");//将表单隐藏
230
-	    form.attr("target", "");
231
-	    form.attr("method", "post");
232
-	    form.attr("action", ctxPath + "api/file/downloadFile");
233 265
 
234
-	    var input1 = $("<input>");
235
-	    input1.attr("type", "hidden");
236
-	    input1.attr("name", "fileName");
237
-	    input1.attr("value", fileName);
238
-	    //如果有多个参数,参照上面input1 的写法
239
-        var input2 = $("<input>");
240
-	    input2.attr("type", "hidden");
241
-	    input2.attr("name", "filePath");
242
-	    input2.attr("value", filePath);
243
-	    
244
-	    form.append(input1);//一定要把参数添加到form里
245
-	    form.append(input2);
246
-	    $("body").append(form);//将表单放置在页面中
247
-	    form.submit();//表单提交
248
-	    $("#downloadform").remove();//移除表单
249
-	 }
250
-	function changeMsg(msg){  
251
-	    let stepMsg = $("#step").html();
252
-	    stepMsg +="<br>" + msg;
253
-	    $("#step").html(stepMsg);
254
-	}   
255
-</script>
256
-<style type="text/css">
257
-.list-group{padding:15px 20px;}
258
-.list-group-item{border-width: 0;margin: 0;}
259
-.list-group-item:nth-of-type(even){background: #f8f8f8}
260
-.list-group-item:first-child,.list-group-item:last-child{border-radius: 0;}
266
+			.list-group-item {
267
+				border-width: 0;
268
+				margin: 0;
269
+			}
270
+
271
+			.list-group-item:nth-of-type(even) {
272
+				background: #f8f8f8
273
+			}
261 274
 
262
-</style>
263
-</head>
275
+			.list-group-item:first-child,
276
+			.list-group-item:last-child {
277
+				border-radius: 0;
278
+			}
279
+		</style>
280
+	</head>
264 281
 
265
-<body style="background: transparent;">
266
- <div class="panel" style="background: transparent;">
267
- 	  <div class="con-panel-heading">
268
-			<a class="active"><i class="iconfont icon-dataTotal-o"></i>数据导出</a>
282
+<body style="background: transparent;" class="ext-page">
283
+	<div class="panel" style="background: transparent;">
284
+
285
+		<div class="panel" style="margin: 0;margin-bottom: 30px;border-radius:12px">
286
+			<div class="panel-body">
287
+				<h2 class="page-title" style="font-weight: bold;">数据导出</h2>
288
+			</div>
269 289
 		</div>
270
-	  <div class="panel-body ">
271
-	   <form method="post" id="mForm">
272
-		<input type="hidden" name="regionid" id="regionid" value="" /> 
273
-		<input type="hidden" name="regionname" id="regionname" value="" />
274
-		<input type="hidden" name="modes" id="modes" value="" />
275
-		<!-- Smart Wizard -->
276
-					<div id="wizard" class="swMain">
277
-						<ul>
278
-<!-- 							<li><a href="#step-1"> <span class="stepNumber">1</span> <span class="stepDesc"> 第一步<br /> <small>选择需要导出数据的区域</small> -->
279
-<!-- 								</span> -->
280
-<!-- 							</a></li> -->
281
-							<li><a href="#step-2"> <span class="stepNumber">1</span> <span class="stepDesc"> 第一步<br /> <small>选择需要导出数据的模块</small>
290
+
291
+		<div class="panel-body">
292
+			<form method="post" id="mForm">
293
+				<input type="hidden" name="regionid" id="regionid" value="" />
294
+				<input type="hidden" name="regionname" id="regionname" value="" />
295
+				<input type="hidden" name="modes" id="modes" value="" />
296
+
297
+				<!-- Smart Wizard -->
298
+				<div id="wizard" class="swMain">
299
+
300
+					<ul class="export-io">
301
+						<!-- 							<li><a href="#step-1"> <span class="stepNumber">1</span> <span class="stepDesc"> 第一步<br /> <small>选择需要导出数据的区域</small> -->
302
+						<!-- 								</span> -->
303
+						<!-- 							</a></li> -->
304
+
305
+						<li><a href="#step-2" class="tra1"> <span class="stepNumber">1</span>
306
+								<!-- <br /> -->
282 307
 								</span>
283
-							</a></li>
284
-							<li><a href="#step-3"> <span class="stepNumber">2</span> <span class="stepDesc"> 第二步<br /> <small>选择数据的导出模式</small>
308
+							</a>
309
+						</li>
310
+						<li><a href="#step-3" class="tra2"> <span class="stepNumber">2</span>
311
+								<span class="stepDesc">
285 312
 								</span>
286 313
 							</a></li>
287
-							<li><a href="#step-4"> <span class="stepNumber">3</span> <span class="stepDesc"> 第三步<br /> <small>完成导出</small>
314
+						<li><a href="#step-4" class="tra3"> <span class="stepNumber">3</span>
315
+								<span class="stepDesc">
288 316
 								</span>
289 317
 							</a></li>
290
-														
291
-						</ul>
292
-<!-- 						<div id="step-1"> -->
293
-<!-- 							<h2 class="StepTitle">第一步</h2> -->
294
-<!-- 							<div id="region_tree" style="margin-top:2px;height:270px;width:100%;overflow: auto;"></div> -->
295
-<!-- 						</div> -->
296
-						<div id="step-2">
297
-							<h2 class="StepTitle">第一步</h2>
298
-							<div id="mode_tree" style="margin-top:2px;height:354px;width:100%;overflow: auto;"></div>
299
-						</div>
300
-						    <!-- <input type="hidden" id="export_type" value = "1" name="export_type" /> -->
301
- 						<div id="step-3">
302
-							<h2 class="StepTitle">第二步</h2>
303
-							<div class="form-group" style="padding: 20px;">
304
-					        	<label style="width: 120px;line-height: 30px;text-align: right;padding: 0;float: left;">导出模式:</label>
305
-					        	<div class="col-sm-8">
306
-					        		<select name="export_type" class="form-control" id="export_type" style="width:190px;">
307
-												<option value="1">--全部--</option>
308
-												<option value="2">--增量--</option>
309
-										</select>
310
-					        	</div>
311
-					        </div>
312
-						</div>					
313
-						<div id="step-4">
314
-							<h2 class="StepTitle">第三步</h2>
315
-							<p id="step" style="padding: 20px;">请点击"导出"按钮导出数据。</p>
318
+					</ul>
319
+
320
+					<!-- 						<div id="step-1"> -->
321
+					<!-- 							<h2 class="StepTitle">第一步</h2> -->
322
+					<!-- 							<div id="region_tree" style="margin-top:2px;height:270px;width:100%;overflow: auto;"></div> -->
323
+					<!-- 						</div> -->
324
+					<div id="step-2">
325
+						<h2 class="StepTitle">第一步<span>选择需要导出数据的模块</span></h2>
326
+						<div id="mode_tree" style="margin-top:2px;height:354px;width:100%;overflow: auto;"></div>
327
+					</div>
328
+					<!-- <input type="hidden" id="export_type" value = "1" name="export_type" /> -->
329
+					<div id="step-3">
330
+						<h2 class="StepTitle">第二步<span>选择数据的导出模式</span></h2>
331
+						<div class="form-group" style="padding: 20px;">
332
+							<label style="width: 120px;line-height: 30px;text-align: right;padding: 0;float: left;">导出模式:</label>
333
+							<div class="col-sm-8">
334
+								<select name="export_type" class="form-control" id="export_type" style="width:190px;">
335
+									<option value="1">--全部--</option>
336
+									<option value="2">--增量--</option>
337
+								</select>
338
+							</div>
316 339
 						</div>
317
-					</div> <!-- End SmartWizard Content -->
318
-	</form>
340
+					</div>
341
+					<div id="step-4">
342
+						<h2 class="StepTitle">第三步<span>完成导出</span></h2>
343
+						<p id="step" style="padding: 20px;">请点击"导出"按钮导出数据。</p>
344
+					</div>
345
+				</div> <!-- End SmartWizard Content -->
346
+			</form>
319 347
 
320
-  </div>
321
-</div>
348
+		</div>
349
+	</div>
322 350
 </body>
323
-</html>
351
+
352
+</html>

+ 244
- 225
resources/templates/data/importData.html Zobrazit soubor

@@ -1,242 +1,261 @@
1 1
 <html lang="zh-CN">
2
-<head
3
-	th:replace="common/common_header::common_header(~{},~{::link},~{::style},~{::script},'')">
4
-<meta charset="utf-8" />
5
-<head>
6
-<link th:href="@{/js/zui/dist/lib/uploader/zui.uploader.min.css}"
7
-	rel="stylesheet">
8
-<script th:src="@{/js/zui/dist/lib/uploader/zui.uploader.min.js}"></script>
9
-<script type="text/javascript" th:src="@{/js/jquery.smartWizard-2.0.min.js}"></script>
10
-<link th:href="@{/style/smartwizard/smart_wizard.css}" rel="stylesheet" type="text/css"/>
11
-<script type="text/javascript">
12
-	function loadPage(){
13
-		// Smart Wizard 	
14
-		$('#wizard').smartWizard({
15
-			labelNext : '下一步',
16
-			labelPrevious : '上一步',
17
-			labelFinish : '完成导入',
18
-			onLeaveStep:leaveAStepCallback,
19
-			onFinish:onFinishCallback,
20
-			enableFinishButton:false
21
-		});
22
-
23
-		function leaveAStepCallback(obj){
24
-	        var step_num= obj.attr('rel');
25
-	        return validateSteps(step_num);
26
-	     }
27
-		
28
-		function onFinishCallback() {
29
-			if (validateAllSteps()){
30
-				$('.actionBar a.buttonFinish').addClass("buttonDisabled");
31
-				form_submit();
32
-		    }
33
-		}
34
-		
35
-		function form_submit(){		
36
-			var formdata = $("#mForm").serializeArray();
37
-			var json = {};
38
-			$(formdata).each(function(index, obj) {
39
-				json[obj.name] = obj.value;
40
-			});
41
-			$.ajax({
42
-				url : urlPre + "api/importData/importData",
43
-				type:'post',
44
-				beforeSend: function () {
45
-					$("#step").hide();
46
-					$(".buttonPrevious").addClass("buttonDisabled");
47
-				},
48
-				complete: function () {
49
-					$("#step").show();
50
-				},
51
-				data:{params:JSON.stringify(json)},
52
-				dataType:'json',
53
-				success:function(result){
54
-					var json = result
55
-					var error = json.error
56
-					if(error*1 == 1){
57
-						$("#step").html('正在进行文件解密。。。');	
58
-						let time = 1500
59
-						setTimeout(function(){
60
-							changeMsg('正在进行数据解密。。。')
61
-						},time);
62
-						time += 1300
63
-						setTimeout(function(){
64
-							changeMsg('正在进行数据校验。。。')
65
-						},time);
66
-						time += 1000
67
-						setTimeout(function(){
68
-							changeMsg('正在进行图片、文档等资料导入。。。')
69
-						},time);
70
-						time += 300
71
-						setTimeout(function(){
72
-							changeMsg('正在进行数据库导入。。。')
73
-						},time);
74
-						time += 300
75
-						setTimeout(function(){
76
-							top.bootbox.alert('数据导入成功!', function(){							
77
-								top.toMain();
78
-							});
79
-						},time);						
80
-					}else if(error*1 == 2){
81
-						top.bootbox.alert('导入的zip文件不是从政务外网导出的数据包!', function(){			
82
-							$('.actionBar a.buttonPrevious').removeClass("buttonDisabled");//上一步
83
-							$(".btn-delete-file").click();
84
-						})
85
-					}else if(error*1 == 0){
86
-						top.bootbox.alert('导入的zip文件不包含数据文件!', function(){			
87
-							$('.actionBar a.buttonPrevious').removeClass("buttonDisabled");//上一步
88
-							$(".btn-delete-file").click();
89
-						})
90
-					}else{
91
-						top.bootbox.alert("导出文件出错,请联系管理员", function(){							
92
-							top.toMain();
2
+
3
+<head th:replace="common/common_header::common_header(~{},~{::link},~{::style},~{::script},'')">
4
+	<meta charset="utf-8" />
5
+
6
+	<head>
7
+		<link th:href="@{/js/zui/dist/lib/uploader/zui.uploader.min.css}" rel="stylesheet">
8
+		<script th:src="@{/js/zui/dist/lib/uploader/zui.uploader.min.js}"></script>
9
+		<script type="text/javascript" th:src="@{/js/jquery.smartWizard-2.0.min.js}"></script>
10
+		<link th:href="@{/style/smartwizard/smart_wizard.css}" rel="stylesheet" type="text/css" />
11
+		<script type="text/javascript">
12
+			function loadPage () {
13
+				// Smart Wizard 	
14
+				$('#wizard').smartWizard({
15
+					labelNext: '下一步',
16
+					labelPrevious: '上一步',
17
+					labelFinish: '完成导入',
18
+					onLeaveStep: leaveAStepCallback,
19
+					onFinish: onFinishCallback,
20
+					enableFinishButton: false
21
+				});
22
+
23
+				function leaveAStepCallback (obj) {
24
+					var step_num = obj.attr('rel');
25
+					return validateSteps(step_num);
26
+				}
27
+
28
+				function onFinishCallback () {
29
+					if (validateAllSteps()) {
30
+						$('.actionBar a.buttonFinish').addClass("buttonDisabled");
31
+						form_submit();
32
+					}
33
+				}
34
+
35
+				function form_submit () {
36
+					var formdata = $("#mForm").serializeArray();
37
+					var json = {};
38
+					$(formdata).each(function (index, obj) {
39
+						json[obj.name] = obj.value;
40
+					});
41
+					$.ajax({
42
+						url: urlPre + "api/importData/importData",
43
+						type: 'post',
44
+						beforeSend: function () {
45
+							$("#step").hide();
46
+							$(".buttonPrevious").addClass("buttonDisabled");
47
+						},
48
+						complete: function () {
49
+							$("#step").show();
50
+						},
51
+						data: { params: JSON.stringify(json) },
52
+						dataType: 'json',
53
+						success: function (result) {
54
+							var json = result
55
+							var error = json.error
56
+							if (error * 1 == 1) {
57
+								$("#step").html('正在进行文件解密。。。');
58
+								let time = 1500
59
+								setTimeout(function () {
60
+									changeMsg('正在进行数据解密。。。')
61
+								}, time);
62
+								time += 1300
63
+								setTimeout(function () {
64
+									changeMsg('正在进行数据校验。。。')
65
+								}, time);
66
+								time += 1000
67
+								setTimeout(function () {
68
+									changeMsg('正在进行图片、文档等资料导入。。。')
69
+								}, time);
70
+								time += 300
71
+								setTimeout(function () {
72
+									changeMsg('正在进行数据库导入。。。')
73
+								}, time);
74
+								time += 300
75
+								setTimeout(function () {
76
+									top.bootbox.alert('数据导入成功!', function () {
77
+										top.toMain();
78
+									});
79
+								}, time);
80
+							} else if (error * 1 == 2) {
81
+								top.bootbox.alert('导入的zip文件不是从政务外网导出的数据包!', function () {
82
+									$('.actionBar a.buttonPrevious').removeClass("buttonDisabled");//上一步
83
+									$(".btn-delete-file").click();
84
+								})
85
+							} else if (error * 1 == 0) {
86
+								top.bootbox.alert('导入的zip文件不包含数据文件!', function () {
87
+									$('.actionBar a.buttonPrevious').removeClass("buttonDisabled");//上一步
88
+									$(".btn-delete-file").click();
89
+								})
90
+							} else {
91
+								top.bootbox.alert("导出文件出错,请联系管理员", function () {
92
+									top.toMain();
93
+								});
94
+							}
95
+						}
96
+					})
97
+
98
+				}
99
+
100
+				function validateAllSteps () {
101
+					var isStepValid = true;
102
+					if ($('#import_file').val() == "") {
103
+						isStepValid = false;
104
+						$('#wizard').smartWizard('setError', {
105
+							stepnum: 1,
106
+							iserror: true
107
+						});
108
+					} else {
109
+						$('#wizard').smartWizard('setError', {
110
+							stepnum: 1,
111
+							iserror: false
93 112
 						});
94
-					} 
113
+					}
114
+					if (!isStepValid) {
115
+						$('#wizard').smartWizard('showMessage', '请您先行执行第一步、第二步。');
116
+					}
117
+
118
+					return isStepValid;
95 119
 				}
96
-			})		
97
-				
98
-		}
99
-		
100
-		function validateAllSteps() {			
101
-			var isStepValid = true;
102
-			if ($('#import_file').val() == "") {
103
-				isStepValid = false;
104
-				$('#wizard').smartWizard('setError', {
105
-					stepnum : 1,
106
-					iserror : true
107
-				});
108
-			} else {
109
-				$('#wizard').smartWizard('setError', {
110
-					stepnum : 1,
111
-					iserror : false
120
+
121
+				function validateSteps (step) {
122
+					var isStepValid = true;
123
+					if (step == 1) {
124
+						if ($('#import_file').val() == "") {
125
+							isStepValid = false;
126
+							$('#wizard').smartWizard('showMessage', '请您上传要进行导入的zip文件。');
127
+							$('#wizard').smartWizard('setError', {
128
+								stepnum: step,
129
+								iserror: true
130
+							});
131
+						} else {
132
+							$('#wizard').smartWizard('setError', {
133
+								stepnum: step,
134
+								iserror: false
135
+							});
136
+						}
137
+					}
138
+					return isStepValid;
139
+				}
140
+				$('#uploaderExample1').uploader({
141
+					autoUpload: true,            // 当选择文件后立即自动进行上传操作
142
+					chunk_size: 0,
143
+					limitFilesCount: 1,
144
+					url: ctxPath + 'api/file/upload?uploadFile=import',
145
+					deleteActionOnDone: function (file,
146
+						doRemoveFile) {
147
+						return true;
148
+					},
149
+					filters: {
150
+						mime_types: [
151
+							{ title: 'zip文件', extensions: 'zip' }
152
+						]
153
+					},
154
+					responseHandler: function (
155
+						responseObject, file) {
156
+						// 当服务器返回的文本内容包含 `'error'`
157
+						// 文本时视为上传失败 console.log(hidId)
158
+						if (responseObject.response
159
+							.indexOf('error') != -1) {
160
+							$("#import_file_url").val("");
161
+							$("#import_file").val("");
162
+							top.bootbox.alert("导出文件出错,请联系管理员");
163
+							$(".icon-trash").click();
164
+							return '上传失败。服务器返回了一个错误:'
165
+								+ responseObject.response;
166
+
167
+						} else if (responseObject.response.indexOf('请选择同级的政务外网数据') != -1) {
168
+							$("#import_file_url").val("");
169
+							$("#import_file").val("");
170
+							top.bootbox.alert("请选择同级的政务外网数据");
171
+							$(".icon-trash").click();
172
+							return '请选择同级的政务外网数据';
173
+						} else {
174
+							var fielPath = responseObject.response
175
+								.replace(/\\/g, "/");
176
+							var _arr_val = fielPath.split("$");
177
+							$("#import_file_url").val(_arr_val[0]);
178
+							$("#import_file").val(file.name);
179
+						}
180
+					},
181
+					onFilesRemoved: function (file) {
182
+						$('.actionBar a.buttonFinish').addClass("buttonDisabled");
183
+						$("#import_file_url").val("");
184
+						$("#import_file").val("");
185
+					}
112 186
 				});
187
+
113 188
 			}
114
-			if (!isStepValid) {
115
-				$('#wizard').smartWizard('showMessage', '请您先行执行第一步、第二步。');
189
+			function changeMsg (msg) {
190
+				let stepMsg = $("#step").html();
191
+				stepMsg += "<br>" + msg;
192
+				$("#step").html(stepMsg);
193
+			}   
194
+		</script>
195
+		<style type="text/css">
196
+			.fileUpload {
197
+				width: 100%;
116 198
 			}
117 199
 
118
-			return isStepValid;
119
-		}
120
-
121
-		function validateSteps(step) {
122
-			var isStepValid = true;
123
-			if (step == 1) {
124
-				if ($('#import_file').val() == "") {
125
-					isStepValid = false;
126
-					$('#wizard').smartWizard('showMessage', '请您上传要进行导入的zip文件。');
127
-					$('#wizard').smartWizard('setError', {
128
-						stepnum : step,
129
-						iserror : true
130
-					});
131
-				} else {
132
-					$('#wizard').smartWizard('setError', {
133
-						stepnum : step,
134
-						iserror : false
135
-					});
136
-				}
200
+			.actions .btn-link {
201
+				margin-top: 0;
137 202
 			}
138
-			return isStepValid;
139
-		}			
140
-		$('#uploaderExample1').uploader({
141
-		    autoUpload: true,            // 当选择文件后立即自动进行上传操作
142
-		    chunk_size:0,
143
-		    limitFilesCount:1,
144
-		    url: ctxPath + 'api/file/upload?uploadFile=import',
145
-		    deleteActionOnDone : function(file,
146
-					doRemoveFile) {
147
-				return true;
148
-			},
149
-		    filters:{
150
-		    	 mime_types: [
151
-				        {title: 'zip文件', extensions: 'zip'}
152
-				    ]
153
-		    },
154
-		    responseHandler : function(
155
-					responseObject, file) {
156
-				// 当服务器返回的文本内容包含 `'error'`
157
-				// 文本时视为上传失败 console.log(hidId)
158
-				if (responseObject.response
159
-						.indexOf('error') != -1) {
160
-					$("#import_file_url").val("");
161
-					$("#import_file").val("");
162
-					top.bootbox.alert("导出文件出错,请联系管理员");
163
-					$(".icon-trash").click();
164
-					return '上传失败。服务器返回了一个错误:'
165
-							+ responseObject.response;					
166
-					
167
-				}else if(responseObject.response.indexOf('请选择同级的政务外网数据') != -1){
168
-					$("#import_file_url").val("");
169
-					$("#import_file").val("");
170
-					top.bootbox.alert("请选择同级的政务外网数据");
171
-					$(".icon-trash").click();
172
-					return '请选择同级的政务外网数据';
173
-				}else {
174
-					var fielPath = responseObject.response
175
-							.replace(/\\/g, "/");					
176
-					var _arr_val = fielPath.split("$");
177
-	 				$("#import_file_url").val(_arr_val[0]);
178
-					$("#import_file").val(file.name);
179
-				}
180
-			},
181
-			onFilesRemoved: function(file) {
182
-				$('.actionBar a.buttonFinish').addClass("buttonDisabled");
183
-				$("#import_file_url").val("");
184
-				$("#import_file").val("");
203
+
204
+			.fileUpload .btn {
205
+				border-radius: 3px;
185 206
 			}
186
-		});
187
-		
188
-	}
189
-	function changeMsg(msg){  
190
-	    let stepMsg = $("#step").html();
191
-	    stepMsg +="<br>" + msg;
192
-	    $("#step").html(stepMsg);
193
-	}   
194
-</script>
195
-<style type="text/css">
196
-.fileUpload{width:100%;}
197
-.actions .btn-link{margin-top: 0;}
198
-.fileUpload .btn{border-radius: 3px;}
199
-.tooltip.in{z-index: 999;white-space: nowrap;}
200
-</style>
201
-</head>
202
-
203
-<body style="background: transparent;">
204
- <div class="panel" style="background: transparent;">
205
- 		<div class="con-panel-heading">
206
-			<a class="active"><i class="iconfont icon-dataTotal-o"></i>数据导入</a>
207
+
208
+			.tooltip.in {
209
+				z-index: 999;
210
+				white-space: nowrap;
211
+			}
212
+		</style>
213
+	</head>
214
+
215
+<body style="background: transparent;" class="ext-page">
216
+	<div class="panel" style="background: transparent;">
217
+
218
+		<div class="panel" style="margin: 0;margin-bottom: 30px;border-radius:12px;font-weight: bold;">
219
+			<div class="panel-body">
220
+				<h2 class="page-title">数据导入</h2>
221
+			</div>
207 222
 		</div>
208
-	  <div class="panel-body">
209
-	   <form method="post" id="mForm" style="padding:15px;background:#FFF;text-align:center;">
210
-	    <input type="hidden" id="importType" th:value="${importType}" />
211
-		<input type="hidden" name="import_file" id="import_file" value="" />
212
-		<input type="hidden" name="import_file_url" id="import_file_url" value="" />
213
-			<input type="hidden" id="nodeCode" th:value="${nodeCode}" />
214
-		<!-- Smart Wizard -->
215
-					<div id="wizard" class="swMain">
216
-						<ul>							
217
-							<li><a href="#step-1"> <span class="stepNumber">1</span> <span class="stepDesc"> 第一步<br /> <small>选择zip文件并进行上传</small>
223
+		<div class="panel-body">
224
+			<form method="post" id="mForm" style="padding:15px;background:#FFF;text-align:center;">
225
+				<input type="hidden" id="importType" th:value="${importType}" />
226
+				<input type="hidden" name="import_file" id="import_file" value="" />
227
+				<input type="hidden" name="import_file_url" id="import_file_url" value="" />
228
+				<input type="hidden" id="nodeCode" th:value="${nodeCode}" />
229
+				<!-- Smart Wizard -->
230
+				<div id="wizard" class="swMain">
231
+					<ul class="export-io">
232
+						<li><a href="#step-1" class="tra1"> <span class="stepNumber">1</span><br />
233
+
218 234
 								</span>
219 235
 							</a></li>
220
-							<li><a href="#step-2"> <span class="stepNumber">2</span> <span class="stepDesc"> 第二步<br /> <small>完成导入</small>
236
+						<li><a href="#step-2" class="tra2"> <span class="stepNumber">2</span><br />
237
+
221 238
 								</span>
222 239
 							</a></li>
223
-						</ul>					
224
-						<div id="step-1">
225
-							<h2 class="StepTitle">第一步</h2>
226
-							<div class="fileUpload" style="padding-top: 36px;">
227
-								<div id="uploaderExample1" class="uploader">
228
-								  <div class="file-list" data-drag-placeholder="请拖拽文件到此处"></div>
229
-								  <button type="button" class="btn uploader-btn-browse"><i class="icon icon-cloud-upload"></i> 选择zip文件</button>
230
-								</div>									                            
231
-	                        </div>
232
-						</div>
233
-						<div id="step-2">
234
-							<h2 class="StepTitle">第二步</h2>
235
-							<p id="step" style="padding: 20px;">现在进行数据导入。</p>
240
+					</ul>
241
+					<div id="step-1">
242
+						<h2 class="StepTitle">第一步<span>选择zip文件并进行上传</span></h2>
243
+						<div class="fileUpload" style="padding-top: 36px;">
244
+							<div id="uploaderExample1" class="uploader">
245
+								<div class="file-list" data-drag-placeholder="请拖拽文件到此处"></div>
246
+								<button type="button" class="btn uploader-btn-browse"><i class="icon icon-cloud-upload"></i>
247
+									选择zip文件</button>
248
+							</div>
236 249
 						</div>
237
-					</div> <!-- End SmartWizard Content -->
238
-	</form>
239
-  </div>
240
-</div>
250
+					</div>
251
+					<div id="step-2">
252
+						<h2 class="StepTitle">第二步<span>完成导入</span></h2>
253
+						<p id="step" style="padding: 20px;">现在进行数据导入。</p>
254
+					</div>
255
+				</div> <!-- End SmartWizard Content -->
256
+			</form>
257
+		</div>
258
+	</div>
241 259
 </body>
260
+
242 261
 </html>

+ 16
- 15
resources/templates/operator/changePwd.html Zobrazit soubor

@@ -1,9 +1,10 @@
1 1
 <html lang="zh-CN">
2
-<head
3
-	th:replace="common/common_header::common_header(~{},~{},~{},~{::script},'edit')">
4
-<meta charset="utf-8" />
5
-<script th:src="@{/js/operator/changePwd.js}"></script>
2
+
3
+<head th:replace="common/common_header::common_header(~{},~{},~{},~{::script},'edit')">
4
+	<meta charset="utf-8" />
5
+	<script th:src="@{/js/operator/changePwd.js}"></script>
6 6
 </head>
7
+
7 8
 <body>
8 9
 	<div class="panel">
9 10
 		<div class="con-panel-heading" style="padding-bottom:0;"><a class="active">修改密码</a></div>
@@ -11,28 +12,28 @@
11 12
 			<form id="savePwdForm" method="post" class="conForm load-indicator" data-loading="正在处理...">
12 13
 				<div class="form-group">
13 14
 					<label class="required col-sm-4">旧密码:</label>
14
-					<div class="col-sm-10">
15
-						<input type="password" class="form-control" id="oldPassword"
16
-							name="oldPassword" maxlength="18" placeholder="请填写旧密码"></input>
15
+					<div class="col-sm-8">
16
+						<input type="password" class="form-control" id="oldPassword" name="oldPassword" maxlength="18"
17
+							placeholder="请填写旧密码"></input>
17 18
 					</div>
18 19
 				</div>
19 20
 				<div class="form-group">
20 21
 					<label class="required col-sm-4">新密码:</label>
21
-					<div class="col-sm-10">
22
-						<input type="password" class="form-control" id="password"
23
-							name="password" maxlength="18" placeholder="请填写密码"></input>
22
+					<div class="col-sm-8">
23
+						<input type="password" class="form-control" id="password" name="password" maxlength="18"
24
+							placeholder="请填写密码"></input>
24 25
 					</div>
25 26
 				</div>
26 27
 				<div class="form-group">
27 28
 					<label class="required col-sm-4">确认新密码:</label>
28
-					<div class="col-sm-10">
29
-						<input type="password" class="form-control" id="confirmPwd"
30
-							name="confirmPwd" placeholder="请确认密码" maxlength="18"></input>
29
+					<div class="col-sm-8">
30
+						<input type="password" class="form-control" id="confirmPwd" name="confirmPwd" placeholder="请确认密码"
31
+							maxlength="18"></input>
31 32
 					</div>
32 33
 				</div>
33
-				<div class="btnEnd">		
34
+				<div class="btnEnd">
34 35
 					<button class="btn btn-primary" id="submitBtn" type="button">确认修改</button>
35
-					<button class="btn" type="button" onclick="history.back();">取消</button>	
36
+					<button class="btn" type="button" onclick="history.back();">取消</button>
36 37
 				</div>
37 38
 			</form>
38 39
 		</div>