Parcourir la source

事件列表修改为工单列表

seimin il y a 1 an
Parent
commit
f24c8890b3

+ 1 - 1
assets/i18n/zh.json

@@ -151,7 +151,7 @@
151 151
             },
152 152
             "incident": {
153 153
                 "MAIN": "事件管理",
154
-                "LIST": "事件列表",
154
+                "LIST": "工单列表",
155 155
                 "NEW": "新建事件"
156 156
             },
157 157
             "problem": {

+ 16 - 16
assets/i18n/zh.json.bak

@@ -109,8 +109,8 @@
109 109
       "SHOWUSERS": "显示离线用户",
110 110
       "EMAILALERT": "E-mail告警",
111 111
       "SMSALERT": "短信告警",
112
-      "SAVE" : "保存设置"     
113
-    }  
112
+      "SAVE" : "保存设置"
113
+    }
114 114
   },
115 115
   "sidebar": {
116 116
     "heading": {
@@ -131,7 +131,7 @@
131 131
       },
132 132
       "incident":{
133 133
         "MAIN": "事件管理",
134
-        "LIST": "事件列表",
134
+        "LIST": "工单列表",
135 135
         "NEW": "新建事件"
136 136
       },
137 137
       "problem":{
@@ -262,7 +262,7 @@
262 262
           "LIST": "报表列表"
263 263
         },
264 264
         "menu": "菜单配置",
265
-        "runlog":"系统运行日志"  
265
+        "runlog":"系统运行日志"
266 266
       },
267 267
       "element": {
268 268
       	"MAIN": "UI Elements",
@@ -350,20 +350,20 @@
350 350
         		"MAIN": "Sample Link 1",
351 351
         		"LINK1" : "Link 1",
352 352
         		"LINK2" : "Link 2",
353
-        		"LINK3" : "Link 3"         		
353
+        		"LINK3" : "Link 3"
354 354
         	},
355 355
         	"link2" : {
356 356
         		"MAIN": "Sample Link 2",
357 357
         		"LINK1" : "Link 1",
358 358
         		"LINK2" : "Link 2",
359
-        		"LINK3" : "Link 3"        		
359
+        		"LINK3" : "Link 3"
360 360
         	},
361 361
         	"link3" : {
362 362
         		"MAIN": "Sample Link 3",
363 363
         		"LINK1" : "Link 1",
364 364
         		"LINK2" : "Link 2",
365
-        		"LINK3" : "Link 3"       		
366
-        	}        	
365
+        		"LINK3" : "Link 3"
366
+        	}
367 367
         },
368 368
         "Item2": {
369 369
         	"MAIN": "Item 2",
@@ -371,20 +371,20 @@
371 371
         		"MAIN": "Sample Link 1",
372 372
         		"LINK1" : "Link 1",
373 373
         		"LINK2" : "Link 2",
374
-        		"LINK3" : "Link 3"        		
374
+        		"LINK3" : "Link 3"
375 375
         	},
376 376
         	"link2" : {
377 377
         		"MAIN": "Sample Link 2",
378 378
         		"LINK1" : "Link 1",
379 379
         		"LINK2" : "Link 2",
380
-        		"LINK3" : "Link 3"        		
380
+        		"LINK3" : "Link 3"
381 381
         	},
382 382
         	"link3" : {
383 383
         		"MAIN": "Sample Link 3",
384 384
         		"LINK1" : "Link 1",
385 385
         		"LINK2" : "Link 2",
386
-        		"LINK3" : "Link 3"         		
387
-        	}        	
386
+        		"LINK3" : "Link 3"
387
+        	}
388 388
         },
389 389
         "Item3": {
390 390
         	"MAIN": "Item 3",
@@ -392,20 +392,20 @@
392 392
         		"MAIN": "Sample Link 1",
393 393
         		"LINK1" : "Link 1",
394 394
         		"LINK2" : "Link 2",
395
-        		"LINK3" : "Link 3"        		
395
+        		"LINK3" : "Link 3"
396 396
         	},
397 397
         	"link2" : {
398 398
         		"MAIN": "Sample Link 2",
399 399
         		"LINK1" : "Link 1",
400 400
         		"LINK2" : "Link 2",
401
-        		"LINK3" : "Link 3"        		
401
+        		"LINK3" : "Link 3"
402 402
         	},
403 403
         	"link3" : {
404 404
         		"MAIN": "Sample Link 3",
405 405
         		"LINK1" : "Link 1",
406 406
         		"LINK2" : "Link 2",
407
-        		"LINK3" : "Link 3"        		
408
-        	}        	
407
+        		"LINK3" : "Link 3"
408
+        	}
409 409
         }
410 410
       },
