Selaa lähdekoodia

mod:修改配置

weieryang 1 vuosi sitten
vanhempi
commit
3fffef5820

+ 9 - 0
.project

@@ -123,5 +123,14 @@
123 123
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
124 124
 			</matcher>
125 125
 		</filter>
126
+		<filter>
127
+			<id>1709518648059</id>
128
+			<name></name>
129
+			<type>26</type>
130
+			<matcher>
131
+				<id>org.eclipse.ui.ide.multiFilter</id>
132
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
133
+			</matcher>
134
+		</filter>
126 135
 	</filteredResources>
127 136
 </projectDescription>

+ 4 - 4
equipmentMaintenance/js/equipmentRepair.js

@@ -663,7 +663,7 @@ function btn_add() {
663 663
 	layer.open({
664 664
 		type: 2,
665 665
 		content: "template/addEquipmentRepair.html",
666
-		title: '添加设备维修',
666
+		title: '添加故障维修',
667 667
 		area: ['70%', '80%'], //宽高
668 668
 	});
669 669
 }
@@ -672,7 +672,7 @@ function btn_edit(ids) {
672 672
 	layer.open({
673 673
 		type: 2,
674 674
 		content: "template/addEquipmentRepair.html?ids=" + ids,
675
-		title: '修改设备维修',
675
+		title: '修改故障维修',
676 676
 		area: ['70%', '80%'], //宽高
677 677
 	});
678 678
 }
@@ -692,7 +692,7 @@ function btn_details(ids) {
692 692
 	layer.open({
693 693
 		type: 2,
694 694
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
695
-		title: '设备维修详情',
695
+		title: '故障维修详情',
696 696
 		area: ['70%', '80%'], //宽高
697 697
 	});
698 698
 }
@@ -702,7 +702,7 @@ function btn_assign(proId, wocode) {
702 702
 	layer.open({
703 703
 		type: 2,
704 704
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
705
-		title: '设备维修派单',
705
+		title: '故障维修派单',
706 706
 		area: ['70%', '80%'], //宽高
707 707
 	});
708 708
 }

+ 4 - 4
equipmentMaintenance/js/notSingleRepair.js

@@ -453,7 +453,7 @@ function btn_add() {
453 453
 	layer.open({
454 454
 		type: 2,
455 455
 		content: "template/addEquipmentRepair.html",
456
-		title: '添加设备维修',
456
+		title: '添加故障维修',
457 457
 		area: ['70%', '80%'], //宽高
458 458
 	});
459 459
 }
@@ -463,7 +463,7 @@ function btn_handle(code, floorId, sysId) {
463 463
 	layer.open({
464 464
 		type: 2,
465 465
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
466
-		title: '设备维修处理',
466
+		title: '故障维修处理',
467 467
 		area: ['70%', '80%'], //宽高
468 468
 	});
469 469
 }
@@ -483,7 +483,7 @@ function btn_details(ids) {
483 483
 	layer.open({
484 484
 		type: 2,
485 485
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
486
-		title: '设备维修详情',
486
+		title: '故障维修详情',
487 487
 		area: ['70%', '80%'], //宽高
488 488
 	});
489 489
 }
@@ -493,7 +493,7 @@ function btn_assign(proId, wocode) {
493 493
 	layer.open({
494 494
 		type: 2,
495 495
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
496
-		title: '设备维修派单',
496
+		title: '故障维修派单',
497 497
 		area: ['70%', '80%'], //宽高
498 498
 	});
499 499
 }

+ 1 - 1
equipmentOperationManage/equipmentRepair.html

@@ -161,7 +161,7 @@
161 161
 									<!--<th data-field="sysname" data-align="center">系统名称</th>
162 162
 									<th data-field="equipname" data-align="center">设备名称</th>
163 163
 									<th data-field="faulttype" data-align="center">故障类型</th>-->
164
-									<th data-field="faultdescripe" data-align="center" data-formatter="formatterDescripe">设备名称</th>
164
+									<th data-field="faultdescripe" data-align="center" data-formatter="formatterDescripe">报修类型</th>
165 165
 									<th data-field="Pwcode" data-align="center">原接单班组</th>
166 166
 									<!--<th data-field="appointman" data-align="center">指定维修人</th>-->
167 167
                                       

+ 3 - 2
equipmentOperationManage/js/addEquipmentRepair.js

