|
@@ -75,7 +75,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
75
|
75
|
// $scope.outdata = response.list;
|
76
|
76
|
// }
|
77
|
77
|
// }
|
78
|
|
- // })
|
|
78
|
+ // })
|
79
|
79
|
// }
|
80
|
80
|
// $scope.refreshListData();
|
81
|
81
|
$scope.filterTree = function (data,id) {
|
|
@@ -117,7 +117,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
117
|
117
|
}else{
|
118
|
118
|
$scope.subdata.hasPlace=false
|
119
|
119
|
}
|
120
|
|
-
|
|
120
|
+
|
121
|
121
|
convertchildToTree(branch,'事件分类');
|
122
|
122
|
console.log(branch)
|
123
|
123
|
if(branch.managerUser){
|
|
@@ -156,7 +156,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
156
|
156
|
// //Restangular.
|
157
|
157
|
// $scope.userdata = response.data;
|
158
|
158
|
// });
|
159
|
|
- }
|
|
159
|
+ }
|
160
|
160
|
|
161
|
161
|
};
|
162
|
162
|
$scope.thisParent={};//当前点击节点的父节点
|
|
@@ -221,9 +221,9 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
221
|
221
|
postData.typeList.push({ id: data.id });
|
222
|
222
|
})
|
223
|
223
|
}
|
224
|
|
- }
|
|
224
|
+ }
|
225
|
225
|
};
|
226
|
|
-
|
|
226
|
+
|
227
|
227
|
$scope.addType = function(element) {
|
228
|
228
|
$scope.tree_data = $scope.dataSave.length?angular.copy($scope.dataSave):$scope.tree_data;
|
229
|
229
|
$scope.addcate = true
|
|
@@ -232,8 +232,8 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
232
|
232
|
// templateUrl: 'assets/views/system/tpl/systemclose.html',
|
233
|
233
|
// controller: function($scope, $modalInstance, api_bpm_data){
|
234
|
234
|
// // api_bpm_data.fetchDataList('closecode',filterData).then(function(data){
|
235
|
|
- // // var myData = Restangular.stripRestangular(data);
|
236
|
|
- // // }
|
|
235
|
+ // // var myData = Restangular.stripRestangular(data);
|
|
236
|
+ // // }
|
237
|
237
|
// }
|
238
|
238
|
// });
|
239
|
239
|
}
|
|
@@ -434,7 +434,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
434
|
434
|
// $scope.parentdata = {};
|
435
|
435
|
$scope.try_async_load = function() {
|
436
|
436
|
$scope.my_data = [];
|
437
|
|
-
|
|
437
|
+
|
438
|
438
|
$scope.doing_async = true;
|
439
|
439
|
var data = { "idx": 0, "sum": 1000 };
|
440
|
440
|
api_bpm_data.fetchDataList('incidentcategory', data).then(function(response) {
|
|
@@ -489,7 +489,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
489
|
489
|
};
|
490
|
490
|
$scope.try_async_1load = function() {
|
491
|
491
|
$scope.my_1data = [];
|
492
|
|
-
|
|
492
|
+
|
493
|
493
|
$scope.doing_async = true;
|
494
|
494
|
var data = { "idx": 0, "sum": 1000,inspectionType:{deleteFlag:0} };
|
495
|
495
|
api_bpm_data.fetchDataList('inspectionType', data).then(function(response) {
|
|
@@ -532,7 +532,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
532
|
532
|
// formdata.hasArea = 0;
|
533
|
533
|
// formdata.hasPlace = 0;
|
534
|
534
|
// }
|
535
|
|
-
|
|
535
|
+
|
536
|
536
|
if (formdata.hasPlace==true) {
|
537
|
537
|
formdata.hasPlace = 1;
|
538
|
538
|
} else {
|
|
@@ -548,7 +548,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
548
|
548
|
// formdata.parent = { "id": $scope.selectedTreeNode.parent.id };
|
549
|
549
|
// }
|
550
|
550
|
// console.log($scope.thisParent)
|
551
|
|
-
|
|
551
|
+
|
552
|
552
|
if($scope.selectedChangeCategory){
|
553
|
553
|
formdata['parentCategory'] ={'id':$scope.selectedChangeCategory.id};
|
554
|
554
|
delete formdata.parent
|
|
@@ -581,7 +581,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
581
|
581
|
var filedata = { "incidentcategory": formdata }
|
582
|
582
|
console.log(filedata,$scope.userGroupChecked);
|
583
|
583
|
// return;
|
584
|
|
- api_bpm_data.updData('incidentcategory', filedata).then(function(response) {
|
|
584
|
+ api_user_data.updData('incidentcategory', filedata).then(function(response) {
|
585
|
585
|
if (response) {
|
586
|
586
|
if (response.status == 200) {
|
587
|
587
|
$scope.try_async_load()
|
|
@@ -594,6 +594,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
594
|
594
|
} else {
|
595
|
595
|
SweetAlert.swal({
|
596
|
596
|
title: "修改失败!",
|
|
597
|
+ text: response.msg,
|
597
|
598
|
type: "error"
|
598
|
599
|
})
|
599
|
600
|
}
|
|
@@ -707,11 +708,11 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
707
|
708
|
formdata.handleUser={id:$scope.userGroupCheckedAdd.userCheck.id};
|
708
|
709
|
// delete formdata.group;
|
709
|
710
|
}
|
710
|
|
-
|
|
711
|
+
|
711
|
712
|
var filedata = { "incidentcategory": formdata }
|
712
|
713
|
console.log(filedata);
|
713
|
714
|
// return;
|
714
|
|
- api_bpm_data.addData('incidentcategory', filedata).then(function(response) {
|
|
715
|
+ api_user_data.addData('incidentcategory', filedata).then(function(response) {
|
715
|
716
|
if (response) {
|
716
|
717
|
if (response.status == 200) {
|
717
|
718
|
$scope.userdata = [];
|
|
@@ -721,15 +722,10 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
721
|
722
|
title: "增加成功!",
|
722
|
723
|
type: "success"
|
723
|
724
|
})
|
724
|
|
- } else if (response.status == 408) {
|
725
|
|
- SweetAlert.swal({
|
726
|
|
- title: "增加失败!",
|
727
|
|
- text: response.error,
|
728
|
|
- type: "error"
|
729
|
|
- })
|
730
|
725
|
} else {
|
731
|
726
|
SweetAlert.swal({
|
732
|
727
|
title: "增加失败!",
|
|
728
|
+ text: response.msg,
|
733
|
729
|
type: "error"
|
734
|
730
|
})
|
735
|
731
|
}
|
|
@@ -787,7 +783,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
787
|
783
|
status: 0,
|
788
|
784
|
pageIndex: 0,
|
789
|
785
|
pageSum: 10,
|
790
|
|
- //treeIds:'[]',
|
|
786
|
+ //treeIds:'[]',
|
791
|
787
|
userId: loginUser.id
|
792
|
788
|
}
|
793
|
789
|
// 事件分类结束
|
|
@@ -1373,7 +1369,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
1373
|
1369
|
}
|
1374
|
1370
|
$timeout(function(){
|
1375
|
1371
|
$scope.getPrioritymatrix()
|
1376
|
|
- },2000)
|
|
1372
|
+ },2000)
|
1377
|
1373
|
}
|
1378
|
1374
|
$scope.removePrioritymatrix=function(data){
|
1379
|
1375
|
SweetAlert.swal({
|
|
@@ -1410,16 +1406,16 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
1410
|
1406
|
} else {
|
1411
|
1407
|
SweetAlert.swal("操作取消", "数据安全", "error");
|
1412
|
1408
|
}
|
1413
|
|
- });
|
1414
|
|
- }
|
|
1409
|
+ });
|
|
1410
|
+ }
|
1415
|
1411
|
$scope.getPrioritymatrix()
|
1416
|
1412
|
// 优先级规则结束
|
1417
|
1413
|
|
1418
|
1414
|
// 获取组数据
|
1419
|
1415
|
$scope.getGroupList=function(){
|
1420
|
1416
|
var postData={
|
1421
|
|
- idx: 0,
|
1422
|
|
- sum: 1000,
|
|
1417
|
+ idx: 0,
|
|
1418
|
+ sum: 1000,
|
1423
|
1419
|
group: {selectType: "nouser"}
|
1424
|
1420
|
}
|
1425
|
1421
|
api_user_data.fetchDataList('group',postData).then(res=>{
|
|
@@ -1431,10 +1427,10 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
1431
|
1427
|
// 获取人数据
|
1432
|
1428
|
$scope.getUserList=function(){
|
1433
|
1429
|
var postData={
|
1434
|
|
- idx: 0,
|
1435
|
|
- sum: 1000,
|
|
1430
|
+ idx: 0,
|
|
1431
|
+ sum: 1000,
|
1436
|
1432
|
user: {
|
1437
|
|
- name:'',
|
|
1433
|
+ name:'',
|
1438
|
1434
|
selectType: "pinyin_qs",
|
1439
|
1435
|
}
|
1440
|
1436
|
}
|
|
@@ -1446,10 +1442,10 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
|
1446
|
1442
|
// 获取事件分类人员
|
1447
|
1443
|
$scope.getUserList1=function(){
|
1448
|
1444
|
var postData={
|
1449
|
|
- idx: 0,
|
1450
|
|
- sum: 1000,
|
|
1445
|
+ idx: 0,
|
|
1446
|
+ sum: 1000,
|
1451
|
1447
|
user: {
|
1452
|
|
- name:'',
|
|
1448
|
+ name:'',
|
1453
|
1449
|
selectType: "pinyin_qs",
|
1454
|
1450
|
roledata:{
|
1455
|
1451
|
rolecode:'incident-category-manager'
|