411 411
       "maps": {

+ 1 - 1
assets/js/config.router.js

@@ -304,7 +304,7 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
304 304
                 ncyBreadcrumb: {
305 305
                     label: 'desk'
306 306
                 }
307
-                // 告警转事件列表
307
+                // 告警转工单列表
308 308
             }).state('app.desk.jry_emergency', {
309 309
                 url: '/jry_emergency',
310 310
                 templateUrl: "assets/views/desk/jry_emergency.html",

+ 12 - 12
assets/js/controllers/business/jry_ceshiCtrl.js

@@ -417,7 +417,7 @@ sysFormly.controller('jry_ceshiFormCtrl', ['$rootScope', '$scope', '$parse', '$f
417 417
                     }
418 418
                     switch ($scope.formData.url) {
419 419
                         case "create":
420
-                            //vm.model["initUser"]=$rootScope.user.id;                        
420
+                            //vm.model["initUser"]=$rootScope.user.id;
421 421
                             //addData
422 422
                             // if (vm.model.id) {
423 423
                             //     if ($stateParams.formKey == "system_add_menu") {
@@ -663,10 +663,10 @@ sysFormly.controller('jry_ceshiFormCtrl', ['$rootScope', '$scope', '$parse', '$f
663 663
                             });
664 664
                         })(vm.model);
665 665
 
666
-                        // console.log("$scope.formData="+$scope.formData);  
666
+                        // console.log("$scope.formData="+$scope.formData);
667 667
                         switch ($scope.formData.url) {
668 668
                             case "create":
669
-                                //vm.model["initUser"]=$rootScope.user.id;                        
669
+                                //vm.model["initUser"]=$rootScope.user.id;
670 670
                                 //addData
671 671
                                 serviceWatch.addData($scope.formData.modelName, vm.model).then(function(response) {
672 672
                                     if (response) {
@@ -804,7 +804,7 @@ sysFormly.controller('jry_ceshiFormCtrl', ['$rootScope', '$scope', '$parse', '$f
804 804
             //     }
805 805
             // });
806 806
         } else {
807
-            // 
807
+            //
808 808
             if (angular.isDefined(fieldsWatch) && fieldsWatch.length > 0) {
809 809
                 var vmForm = {
810 810
                     fields: fieldsWatch,
@@ -853,7 +853,7 @@ sysFormly.controller('jry_ceshiFormCtrl', ['$rootScope', '$scope', '$parse', '$f
853 853
                                 //options:[{"id":"false","name":"不取消"},{"id":"true","name":"取消"}],
854 854
                                 // refresh:function(){
855 855
                                 //     return [{"id":1,"name":"事件","code":1},{"id":2,"name":"问题","code":2},{"id":3,"name":"配置","code":3},{"id":4,"name":"服务级别","code":4},{"id":5,"name":"内部需求","code":5}];
856
-                                // },  
856
+                                // },
857 857
                                 //options:[{"id":1,"name":"事件","code":1},{"id":2,"name":"问题","code":2},{"id":3,"name":"配置","code":3},{"id":4,"name":"服务级别","code":4},{"id":5,"name":"内部需求","code":5}],
858 858
                                 valueProp: "id",
859 859
                                 labelProp: "name",
@@ -1005,7 +1005,7 @@ sysFormly.controller('jry_ceshiFormCtrl', ['$rootScope', '$scope', '$parse', '$f
1005 1005
                         //     className:'col-xs-3',
1006 1006
                         //     templateOptions:{
1007 1007
                         //         label:'关联事件工单',
1008
-                        //         modalTitle:'事件列表',
1008
+                        //         modalTitle:'工单列表',
1009 1009
                         //         fetchItems:function(filterData,APIService){
1010 1010
                         //             return APIService.fetchDataList('incident',filterData);
1011 1011
                         //         },
@@ -1021,9 +1021,9 @@ sysFormly.controller('jry_ceshiFormCtrl', ['$rootScope', '$scope', '$parse', '$f
1021 1021
                         //                     { name:'influence.name', displayName:'影响度', width:80},
1022 1022
                         //                     { name:'priority.name', displayName:'优先级', width:80},
1023 1023
                         //                     { name:'handlerUser.name', displayName:'当前处理人', width:100},
1024
-                        //                     { name:'acceptDate', displayName:'创建时间', width:100}                                        
1024
+                        //                     { name:'acceptDate', displayName:'创建时间', width:100}
1025 1025
                         //         ],
1026
-                        //         displayName:'title', 
1026
+                        //         displayName:'title',
1027 1027
                         //         onClick:function(val, options, field, event , model){
1028 1028
                         //             //model.start_code++;
1029 1029
                         //             console.log(options);
@@ -1061,7 +1061,7 @@ sysFormly.controller('jry_ceshiFormCtrl', ['$rootScope', '$scope', '$parse', '$f
1061 1061
                         //             if(angular.isUndefined(field.form.dropState)){
1062 1062
                         //                 field.form.dropState=false;
1063 1063
                         //             }
1064
-                        //             field.form.dropState=!field.form.dropState;  
1064
+                        //             field.form.dropState=!field.form.dropState;
1065 1065
                         //             console.log(field);
1066 1066
                         //         }
1067 1067
                         //     }
@@ -1084,7 +1084,7 @@ sysFormly.controller('jry_ceshiFormCtrl', ['$rootScope', '$scope', '$parse', '$f
1084 1084
                         //         pkey:'change'
1085 1085
                         //     }
1086 1086
                         // },
1087
-                        // {   
1087
+                        // {
1088 1088
                         //     type: 'ui-label',
1089 1089
                         //     key: 'title',
1090 1090
                         //     className: 'col-xs-4',
@@ -1094,7 +1094,7 @@ sysFormly.controller('jry_ceshiFormCtrl', ['$rootScope', '$scope', '$parse', '$f
1094 1094
                         //     }
1095 1095
                         // },
1096 1096
                         // //关联发布单号
1097
-                        // //新建发布                    
1097
+                        // //新建发布
1098 1098
                         // {
1099 1099
                         //     key: 'droplist',
1100 1100
                         //     type: 'ui-dropfiletable',
@@ -1130,7 +1130,7 @@ sysFormly.controller('jry_ceshiFormCtrl', ['$rootScope', '$scope', '$parse', '$f
1130 1130
                         //                     label: '计划开始时间',
1131 1131
                         //                     required: true
1132 1132
                         //                 }
1133
-                        //             },   
1133
+                        //             },
1134 1134
                         //             {
1135 1135
                         //                 className: 'col-xs-3',
1136 1136
                         //                 type: 'ui-datepicker',

+ 3 - 3
assets/js/controllers/businessConfiguration/deptBindUserCtrl.js

@@ -185,7 +185,7 @@ app.controller("deptBindUserCtrl", [
185 185
         ) {
186 186
           // -------------------start----------------------
187 187
           $scope.title = "复制科室派单组合";
188
-          //事件列表数据存储
188
+          //工单列表数据存储
189 189
           $scope.incidentModel = {
190 190
             branch: selectdata.branchObj, //院区
191 191
             department: selectdata.deptArr, //科室
@@ -623,7 +623,7 @@ app.controller("deptBindUserCtrl", [
623 623
         ) {
624 624
           // -------------------start----------------------
625 625
           $scope.title = "修改科室派单组合";
626
-          //事件列表数据存储
626
+          //工单列表数据存储
627 627
           $scope.incidentModel = {
628 628
             branch: selectdata.branchObj, //院区
629 629
             department: selectdata.deptArr, //科室
@@ -1101,7 +1101,7 @@ app.controller("deptBindUserCtrl", [
1101 1101
         ) {
1102 1102
           // -------------------start----------------------
1103 1103
           $scope.title = "新增科室派单组合";
1104
-          //事件列表数据存储
1104
+          //工单列表数据存储
1105 1105
           $scope.incidentModel = {
1106 1106
             branch: "", //院区
1107 1107
             department: [], //科室

+ 1 - 1
assets/js/controllers/customform/customformCtrl.js

@@ -7305,7 +7305,7 @@ appFormly.config(function config(formlyConfigProvider) {
7305 7305
       },
7306 7306
     ],
7307 7307
   });
7308
-  //待处理事件列表
7308
+  //待处理工单列表
7309 7309
   formlyConfigProvider.setType({
7310 7310
     name: "ui-ngtable",
7311 7311
     templateUrl: "assets/views/customform/tpl/ui-ngtable.html",

+ 2 - 2
assets/js/controllers/customform/customformDetailCtrl.js

@@ -423,7 +423,7 @@ appFormly.controller('CustomformDetailCtrl', ['$scope', 'i18nService', '$rootSco
423 423
                 $state.go('app.desk.record');
424 424
             }else{
425 425
                 $state.go($scope.formData.cancelUrl);
426
-            }           
426
+            }
427 427
             event.preventDefault();
428 428
         };
429 429
         vm.submit = function(data, style) {
@@ -812,7 +812,7 @@ appFormly.controller('CustomformDetailCtrl', ['$scope', 'i18nService', '$rootSco
812 812
                             className: 'col-xs-3',
813 813
                             templateOptions: {
814 814
                                 label: '关联事件工单',
815
-                                modalTitle: '事件列表',
815
+                                modalTitle: '工单列表',
816 816
                                 fetchItems: function(filterData, APIService) {
817 817
                                     return APIService.fetchDataList('incident', filterData);
818 818
                                 },

+ 1 - 1
assets/js/controllers/incident/incidentCtrl.js

@@ -1323,7 +1323,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
1323 1323
             var a = document.createElement('a');
1324 1324
             a.href = fileURL;
1325 1325
             a.target = '_blank';
1326
-            a.download = '事件列表.xls';
1326
+            a.download = '工单列表.xls';
1327 1327
             document.body.appendChild(a);
1328 1328
             a.click();
1329 1329
         }).error(function (data, status, headers, config) {

+ 18 - 18
assets/js/controllers/inspect/inspectForm.js

@@ -771,14 +771,14 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
771 771
             //         var _ = window._;
772 772
             //         vm.model = (function filter(obj) {
773 773
             //             var dateTransKeys = [];
774
-            //             var filtered = _.pick(obj, function (v, k, obj) { 
774
+            //             var filtered = _.pick(obj, function (v, k, obj) {
775 775
             //                 if(_.isDate(v)){
776 776
             //                     dateTransKeys.push(k);
777 777
             //                 }
778
-            //                 return angular.isDefined(v) && v !== null && (angular.isArray(v)?v.length>0:true) && (_.isPlainObject(v)?(!_.isEmpty(v)):true);  
778
+            //                 return angular.isDefined(v) && v !== null && (angular.isArray(v)?v.length>0:true) && (_.isPlainObject(v)?(!_.isEmpty(v)):true);
779 779
             //             });
780 780
 
781
-            //             return _.cloneDeep(filtered, function (v, index, object) { 
781
+            //             return _.cloneDeep(filtered, function (v, index, object) {
782 782
             //                 if(angular.isArray(dateTransKeys)&&dateTransKeys.length>0){
783 783
             //                     angular.forEach(dateTransKeys,function(item){
784 784
             //                         v[item] = moment(v[item]).format('YYYY-MM-DD HH:mm:ss');
@@ -786,14 +786,14 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
786 786
             //                     dateTransKey = [];
787 787
             //                     return v;
788 788
             //                 }
789
-            //                 return !(_.isEmpty(filtered)) && v !== filtered && _.isPlainObject(v) ? filter(v) : undefined; 
789
+            //                 return !(_.isEmpty(filtered)) && v !== filtered && _.isPlainObject(v) ? filter(v) : undefined;
790 790
             //             });
791 791
             //         })(vm.model);
792 792
 
793
-            //          // console.log("$scope.formData="+$scope.formData);  
793
+            //          // console.log("$scope.formData="+$scope.formData);
794 794
             //         switch($scope.formData.url){
795 795
             //                 case "create" :
796
-            //                     //vm.model["initUser"]=$rootScope.user.id;                        
796
+            //                     //vm.model["initUser"]=$rootScope.user.id;
797 797
             //                     //addData
798 798
             //                     serviceWatch.addData($scope.formData.modelName,vm.model).then(function(response){
799 799
             //                         if(response){
@@ -812,7 +812,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
812 812
             //                                   type: "error",
813 813
             //                                   confirmButtonColor: "#DD6B55"
814 814
             //                                 });
815
-            //                             }                    
815
+            //                             }
816 816
             //                         }else{
817 817
             //                             SweetAlert.swal({
818 818
             //                               title: "系统错误",
@@ -846,7 +846,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
846 846
             //                                   type: "error",
847 847
             //                                   confirmButtonColor: "#DD6B55"
848 848
             //                                 });
849
-            //                             }                            
849
+            //                             }
850 850
             //                         }else{
851 851
             //                             SweetAlert.swal({
852 852
             //                               title: "系统错误",
@@ -858,7 +858,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
858 858
             //                         }
859 859
             //                         $scope.ldloading[style.replace('-', '_')] = false;
860 860
             //                     });
861
-            //                   break;   
861
+            //                   break;
862 862
             //                 case "close" :
863 863
             //                     $state.go($scope.formData.cancelUrl);
864 864
             //                     break;
@@ -913,7 +913,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
913 913
                 }
914 914
             });
915 915
         } else {
916
-            // 
916
+            //
917 917
             if (angular.isDefined(fieldsWatch) && fieldsWatch.length > 0) {
918 918
                 var vmForm = {
919 919
                     fields: fieldsWatch,
@@ -962,7 +962,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
962 962
                                 //options:[{"id":"false","name":"不取消"},{"id":"true","name":"取消"}],
963 963
                                 // refresh:function(){
964 964
                                 //     return [{"id":1,"name":"事件","code":1},{"id":2,"name":"问题","code":2},{"id":3,"name":"配置","code":3},{"id":4,"name":"服务级别","code":4},{"id":5,"name":"内部需求","code":5}];
965
-                                // },  
965
+                                // },
966 966
                                 //options:[{"id":1,"name":"事件","code":1},{"id":2,"name":"问题","code":2},{"id":3,"name":"配置","code":3},{"id":4,"name":"服务级别","code":4},{"id":5,"name":"内部需求","code":5}],
967 967
                                 valueProp: "id",
968 968
                                 labelProp: "name",
@@ -1114,7 +1114,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
1114 1114
                         //     className:'col-xs-3',
1115 1115
                         //     templateOptions:{
1116 1116
                         //         label:'关联事件工单',
1117
-                        //         modalTitle:'事件列表',
1117
+                        //         modalTitle:'工单列表',
1118 1118
                         //         fetchItems:function(filterData,APIService){
1119 1119
                         //             return APIService.fetchDataList('incident',filterData);
1120 1120
                         //         },
@@ -1130,9 +1130,9 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
1130 1130
                         //                     { name:'influence.name', displayName:'影响度', width:80},
1131 1131
                         //                     { name:'priority.name', displayName:'优先级', width:80},
1132 1132
                         //                     { name:'handlerUser.name', displayName:'当前处理人', width:100},
1133
-                        //                     { name:'acceptDate', displayName:'创建时间', width:100}                                        
1133
+                        //                     { name:'acceptDate', displayName:'创建时间', width:100}
1134 1134
                         //         ],
1135
-                        //         displayName:'title', 
1135
+                        //         displayName:'title',
1136 1136
                         //         onClick:function(val, options, field, event , model){
1137 1137
                         //             //model.start_code++;
1138 1138
                         //             console.log(options);
@@ -1170,7 +1170,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
1170 1170
                         //             if(angular.isUndefined(field.form.dropState)){
1171 1171
                         //                 field.form.dropState=false;
1172 1172
                         //             }
1173
-                        //             field.form.dropState=!field.form.dropState;  
1173
+                        //             field.form.dropState=!field.form.dropState;
1174 1174
                         //             console.log(field);
1175 1175
                         //         }
1176 1176
                         //     }
@@ -1193,7 +1193,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
1193 1193
                         //         pkey:'change'
1194 1194
                         //     }
1195 1195
                         // },
1196
-                        // {   
1196
+                        // {
1197 1197
                         //     type: 'ui-label',
1198 1198
                         //     key: 'title',
1199 1199
                         //     className: 'col-xs-4',
@@ -1203,7 +1203,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
1203 1203
                         //     }
1204 1204
                         // },
1205 1205
                         // //关联发布单号
1206
-                        // //新建发布                    
1206
+                        // //新建发布
1207 1207
                         // {
1208 1208
                         //     key: 'droplist',
1209 1209
                         //     type: 'ui-dropfiletable',
@@ -1239,7 +1239,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
1239 1239
                         //                     label: '计划开始时间',
1240 1240
                         //                     required: true
1241 1241
                         //                 }
1242
-                        //             },   
1242
+                        //             },
1243 1243
                         //             {
1244 1244
                         //                 className: 'col-xs-3',
1245 1245
                         //                 type: 'ui-datepicker',

+ 1 - 1
assets/js/controllers/knowledge/knowledgeform.js

@@ -1110,7 +1110,7 @@ sysFormly.controller('knowledgeformCtrl', ['$rootScope', '$scope', '$parse', '$f
1110 1110
                         //     className:'col-xs-3',
1111 1111
                         //     templateOptions:{
1112 1112
                         //         label:'关联事件工单',
1113
-                        //         modalTitle:'事件列表',
1113
+                        //         modalTitle:'工单列表',
1114 1114
                         //         fetchItems:function(filterData,APIService){
1115 1115
                         //             return APIService.fetchDataList('incident',filterData);
1116 1116
                         //         },

+ 1 - 1
assets/js/controllers/mainCtrl.js

@@ -3772,7 +3772,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
3772 3772
           }
3773 3773
           // 是否连续建单
3774 3774
           $scope.isBuildOrderAgagin = false;
3775
-          //事件列表数据存储
3775
+          //工单列表数据存储
3776 3776
           $scope.incidentModel = {
3777 3777
             department: "", //报修科室
3778 3778
             requester: "", //报修人

+ 1 - 1
assets/js/controllers/means/meansdetailCtrl.js

@@ -672,7 +672,7 @@ appFormly.controller('meansdetailCtrl', ['$scope', 'i18nService', '$rootScope',
672 672
                             className: 'col-xs-3',
673 673
                             templateOptions: {
674 674
                                 label: '关联事件工单',
675
-                                modalTitle: '事件列表',
675
+                                modalTitle: '工单列表',
676 676
                                 fetchItems: function(filterData, APIService) {
677 677
                                     return APIService.fetchDataList('incident', filterData);
678 678
                                 },

+ 2 - 2
assets/js/controllers/means/meansoutCtrl.js

@@ -701,7 +701,7 @@ app.controller('meansapplyListCtrl', ["$scope", "$http", "i18nService", "$rootSc
701 701
             //         var a = document.createElement('a');
702 702
             //         a.href = fileURL;
703 703
             //         a.target = '_blank';
704
-            //         a.download = '事件列表.xls';
704
+            //         a.download = '工单列表.xls';
705 705
             //         document.body.appendChild(a);
706 706
             //         a.click();
707 707
             //     })
@@ -727,7 +727,7 @@ app.controller('meansapplyListCtrl', ["$scope", "$http", "i18nService", "$rootSc
727 727
                 var a = document.createElement('a');
728 728
                 a.href = fileURL;
729 729
                 a.target = '_blank';
730
-                a.download = '事件列表.xls';
730
+                a.download = '工单列表.xls';
731 731
                 document.body.appendChild(a);
732 732
                 a.click();
733 733
             }).error(function(data, status, headers, config) {

+ 1 - 1
assets/js/controllers/newOrder/newOrderCtrl.js

@@ -19,7 +19,7 @@ app.controller('newOrderCtrl', ["$scope", "$http", "i18nService", "$rootScope",
19 19
         return moment(time).format('YYYY-MM-DD HH:mm');
20 20
     }
21 21
 
22
-    //事件列表数据存储
22
+    //工单列表数据存储
23 23
     $scope.incidentModel = {
24 24
         department: ''
25 25
     }

+ 1 - 1
assets/js/controllers/system/selfDefinedReport/selfDefinedReportCtrl.js

@@ -848,7 +848,7 @@ app.controller('selfDefinedReportCtrl', ["$scope", "$http", "i18nService", "$roo
848 848
             var a = document.createElement('a');
849 849
             a.href = fileURL;
850 850
             a.target = '_blank';
851
-            a.download = '事件列表.xls';
851
+            a.download = '工单列表.xls';
852 852
             document.body.appendChild(a);
853 853
             a.click();
854 854
         }).error(function (data, status, headers, config) {

+ 1 - 1
assets/js/controllers/system/systemFormCtrl.js

@@ -1412,7 +1412,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
1412 1412
                         //     className:'col-xs-3',
1413 1413
                         //     templateOptions:{
1414 1414
                         //         label:'关联事件工单',
1415
-                        //         modalTitle:'事件列表',
1415
+                        //         modalTitle:'工单列表',
1416 1416
                         //         fetchItems:function(filterData,APIService){
1417 1417
                         //             return APIService.fetchDataList('incident',filterData);
1418 1418
                         //         },

+ 14 - 14
assets/js/controllers/task/taskFormCtr.js

@@ -763,7 +763,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
763 763
                                     liableArr.push({id:vm.model.taskMonth.liable[i]})
764 764
                                 }
765 765
                                 vm.model.taskMonth.liable=liableArr;
766
-                            }                                                     
766
+                            }
767 767
                             api_user_data.updData("taskMonth",vm.model).then(function(res){
768 768
                                 if(res.status==200){
769 769
                                     SweetAlert.swal({
@@ -793,11 +793,11 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
793 793
                             }, function() {
794 794
                                 $state.go($scope.formData.cancelUrl);
795 795
                           });
796
-                        }                  
796
+                        }
797 797
                         break;
798 798
                         // 反馈
799 799
                     case "feedback":
800
-                        // 反馈时间赋予    
800
+                        // 反馈时间赋予
801 801
                         if(vm.model.taskMonth.feedback!=jry_modelWatch.model.taskMonth.feedback){
802 802
                             vm.model.taskMonth.backTime=moment(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss')
803 803
                         }
@@ -809,7 +809,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
809 809
                         }
810 810
                         if(vm.model.taskMonth.feedback4!=jry_modelWatch.model.taskMonth.feedback4){
811 811
                             vm.model.taskMonth.backTime4=moment(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss')
812
-                        }       
812
+                        }
813 813
                         vm.model.taskMonth.state.id=$scope.stateListData[1];
814 814
                         api_user_data.updData("taskMonth",vm.model).then(function(res){
815 815
                             if(res.status==200){
@@ -869,7 +869,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
869 869
                         }
870 870
                         if(vm.model.taskSub.feedback4!=jry_modelWatch.model.taskSub.feedback4){
871 871
                             vm.model.taskSub.backTime4=moment(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss')
872
-                        } 
872
+                        }
873 873
                         vm.model.taskSub.state.id=$scope.stateListData1[2];
874 874
                         console.log($scope.stateListData1[2])
875 875
                         api_user_data.updData("taskSub",vm.model).then(function(res){
@@ -1003,7 +1003,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
1003 1003
                 }
1004 1004
             });
1005 1005
         } else {
1006
-            // 
1006
+            //
1007 1007
             if (angular.isDefined(fieldsWatch) && fieldsWatch.length > 0) {
1008 1008
                 var vmForm = {
1009 1009
                     fields: fieldsWatch,
@@ -1052,7 +1052,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
1052 1052
                                 //options:[{"id":"false","name":"不取消"},{"id":"true","name":"取消"}],
1053 1053
                                 // refresh:function(){
1054 1054
                                 //     return [{"id":1,"name":"事件","code":1},{"id":2,"name":"问题","code":2},{"id":3,"name":"配置","code":3},{"id":4,"name":"服务级别","code":4},{"id":5,"name":"内部需求","code":5}];
1055
-                                // },  
1055
+                                // },
1056 1056
                                 //options:[{"id":1,"name":"事件","code":1},{"id":2,"name":"问题","code":2},{"id":3,"name":"配置","code":3},{"id":4,"name":"服务级别","code":4},{"id":5,"name":"内部需求","code":5}],
1057 1057
                                 valueProp: "id",
1058 1058
                                 labelProp: "name",
@@ -1204,7 +1204,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
1204 1204
                         //     className:'col-xs-3',
1205 1205
                         //     templateOptions:{
1206 1206
                         //         label:'关联事件工单',
1207
-                        //         modalTitle:'事件列表',
1207
+                        //         modalTitle:'工单列表',
1208 1208
                         //         fetchItems:function(filterData,APIService){
1209 1209
                         //             return APIService.fetchDataList('incident',filterData);
1210 1210
                         //         },
@@ -1220,9 +1220,9 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
1220 1220
                         //                     { name:'influence.name', displayName:'影响度', width:80},
1221 1221
                         //                     { name:'priority.name', displayName:'优先级', width:80},
1222 1222
                         //                     { name:'handlerUser.name', displayName:'当前处理人', width:100},
1223
-                        //                     { name:'acceptDate', displayName:'创建时间', width:100}                                        
1223
+                        //                     { name:'acceptDate', displayName:'创建时间', width:100}
1224 1224
                         //         ],
1225
-                        //         displayName:'title', 
1225
+                        //         displayName:'title',
1226 1226
                         //         onClick:function(val, options, field, event , model){
1227 1227
                         //             //model.start_code++;
1228 1228
                         //             console.log(options);
@@ -1260,7 +1260,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
1260 1260
                         //             if(angular.isUndefined(field.form.dropState)){
1261 1261
                         //                 field.form.dropState=false;
1262 1262
                         //             }
1263
-                        //             field.form.dropState=!field.form.dropState;  
1263
+                        //             field.form.dropState=!field.form.dropState;
1264 1264
                         //             console.log(field);
1265 1265
                         //         }
1266 1266
                         //     }
@@ -1283,7 +1283,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
1283 1283
                         //         pkey:'change'
1284 1284
                         //     }
1285 1285
                         // },
1286
-                        // {   
1286
+                        // {
1287 1287
                         //     type: 'ui-label',
1288 1288
                         //     key: 'title',
1289 1289
                         //     className: 'col-xs-4',
@@ -1293,7 +1293,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
1293 1293
                         //     }
1294 1294
                         // },
1295 1295
                         // //关联发布单号
1296
-                        // //新建发布                    
1296
+                        // //新建发布
1297 1297
                         // {
1298 1298
                         //     key: 'droplist',
1299 1299
                         //     type: 'ui-dropfiletable',
@@ -1329,7 +1329,7 @@ sysFormly.controller('taskFormCtrl', ['$rootScope', '$scope', '$parse', '$filter
1329 1329
                         //                     label: '计划开始时间',
1330 1330
                         //                     required: true
1331 1331
                         //                 }
1332
-                        //             },   
1332
+                        //             },
1333 1333
                         //             {
1334 1334
                         //                 className: 'col-xs-3',
1335 1335
                         //                 type: 'ui-datepicker',

+ 1 - 1
assets/js/controllers/working/workingFormCtr.js

@@ -1385,7 +1385,7 @@ sysFormly.controller("workingFormCtrl", [
1385 1385
             //     className:'col-xs-3',
1386 1386
             //     templateOptions:{
1387 1387
             //         label:'关联事件工单',
1388
-            //         modalTitle:'事件列表',
1388
+            //         modalTitle:'工单列表',
1389 1389
             //         fetchItems:function(filterData,APIService){
1390 1390
             //             return APIService.fetchDataList('incident',filterData);
1391 1391
             //         },

+ 1 - 1
assets/js/main.js

@@ -713,7 +713,7 @@ app.factory('api_flow', ['FlowRestangular', function (FlowRestangular) {
713 713
     var r_data = FlowRestangular.all("");
714 714
 
715 715
     return {
716
-        // 事件列表数量
716
+        // 工单列表数量
717 717
         count: function (data) {
718 718
             return r_data.customPOST(data, 'incident/list/count', {});
719 719
         },

+ 19 - 19
assets/views/dashboard/dashboard.html

@@ -4,7 +4,7 @@
4 4
         -webkit-box-sizing: border-box;
5 5
         box-sizing: border-box;
6 6
     }
7
-    
7
+
8 8
     [ng-drag] {
9 9
         -moz-user-select: -moz-none;
10 10
         -khtml-user-select: none;
@@ -12,7 +12,7 @@
12 12
         -ms-user-select: none;
13 13
         user-select: none;
14 14
     }
15
-    
15
+
16 16
     [ng-drag] {
17 17
         width: 100%;
18 18
         height: 300px;
@@ -26,20 +26,20 @@
26 26
     /*[ng-drag].one {
27 27
         background: rgba(255, 0, 0, 0.5);
28 28
     }
29
-    
29
+
30 30
     [ng-drag].two {
31 31
         background: rgba(0, 255, 0, 0.5);
32 32
     }
33
-    
33
+
34 34
     [ng-drag].three {
35 35
         background: rgba(0, 0, 255, 0.5);
36 36
     }
37 37
     */
38
-    
38
+
39 39
     [ng-drag].dragging {
40 40
         opacity: 0.5;
41 41
     }
42
-    
42
+
43 43
     [ng-drop] {
44 44
         /*background: rgba(0, 0, 0, 0.25);*/
45 45
         /*text-align: center;*/
@@ -51,11 +51,11 @@
51 51
         float: left;
52 52
         margin-bottom: 10px;
53 53
     }
54
-    
54
+
55 55
     [ng-drop].drag-enter {
56 56
         border: solid 3px red;
57 57
     }
58
-    
58
+
59 59
     [ng-drop] span.title {
60 60
         display: block;
61 61
         /*position: absolute;*/
@@ -69,16 +69,16 @@
69 69
     /* [ng-drop] div {
70 70
         position: relative;
71 71
     } */
72
-    
72
+
73 73
     .draglist {
74 74
         display: inline-block;
75 75
         margin: 0 auto;
76 76
     }
77
-    
77
+
78 78
     .StepTitle {
79 79
         padding-bottom: 5px;
80 80
     }
81
-    
81
+
82 82
     .slide {
83 83
         width: 200px;
84 84
         height: 49px;
@@ -87,7 +87,7 @@
87 87
         overflow: hidden;
88 88
         display: inline;
89 89
     }
90
-    
90
+
91 91
     .slide ul {
92 92
         text-align: left;
93 93
         margin: 0px;
@@ -95,7 +95,7 @@
95 95
         width: 220px;
96 96
         height: 49px;
97 97
     }
98
-    
98
+
99 99
     .slide li {
100 100
         height: 49px;
101 101
         line-height: 49px;
@@ -106,7 +106,7 @@
106 106
         list-style: none;
107 107
         cursor: pointer;
108 108
     }
109
-    
109
+
110 110
     .slide li:hover {
111 111
         background: red;
112 112
     }
@@ -152,9 +152,9 @@
152 152
                                     </div>
153 153
                                     </span>
154 154
                                 <span class="fontsizes-14">
155
-                                        <p class="StepTitle" style="font-weight: bold;padding-top:0px;display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;">事件列表</p>
155
+                                        <p class="StepTitle" style="font-weight: bold;padding-top:0px;display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;">工单列表</p>
156 156
                                         <p class="text-small" style="color:black;display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;">
157
-                                                事件列表大屏展示
157
+                                                工单列表大屏展示
158 158
                                         </p>
159 159
                                     </span>
160 160
                             </div>
@@ -203,9 +203,9 @@
203 203
                     <div class="panel panel-white no-radius text-center" ng-click="largedash('leftbottom')">
204 204
                         <a class="panel-body">
205 205
                             <img src="assets/images/list.png" />
206
-                            <h2 class="StepTitle" style="font-weight: bold;">事件列表</h2>
206
+                            <h2 class="StepTitle" style="font-weight: bold;">工单列表</h2>
207 207
                             <p class="text-small" style="color:black">
208
-                                事件列表大屏展示
208
+                                工单列表大屏展示
209 209
                             </p>
210 210
                         </a>
211 211
                     </div>
@@ -242,7 +242,7 @@
242 242
                             <div class="bg-wechatdash text-center" ng-click="inWechat()">
243 243
                                 <div class="fontsizes-18 dashpad-15 fontcolor-six fontweight-600">
244 244
                                     <div>微信报障:<span class="fontsizes-28">{{dashboardcount.wechatWarningCount}}</span></div>
245
-                    
245
+
246 246
                                 </div>
247 247
                             </div>
248 248
                         </div>

+ 2 - 2
assets/views/incident/list.html

@@ -2,8 +2,8 @@
2 2
     <section id="page-title">
3 3
         <div class="row">
4 4
             <div class="col-sm-8">
5
-                <h1 class="mainTitle">事件列表
6
-                    <i tooltip='事件列表,点击操作处理任务' tooltip-placement="right"
5
+                <h1 class="mainTitle">工单列表
6
+                    <i tooltip='工单列表,点击操作处理任务' tooltip-placement="right"
7 7
                         class="fa  ti-help-alt margin-left-10 fontcolor-five pointfont"></i>
8 8
                 </h1>
9 9
             </div>

+ 1 - 1
assets/views/means/cmdbauditdetail.html

@@ -3,7 +3,7 @@
3 3
         <div class="row">
4 4
             <div class="col-xs-12">
5 5
                 <h1 class="mainTitle">配置安全审计
6
-                    <i tooltip='事件列表,点击操作处理任务' tooltip-placement="right" class="fa  ti-help-alt margin-left-10 fontcolor-five pointfont"></i>
6
+                    <i tooltip='工单列表,点击操作处理任务' tooltip-placement="right" class="fa  ti-help-alt margin-left-10 fontcolor-five pointfont"></i>
7 7
                 </h1>
8 8
             </div>
9 9
         </div>

+ 1 - 1
assets/views/means/cmdbauditeditor.html

@@ -3,7 +3,7 @@
3 3
         <div class="row">
4 4
             <div class="col-xs-12">
5 5
                 <h1 class="mainTitle">配置安全审计
6
-                    <i tooltip='事件列表,点击操作处理任务' tooltip-placement="right" class="fa  ti-help-alt margin-left-10 fontcolor-five pointfont"></i>
6
+                    <i tooltip='工单列表,点击操作处理任务' tooltip-placement="right" class="fa  ti-help-alt margin-left-10 fontcolor-five pointfont"></i>
7 7
                 </h1>
8 8
             </div>
9 9
         </div>

+ 2 - 2
assets/views/newOrder.html

@@ -2,8 +2,8 @@
2 2
     <section id="page-title">
3 3
         <div class="row">
4 4
             <div class="col-sm-8">
5
-                <h1 class="mainTitle">事件列表
6
-                    <!-- <i tooltip='事件列表,点击操作处理任务' tooltip-placement="right"
5
+                <h1 class="mainTitle">工单列表
6
+                    <!-- <i tooltip='工单列表,点击操作处理任务' tooltip-placement="right"
7 7
                         class="fa  ti-help-alt margin-left-10 fontcolor-five pointfont"></i> -->
8 8
                 </h1>
9 9
             </div>

+ 2 - 2
assets/views/report/incident_report.html

@@ -100,7 +100,7 @@
100 100
 
101 101
                         </div>
102 102
                     </div>
103
-                    
103
+
104 104
                     <div class="col-xs-2 col-sm-2 P-0 mr8" ng-if="tap=='YWBB'">
105 105
                         <p>工作组:</p>
106 106
                         <div class="iptSize" style="display:inline">
@@ -177,7 +177,7 @@
177 177
             <!-- 事件趋势分析 -->
178 178
             <div class="incident_cont_body" ng-if="tap=='QSFX'">
179 179
                 <div class="incident_cont_body_TB1">
180
-                    <span tooltip-html-unsafe='<div class="slf">事件总数:事件列表中所有工单(包含已删除)</div><div class="slf">环比增幅:环比上个月增幅</div>' tooltip-placement="top">
180
+                    <span tooltip-html-unsafe='<div class="slf">事件总数:工单列表中所有工单(包含已删除)</div><div class="slf">环比增幅:环比上个月增幅</div>' tooltip-placement="top">
181 181
                         <strong class="i_big">事件数量趋势分析</strong>
182 182
                         <i class="fa ti-help-alt fontcolor-five pointfont"></i>
183 183
                     </span>