@@ -246,8 +246,9 @@ function getTreeData (data) {
246 246
 		newData.push({
247 247
             id: ele.id,
248 248
             parentid: ele.pid,
249
-            text: ele.wxcenter +'-'+ ele.name,
250
-            children: (ele.child && ele.child.length > 0) ? getTreeData(ele.child) : []
249
+//          text: ele.wxcenter +'-'+ ele.name,
250
+			text: ele.wxcenter,
251
+			children: (ele.child && ele.child.length > 0) ? getTreeData(ele.child) : []
251 252
        })
252 253
 	})
253 254
 	return newData

+ 5 - 5
equipmentOperationManage/js/equipmentRepair.js

@@ -848,7 +848,7 @@ function btn_edit(ids) {
848 848
 	layer.open({
849 849
 		type: 2,
850 850
 		content: "template/addEquipmentRepair.html?ids=" + ids,
851
-		title: '修改设备维修',
851
+		title: '修改故障维修',
852 852
 		area: ['70%', '80%'], //宽高
853 853
 	});
854 854
 }
@@ -858,7 +858,7 @@ function btn_handle(code, floorId, sysId) {
858 858
 	layer.open({
859 859
 		type: 2,
860 860
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
861
-		title: '设备维修处理',
861
+		title: '故障维修处理',
862 862
 		area: ['70%', '80%'], //宽高
863 863
 	});
864 864
 }
@@ -867,7 +867,7 @@ function btn_Return(code, floorId, sysId) {
867 867
 	layer.open({
868 868
 		type: 2,
869 869
 		content: "template/HandleReturnRepair.html?code=" + code + "&floorId=" + floorId,
870
-		title: '设备维修处理',
870
+		title: '故障维修处理',
871 871
 		area: ['70%', '80%'], //宽高
872 872
 	});
873 873
 }
@@ -876,7 +876,7 @@ function btn_details(ids) {
876 876
 	layer.open({
877 877
 		type: 2,
878 878
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
879
-		title: '设备维修详情',
879
+		title: '故障维修详情',
880 880
 		area: ['70%', '80%'], //宽高
881 881
 	});
882 882
 }
@@ -886,7 +886,7 @@ function btn_assign(proId, wocode) {
886 886
 	layer.open({
887 887
 		type: 2,
888 888
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
889
-		title: '设备维修派单',
889
+		title: '故障维修派单',
890 890
 		area: ['70%', '80%'], //宽高
891 891
 	});
892 892
 }

+ 4 - 4
equipmentOperationManage/js/notSingleRepair.js

@@ -492,7 +492,7 @@ function btn_add() {
492 492
 	layer.open({
493 493
 		type: 2,
494 494
 		content: "template/addEquipmentRepair.html",
495
-		title: '添加设备维修',
495
+		title: '添加故障维修',
496 496
 		area: ['70%', '80%'], //宽高
497 497
 	});
498 498
 }
@@ -502,7 +502,7 @@ function btn_handle(code, floorId, sysId) {
502 502
 	layer.open({
503 503
 		type: 2,
504 504
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
505
-		title: '设备维修处理',
505
+		title: '故障维修处理',
506 506
 		area: ['70%', '80%'], //宽高
507 507
 	});
508 508
 }
@@ -522,7 +522,7 @@ function btn_details(ids) {
522 522
 	layer.open({
523 523
 		type: 2,
524 524
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
525
-		title: '设备维修详情',
525
+		title: '故障维修详情',
526 526
 		area: ['70%', '80%'], //宽高
527 527
 	});
528 528
 }
@@ -532,7 +532,7 @@ function btn_assign(proId, wocode) {
532 532
 	layer.open({
533 533
 		type: 2,
534 534
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
535
-		title: '设备维修派单',
535
+		title: '故障维修派单',
536 536
 		area: ['70%', '80%'], //宽高
537 537
 	});
538 538
 }

+ 4 - 4
equipmentOperationManage/js/warrantyWorkOrder.js

@@ -190,7 +190,7 @@ function btn_add() {
190 190
 	layer.open({
191 191
 		type: 2,
192 192
 		content: "template/addEquipmentRepair.html",
193
-		title: '添加设备维修',
193
+		title: '添加故障维修',
194 194
 		area: ['70%', '80%'], //宽高
195 195
 	});
196 196
 }
@@ -200,7 +200,7 @@ function btn_handle(code, floorId, sysId) {
200 200
 	layer.open({
201 201
 		type: 2,
202 202
 		content: "template/HandleEquipmentRepair.html?code=" + code + "&floorId=" + floorId,
203
-		title: '设备维修处理',
203
+		title: '故障维修处理',
204 204
 		area: ['70%', '80%'], //宽高
205 205
 	});
206 206
 }
@@ -210,7 +210,7 @@ function btn_details(ids) {
210 210
 	layer.open({
211 211
 		type: 2,
212 212
 		content: "template/seeEquipmentRepair.html?ids=" + ids,
213
-		title: '设备维修详情',
213
+		title: '故障维修详情',
214 214
 		area: ['70%', '80%'], //宽高
215 215
 	});
216 216
 }
@@ -220,7 +220,7 @@ function btn_assign(proId, wocode) {
220 220
 	layer.open({
221 221
 		type: 2,
222 222
 		content: "template/assignEquipmentRepair.html?&proId=" + proId + "&code=" + wocode,
223
-		title: '设备维修派单',
223
+		title: '故障维修派单',
224 224
 		area: ['70%', '80%'], //宽高
225 225
 	});
226 226
 }

+ 1 - 1
equipmentOperationManage/template/EvaluateEquipmentRepair.html

@@ -11,7 +11,7 @@
11 11
 		<link href="../../css/init.css" rel="stylesheet" />
12 12
 		<link rel="stylesheet" type="text/css" href="../../css/Table/table1.css" />
13 13
 		<link rel="stylesheet" href="../../css/webuploader.css" />
14
-		<title>设备维修评价</title>
14
+		<title>故障维修评价</title>
15 15
 		<style>
16 16
 			.btnn {
17 17
 				background: #2f4050;

+ 1 - 1
equipmentOperationManage/template/HandleEquipmentRepair.html

@@ -14,7 +14,7 @@
14 14
     <link rel="stylesheet" type="text/css" href="../../css/Table/table1.css" />
15 15
     <link href="../../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
16 16
     <link rel="stylesheet" href="../../css/webuploader.css" />
17
-    <title>设备维修处理</title>
17
+    <title>故障维修处理</title>
18 18
     <style>
19 19
         .btnn {
20 20
             background: #2f4050;

+ 1 - 1
equipmentOperationManage/template/HandleReturnRepair.html

@@ -14,7 +14,7 @@
14 14
     <link rel="stylesheet" type="text/css" href="../../css/Table/table1.css" />
15 15
     <link href="../../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
16 16
     <link rel="stylesheet" href="../../css/webuploader.css" />
17
-    <title>设备维修处理</title>
17
+    <title>故障维修处理</title>
18 18
     <style>
19 19
         .btnn {
20 20
             background: #2f4050;

+ 1 - 1
equipmentOperationManage/template/addEquipmentRepair.html

@@ -19,7 +19,7 @@
19 19
 		<link rel="stylesheet" href="../../css/webuploader.css" />
20 20
 		<link rel="stylesheet" type="text/css" href="../../js/bootstrap-treeview/bootstrap-treeview.min.css" />
21 21
 		<!-- <link rel="stylesheet" type="text/css" href="../css/call.css"/> -->
22
-		<title>新增设备维修</title>
22
+		<title>新增故障维修</title>
23 23
 		<style>
24 24
 			.btnn {
25 25
             background: #2f4050;

+ 1 - 1
equipmentOperationManage/template/assignEquipmentRepair.html

@@ -14,7 +14,7 @@
14 14
 		<link rel="stylesheet" type="text/css" href="../../css/Table/table1.css" />
15 15
 		<link href="../../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
16 16
 		<link rel="stylesheet" href="../../css/webuploader.css" />
17
-		<title>设备维修派单</title>
17
+		<title>故障维修派单</title>
18 18
 		<style>
19 19
 			.btnn {
20 20
 				background: #2f4050;

+ 1 - 1
equipmentOperationManage/template/seeEquipmentRepair.html

@@ -3,7 +3,7 @@
3 3
 
4 4
 	<head>
5 5
 		<meta charset="UTF-8">
6
-		<title>设备维修详情</title>
6
+		<title>故障维修详情</title>
7 7
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
8 8
 		<script src="../../Script/Common/huayi.load.js"></script>
9 9
 		<script src="../../Script/Common/huayi.config.js"></script>