巡检修改-暂存

assets/js/controllers/customform/customformCtrl.js

@@ -11136,6 +11136,11 @@ appFormly.config(function config(formlyConfigProvider) {
             //     return !$scope.search || $select.selected[to.labelProp || 'name'] == $scope.search;
             // }
             console.log($scope, "风浪");
+
+            if($scope.to.onlyKey === 'inspection.dictionary'){
+              //巡检列表-新增-巡检类型baba
+              $scope.model.id = 1714;//默认按组
+            }
             //工作组添加全部选项
             // if($scope.options.templateOptions.label == '工作组'){
             //     $scope.options.templateOptions.options.unshift({id:0,groupName:'全部'});
@@ -11271,7 +11276,10 @@ appFormly.config(function config(formlyConfigProvider) {
           "$stateParams",
           function ($scope, $rootScope, api_bpm_domain, $stateParams) {
             $scope.model[$scope.options.key] = '0';//默认全部
-            var arr = $scope.model.inspection.batchNos.map(v=>({value:v,name:v}));
+            var arr = [];
+            if($scope.model.inspection.batchNos){
+              arr = $scope.model.inspection.batchNos.map(v=>({value:v,name:v}));
+            }
             arr.unshift({value:'0',name:'全部'});
             $scope.options.templateOptions.options = arr;
             console.log($scope)
@@ -12479,14 +12487,24 @@ appFormly.config(function config(formlyConfigProvider) {
     defaultOptions: function (options) {
       return {
         templateOptions: {
-          refresh: function () { },
+          refresh: function () {},
           refreshDelay: 0,
         },
       };
     },
     controller: [
       "$scope",
-      function ($scope) {
+      "api_wechatfile",
+      function ($scope,api_wechatfile) {
+        // 新增巡检计划-巡检方式baba
+        if($scope.to.onlyKey === 'onlineType'){
+          api_wechatfile.getDictionary($scope.to.modelreasondata).then(function (result) {
+            $scope.to.options = result;
+            if(!$scope.model[$scope.options.key]){
+              $scope.model[$scope.options.key] = result[0]?result[0].id:null;
+            }
+          });
+        }
         // 巡检生成事件，默认派单
         if ($scope.model.isInspection) {
           $scope.model[$scope.options.key] = true;
@@ -13015,6 +13033,21 @@ appFormly.config(function config(formlyConfigProvider) {
           enableFiltering: false,
         },
         {
+          name: "sign",
+          displayName: "单号",
+          width: 140,
+          enableFiltering: false,
+        },
+        {
+          name: "inspectionType.type",
+          displayName: "巡检分类",
+          width: 200,
+          enableFiltering: false,
+          cellTemplate: '<div>' +
+                '<div class="ui-grid-cell-contents">{{row.entity.online?"线上巡检-":(row.entity.online===false?"线下巡检-":"")}}{{row.entity.inspectionType.type}}</div>' +
+                '</div>'
+        },
+        {
           name: "stateName",
           displayName: "状态",
           width: 80,
@@ -13022,9 +13055,13 @@ appFormly.config(function config(formlyConfigProvider) {
         },
         {
           name: "processUser.name",
-          displayName: "处理人",
-          width: 80,
+          displayName: "处理人/组",
+          width: 120,
           enableFiltering: false,
+          cellTemplate: '<div>' +
+                '<div class="ui-grid-cell-contents" ng-if="row.entity.processUser">{{row.entity.processUser.name}}</div>' +
+                '<div class="ui-grid-cell-contents" ng-if="row.entity.group">{{row.entity.group.groupName}}</div>' +
+                '</div>'
         },
         {
           name: "startDate",
@@ -13033,17 +13070,18 @@ appFormly.config(function config(formlyConfigProvider) {
           enableFiltering: false,
         },
         {
-          name: "overdueTime",
-          displayName: "逾期时间",
-          width: 160,
-          enableFiltering: false,
-        },
-        {
-          name: "batchNo",
-          displayName: "批次号",
+          name: "endTime",
+          displayName: "结束时间",
           width: 160,
           enableFiltering: false,
         },
+        
+        // {
+        //   name: "batchNo",
+        //   displayName: "批次号",
+        //   width: 160,
+        //   enableFiltering: false,
+        // },
       ];
 
       var defaultFilterData = {

assets/js/controllers/inspect/inspectForm.js

@@ -76,7 +76,8 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
                 filedata = { "idx": 0, "sum": 100 }
                 if (field.templateOptions.ApiService) {
                     process = UserRestangular.all("");
-                    filedata = { 'user': { 'roledata': { 'rolecode': 'inspectman' } }, "idx": 0, "sum": 1000 }
+                    // filedata = { 'user': { 'roledata': { 'rolecode': 'inspectman' } }, "idx": 0, "sum": 1000 }
+                    // filedata = { 'user': { 'roledata': { 'rolecode': 'inspectman' } }, "idx": 0, "sum": 1000 }
                 }
                 if (field.templateOptions.Apicommon) {
                     process = WechatRestangular.all("");
@@ -84,6 +85,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
                 var datakey = { "idx": 0, "sum": 1000 };
                 if (field.templateOptions.modelreasondata) {
                     datakey = field.templateOptions.modelreasondata
+                    filedata = field.templateOptions.modelreasondata
                 }
 
 
@@ -420,9 +422,12 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
                             case "start":
                                 if(vm.model.inspection){
                                     if(vm.model.inspection.executeUser.id){
-                                        delete vm.model.inspection.scheduleClass
-                                    }else if(vm.model.inspection.scheduleClass.id){
-                                        delete vm.model.inspection.executeUser
+                                        delete vm.model.inspection.group;
+                                    }else if(vm.model.inspection.group){
+                                        delete vm.model.inspection.executeUser;
+                                    }else{
+                                        delete vm.model.inspection.group
+                                        delete vm.model.inspection.executeUser;
                                     }
                                 }
                                 if (vm.model.inspection.id) {
@@ -606,9 +611,12 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
                             console.log(vm);
                             if(vm.model.inspection){
                                 if(vm.model.inspection.executeUser.id){
-                                    delete vm.model.inspection.scheduleClass
-                                }else if(vm.model.inspection.scheduleClass.id){
-                                    delete vm.model.inspection.executeUser
+                                    delete vm.model.inspection.group;
+                                }else if(vm.model.inspection.group){
+                                    delete vm.model.inspection.executeUser;
+                                }else{
+                                    delete vm.model.inspection.group;
+                                    delete vm.model.inspection.executeUser;
                                 }
                             }
                             if (vm.model.inspection.id) {

assets/js/controllers/inspect/inspectListCtrl.js

@@ -147,33 +147,37 @@ app.controller("inspectListCtrl", [
           '<div class="ui-grid-cell-contents" tooltip={{grid.appScope.transfertip(row.entity.ruleColour)}} tooltip-placement="right"><i style="font-size: 18px !important;" class="{{grid.appScope.transferColor(row.entity.ruleColour)}}"></i></div></div>',
       },
       {
-        name: "sign",
-        displayName: "单号",
-        width: "12%",
-        minWidth: 120,
-        enableFiltering: false,
-      },
-      {
-        name: "inspectionType.type",
-        displayName: "巡检分类",
+        name: "inspection.title",
+        displayName: "计划主题",
         width: "12%",
         minWidth: 120,
         enableFiltering: false,
       },
       {
-        name: "inspection.title",
-        displayName: "计划主题",
+        name: "sign",
+        displayName: "单号",
         width: "12%",
         minWidth: 120,
         enableFiltering: false,
       },
       {
-        name: "inspection.createUser.name",
-        displayName: "创建人",
-        width: "8%",
-        minWidth: 80,
+        name: "online",
+        displayName: "巡检分类",
+        width: "23%",
+        minWidth: 200,
         enableFiltering: false,
+        cellTemplate:
+          "<div>" +
+          '<div class="ui-grid-cell-contents">{{row.entity.online?"线上巡检-":(row.entity.online===false?"线下巡检-":"")}}{{row.entity.inspectionType.type}}</div>' +
+          "</div>",
       },
+      // {
+      //   name: "inspection.createUser.name",
+      //   displayName: "创建人",
+      //   width: "8%",
+      //   minWidth: 80,
+      //   enableFiltering: false,
+      // },
       {
         name: "stateName",
         displayName: "状态",
@@ -183,10 +187,14 @@ app.controller("inspectListCtrl", [
       },
       {
         name: "processUser.name",
-        displayName: "处理人",
+        displayName: "处理人/组",
         width: "8%",
         minWidth: 80,
         enableFiltering: false,
+        cellTemplate: '<div>' +
+                '<div class="ui-grid-cell-contents" ng-if="row.entity.processUser">{{row.entity.processUser.name}}</div>' +
+                '<div class="ui-grid-cell-contents" ng-if="row.entity.group">{{row.entity.group.groupName}}</div>' +
+                '</div>'
       },
       {
         name: "startDate",
@@ -196,18 +204,18 @@ app.controller("inspectListCtrl", [
         enableFiltering: false,
         cellTemplate:
           "<div>" +
-          '<div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.startDate)}}</div>' +
+          '<div class="ui-grid-cell-contents">{{row.entity.startDate?grid.appScope.transferTime(row.entity.startDate):""}}</div>' +
           "</div>",
       },
       {
-        name: "overdueTime",
-        displayName: "逾期时间",
+        name: "endTime",
+        displayName: "结束时间",
         width: "15%",
         width: 160,
         enableFiltering: false,
         cellTemplate:
           "<div>" +
-          '<div class="ui-grid-cell-contents">{{grid.appScope.transferTime(row.entity.overdueTime)}}</div>' +
+          '<div class="ui-grid-cell-contents">{{row.entity.endTime?grid.appScope.transferTime(row.entity.endTime):""}}</div>' +
           "</div>",
       },
       {
@@ -233,10 +241,21 @@ app.controller("inspectListCtrl", [
       return moment(time).format("YYYY-MM-DD HH:mm");
     };
     $scope.showChuli = function (data) {
-      if (data.processUser.id == loginUser.id && data.stateName == "执行中") {
-        return true;
-      } else {
-        return false;
+      if(data.inspection.dictionary.value == 1){
+        // 按巡检人员
+        if (data.processUser.id == loginUser.id && data.stateName == "执行中") {
+          return true;
+        } else {
+          return false;
+        }
+      }else if(data.inspection.dictionary.value == 3){
+        // 按工作组
+        var hasGroup = loginUser.group.some(v=>v.id == data.group.id);
+        if (hasGroup && data.stateName == "执行中") {
+          return true;
+        } else {
+          return false;
+        }
       }
     };
     $scope.selectRowFunction = function (data) {

assets/js/controllers/inspect/inspectPlanCtrl.js

@@ -100,52 +100,61 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
             width: '10%',
             enableFiltering: true
         },
-        // {
-        //     name: 'inspectionType.type',
-        //     displayName: '巡检类型',
-        //     width: '109',
-        //     enableFiltering: false
-        // },
+        
         {
-            name: 'status.name',
-            displayName: '状态',
-            width: '6%',
+            name: 'planStrategy.name',
+            displayName: '执行策略',
+            width: '10%',
             enableFiltering: false
         },
-
         {
-            name: 'executeUser.name',
-            displayName: '执行人',
-            width: '11%',
+            name: 'planStartTime',
+            displayName: '计划开始时间',
+            width: '140',
             enableFiltering: false,
-            cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.executeUser.name || "当前值班人" }}</div>'
+            cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.planStartTime.length>16?grid.appScope.transferTime(row.entity.planStartTime):row.entity.planStartTime}}</div>'
         },
         {
-            name: 'planStrategy.name',
-            displayName: '执行策略',
-            width: '10%',
+            name: 'planEndTime',
+            displayName: '计划结束时间',
+            width: '140',
+            enableFiltering: false,
+            cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.planEndTime.length>16?grid.appScope.transferTime(row.entity.planEndTime):row.entity.planEndTime}}</div>'
+        },
+        {
+            name: 'dictionary.name',
+            displayName: '巡检类型',
+            width: '109',
             enableFiltering: false
         },
         {
-            name: 'excutionDate',
-            displayName: '执行时间',
-            width: '140',
+            name: 'executeUser.name',
+            displayName: '执行人/组',
+            width: '11%',
             enableFiltering: false,
-            cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.excutionDate.length>16?grid.appScope.transferTime(row.entity.excutionDate):row.entity.excutionDate}}</div>'
+            cellTemplate: '<div class="ui-grid-cell-contents"><span ng-if="row.entity.dictionary.value == 1&&row.entity.executeUser">{{row.entity.executeUser.name }}</span><span ng-if="row.entity.dictionary.value == 3&&row.entity.group">{{row.entity.group.groupName }}</span><span ng-if="row.entity.dictionary.value == 4">无</span></div>'
         },
         {
-            name: 'executionTime',
-            displayName: '执行时长',
-            width: '10%',
-            enableFiltering: false,
-            cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.executionTime + "分钟"}}</div>'
+            name: 'status.name',
+            displayName: '状态',
+            width: '6%',
+            enableFiltering: false
         },
+        // {
+        //     name: 'executionTime',
+        //     displayName: '执行时长',
+        //     width: '10%',
+        //     enableFiltering: false,
+        //     cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.executionTime + "分钟"}}</div>'
+        // },
         {
             name: 'executionTime1',
             displayName: '当前批次进度',
             width: '12%',
             enableFiltering: false,
-            cellTemplate: '<div class="ui-grid-cell-contents">{{row.entity.completed + "/" + (row.entity.doing + row.entity.completed)}}</div>'
+            cellTemplate: `<div class="ui-grid-cell-contents" title="{{row.entity.percent}}%">
+            <progressbar value="row.entity.percent" type="success">{{row.entity.percent}}%</progressbar>
+            </div>`
         },
         {
             name: 'batchNoDesc',
@@ -153,12 +162,12 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
             width: '15%',
             enableFiltering: false
         },
-        {
-            name: 'createUser.name',
-            displayName: '创建人',
-            width: '8%',
-            enableFiltering: false
-        },
+        // {
+        //     name: 'createUser.name',
+        //     displayName: '创建人',
+        //     width: '8%',
+        //     enableFiltering: false
+        // },
         // { name: 'createTime', displayName: '创建时间', width: '12%', enableFiltering: false },
         {
             minWidth: '230',
@@ -598,7 +607,15 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
                 $scope.myData = myData.list;
                 for (var i = 0; i < $scope.myData.length; i++) {
                     $scope.myData[i]['item'] = i + 1 + filterData.idx * filterData.sum
+                    if($scope.myData[i].doing + $scope.myData[i].completed != 0){
+                        $scope.myData[i].percent = ($scope.myData[i].completed*100/($scope.myData[i].doing + $scope.myData[i].completed)).toFixed(1);
+                    }else if($scope.myData[i].completed == 0){
+                        $scope.myData[i].percent = '0.0';
+                    }else{
+                        $scope.myData[i].percent = '0.0';
+                    }
                 }
+                console.log($scope.myData)
                 for (var i = 0; i < $scope.myData.length; i++) {
                     if ($scope.myData[i].status == "正常") {
                         $scope.myData[i].style = "fa fa-play";
@@ -635,7 +652,15 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
                 $scope.myData = myData.list;
                 for (var i = 0; i < $scope.myData.length; i++) {
                     $scope.myData[i]['item'] = i + 1 + filterData.idx * filterData.sum
+                    if($scope.myData[i].doing + $scope.myData[i].completed != 0){
+                        $scope.myData[i].percent = ($scope.myData[i].completed*100/($scope.myData[i].doing + $scope.myData[i].completed)).toFixed(1);
+                    }else if($scope.myData[i].completed == 0){
+                        $scope.myData[i].percent = '0.0';
+                    }else{
+                        $scope.myData[i].percent = '0.0';
+                    }
                 }
+                console.log($scope.myData)
                 for (var i = 0; i < $scope.myData.length; i++) {
                     if ($scope.myData[i].status == "正常") {
                         $scope.myData[i].style = "fa fa-play";

assets/js/controllers/system/processdesign/incidentplan/incidentSetUpCtrl.js

@@ -16,6 +16,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
    }
     $scope.listData=[
         {"name":"事件分类"},
+        {"name":"巡检范围"},
         {"name":"事件紧急度"},
         {"name":"事件影响度"},
         {"name":"事件优先级"},
@@ -115,7 +116,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
             $scope.subdata.hasPlace=false
         }
         
-        convertchildToTree(branch);
+        convertchildToTree(branch,'事件分类');
         console.log(branch)
         if(branch.managerUser){
             $scope.subdata.managerUser = branch.managerUser
@@ -156,6 +157,67 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         }        
 
     };
+    // $scope.thisParent1={};//当前点击节点的父节点
+    // $scope.userOrGroupType1={};//当前节点运维组/运维人员
+    $scope.dataSave1 = [];//储存$scope.tree_data
+    $scope.my_tree_1handler = function(branch) {
+        console.log($scope.dataSave1)
+        if($scope.dataSave1.length === 0){
+            $scope.dataSave1 = angular.copy($scope.tree_1data);
+        }
+        console.log(branch)
+        if(branch.parent){
+            $scope.tree_1data = $scope.filterTree($scope.dataSave1,branch.id);
+            console.log($scope.tree_1data,'过滤后');
+        }
+
+        $scope.changecate = true;
+        $scope.addcate = false;
+        filterData.treeIds = branch.id;
+        $scope.selectedTreeNode = branch;
+        $scope.output = branch;
+        $scope.thisParent=branch.parent||null;
+        if($scope.thisParent){
+             $scope.thisParent.label=$scope.thisParent.type;
+             $scope.thisParent.isExpanded=true;
+             $scope.thisParent.selected=true;
+             $scope.subdata['parent']=$scope.thisParent
+        };
+        convertchildToTree(branch,'巡检范围');//2022年5月27日,暂存,明明
+        console.log(branch)
+        if(branch.managerUser){
+            $scope.subdata.managerUser = branch.managerUser
+        }
+        if(branch.userOrGroupType){
+            $scope.userOrGroupType['type']=branch.userOrGroupType;
+            $scope.userGroupChecked['groupCheck']=branch.group||{};
+            $scope.userGroupChecked['userCheck']=branch.handleUser||{};
+        }else{
+            $scope.userOrGroupType['type']=0;
+            $scope.userGroupChecked={}
+        }
+        $scope.subdata.category=branch.label;
+        var eqflag = false;
+        angular.forEach($scope.outdata, function(item) {
+            if (item.id == $scope.output.id) eqflag = true;
+        });
+        if (eqflag) {
+
+        } else {
+            $scope.outdata.push({
+                'name': $scope.output.label,
+                'id': $scope.output.id
+            });
+            var postData = {
+                typeList: []
+            };
+            if ($scope.outdata.length > 0) {
+                angular.forEach($scope.outdata, function(data) {
+                    postData.typeList.push({ id: data.id });
+                })
+            }
+        }        
+    };
    
     $scope.addType = function(element) {
             $scope.tree_data = $scope.dataSave.length?angular.copy($scope.dataSave):$scope.tree_data;
@@ -229,14 +291,21 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         }
         /* -----end remove incidet category----- */
 
-    function convertchildToTree(datum) {
+    function convertchildToTree(datum,type) {
         $scope.subdata = {};
-        if (datum.parent) {
-            $scope.subdata = { 'id': datum.id, 'category': datum.label, 'group': datum.group||{}, 'hasPlace': datum.hasPlace, 'hasSimple': datum.hasSimple, 'priority': datum.priority, 'complexity': datum.complexity,  'parent': datum.parent }
-        } else {
-            $scope.subdata = { 'id': datum.id, 'category': datum.label, 'group': datum.group||{}, 'hasSimple': datum.hasSimple, 'hasPlace': datum.hasPlace, 'priority': datum.priority, 'complexity': datum.complexity }
+        if(type === '事件分类'){
+            if (datum.parent) {
+                $scope.subdata = { 'id': datum.id, 'category': datum.label, 'group': datum.group||{}, 'hasPlace': datum.hasPlace, 'hasSimple': datum.hasSimple, 'priority': datum.priority, 'complexity': datum.complexity,  'parent': datum.parent }
+            } else {
+                $scope.subdata = { 'id': datum.id, 'category': datum.label, 'group': datum.group||{}, 'hasSimple': datum.hasSimple, 'hasPlace': datum.hasPlace, 'priority': datum.priority, 'complexity': datum.complexity }
+            }
+        }else if(type === '巡检范围'){
+            if (datum.parent) {
+                $scope.subdata = { 'id': datum.id, 'type': datum.label, 'parent': datum.parent }
+            } else {
+                $scope.subdata = { 'id': datum.id, 'type': datum.label }
+            }
         }
-
     }
 
 
@@ -297,15 +366,16 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
 
 
 
-    $scope.parentdata = {};
+    // $scope.parentdata = {};
     $scope.try_async_load = function() {
         $scope.my_data = [];
+        
         $scope.doing_async = true;
         var data = { "idx": 0, "sum": 1000 };
         api_bpm_data.fetchDataList('incidentcategory', data).then(function(response) {
             var data = response.list;
             var objects = [];
-            $scope.parentdata = data;
+            // $scope.parentdata = data;
             for (var i = 0; i < data.length; i++) {
                 var object = {};
                 object.id = data[i].id;
@@ -337,20 +407,12 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
                     object.managerUser=data[i].managerUser||{};
                 }
                 object.label = data[i].category;
-                // object.actions = data[i][3]; //权限部分
-                // object.group = "1";
-                // object.user = "2";
                 object.state = {
                     "opened": true
                 };
                 object.typeName = "type";
-                // if()
-                // if (object.actions.indexOf("2") >= 0) { //知识库类型 具有增加权限--系统管理员
                 $scope.showAddSolutionType = true;
-                // }
-                // if (object.actions.indexOf("5") >= 0) { //知识库类型 具有授权权限--系统管理员
                 $scope.showReviewKnowledgeType = true;
-                // }
                 objects.push(object);
             }
             $scope.my_data = convertParentToChildList(objects);
@@ -360,6 +422,30 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
             }
         });
     };
+    $scope.try_async_1load = function() {
+        $scope.my_1data = [];
+        
+        $scope.doing_async = true;
+        var data = { "idx": 0, "sum": 1000 };
+        api_bpm_data.fetchDataList('inspectionType', data).then(function(response) {
+            var data = response.list;
+            var objects = [];
+            for (var i = 0; i < data.length; i++) {
+                var object = {};
+                object.id = data[i].id;
+                if (angular.isDefined(data[i].parent)) {
+                    object.parent = data[i].parent;
+                }
+                object.label = data[i].type;
+                objects.push(object);
+            }
+            $scope.my_1data = convertParentToChildList(objects);
+            $scope.tree_1data = angular.copy($scope.my_1data);
+            if ($scope.my_1data.length > 0) {
+                $scope.doing_async = false;
+            }
+        });
+    };
     $scope.closethis = function(formdata) {
         formdata.category = "";
         formdata.parent.category = "";
@@ -528,6 +614,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
     };
     /* -----end submit incidet category----- */
     $scope.try_async_load();
+    $scope.try_async_1load();
 
     // $scope.ldloading={};
 

assets/views/inspect/inspectPlan.html

@@ -62,7 +62,7 @@
                             </div>
                         </div>
                         <div class="form-group incidentsearch ">
-                            <div class=" pull-left" style="padding-top:4px">巡检类型:</div>
+                            <div class=" pull-left" style="padding-top:4px">巡检范围:</div>
                             <div class="pull-right iptSize" style="display:inline">
                                 <div>
                                     <multi-select-tree ng-model="inspecttype.type" data-input-model="my_data"

assets/views/system/processdesign/incidentplan/incidentSetUp.html

@@ -471,6 +471,7 @@
         <div class="col-xs-9">
             <div class="fonsize">事件设置>{{leftListName}}</div>
             <div class="rightBox">
+                
                 <!-- 事件分类开始 -->
                 <div ng-if="leftListName=='事件分类'">
                     <div class="mainDiv">
@@ -831,6 +832,162 @@
                     </div>   
                 </div>
                 <!-- 事件分类结束 -->
+                <!-- 巡检范围开始 -->
+                <div ng-if="leftListName=='巡检范围'">
+                    <div class="mainDiv">
+                        
+                        <!-- 谁固定谁在前 -->
+                
+                        <div class="mainDivLeft">
+                            <div class="mainDiv-head">
+                                <span>服务目录</span>
+                                <div class="mainDiv-head-right">
+                                    <div class="btn btn_search" ng-click="addType(output)" ng-show="xinzeng">新增</div>
+                                    <div class="btn btn_remove" ng-class="isMousedown?'btn_removeMousedown':''" ng-mousedown="changeRemoveClass()" ng-click="remove(output)" ng-show="shanchu">删除</div>
+                                </div>
+                            </div>
+                            <div class="mainDiv-body fixHeight">
+                                <div class="box-tree">
+                                    <span ng-if="doing_async">...加载中...</span>
+                                    <abn-tree tree-data="my_1data" tree-control="my_tree" on-select="my_tree_1handler(branch)" expand-level="2" icon-leaf="iconfont icon-fenlei" icon-expand="ti-plus" icon-collapse="ti-minus"></abn-tree>
+                                </div>
+                            </div>
+                        </div>
+                
+                        <div class="mainDivRight" ng-if="changecate">
+                            <div class="mainDiv-head">
+                                <span>服务目录修改</span>
+                            </div>
+                            <div class="mainDiv-body">
+                                <div class="tab-mainDiv-body-lineDiv-50">
+                                    <div class="tab-mainDiv-body-lable">
+                                        服务目录名称:
+                                    </div>
+                                    <div class="tab-mainDiv-body-content">
+                                        <input class="form-control" ng-model="subdata.category" placeholder="服务目录名称..." />
+                                    </div>
+                                </div>
+                                <div class="tab-mainDiv-body-lineDiv-50" ng-if="thisParent">
+                                    <div class="tab-mainDiv-body-lable">
+                                        父类:
+                                    </div>
+                                    <div class="tab-mainDiv-body-content">
+                                        <multi-select-tree ng-model="subdata.parent" data-input-model="tree_data" data-output-model="subdata.parent" theme="bootstrap" multi-select="false" data-default-label="{{thisParent.category}}" data-callback="onFilterCallback(item)" data-select-only-leafs="false" data-trans-label="label"
+                                            data-switch-view="false"></multi-select-tree>
+                                    </div>
+                                </div>
+                                <div class="tab-mainDiv-body-lineDiv-50">
+                                    <div class="tab-mainDiv-body-lable">线下巡检默认组:</div>
+                                    <ui-select class="tab-mainDiv-body-content" ng-model="userGroupChecked.groupCheck"
+                                        theme="bootstrap">
+                                        <ui-select-match placeholder="">
+                                            {{$select.selected.groupName}}
+                                        </ui-select-match>
+                                        <ui-select-choices repeat="item in groupList | filter: $select.search">
+                                            <div ng-bind-html="item.groupName | highlight: $select.search"></div>
+                                        </ui-select-choices>
+                                    </ui-select>
+                                </div>
+                                <div class="tab-mainDiv-body-lineDiv-50">
+                                    <div class="tab-mainDiv-body-lable">线上巡检默认人:</div>
+                                    <ui-select class="tab-mainDiv-body-content" ng-model="userGroupChecked.userCheck"
+                                        theme="bootstrap">
+                                        <ui-select-match placeholder="">
+                                            {{$select.selected.name}}
+                                        </ui-select-match>
+                                        <ui-select-choices repeat="item in userList | filter: $select.search">
+                                            <div ng-bind-html="item.name | highlight: $select.search"></div>
+                                        </ui-select-choices>
+                                    </ui-select>
+                                </div>
+                            </div>
+                            <div class="tab-mainDiv-foot">
+                                <div class="btn btn_search" ng-click="submitchange(subdata)" ng-show="bianji">
+                                    确认
+                                </div>
+                            </div>
+                        </div>
+                
+                        <div class="mainDivRight" ng-if="addcate">
+                            <div class="mainDiv-head">
+                                <span>服务目录新增</span>
+                            </div>
+                            <div class="mainDiv-body">
+                                <div class="tab-mainDiv-body-lineDiv-50">
+                                    <div class="tab-mainDiv-body-lable">
+                                        服务目录名称:
+                                    </div>
+                                    <div class="tab-mainDiv-body-content">
+                                        <input class="form-control" ng-model="adddata.category" placeholder="服务目录名称..." />
+                                    </div>
+                                </div>
+                                <div class="tab-mainDiv-body-lineDiv-50">
+                                    <div class="tab-mainDiv-body-lable">
+                                        是否有父类:
+                                    </div>
+                                    <div class="tab-mainDiv-body-content">
+                                        <switch ng-model="addparent" class="green"></switch>
+                                    </div>
+                                </div>
+                                <div class="tab-mainDiv-body-lineDiv-50" ng-if="addparent">
+                                    <div class="tab-mainDiv-body-lable">
+                                        父类:
+                                    </div>
+                                    <div class="tab-mainDiv-body-content">
+                                        <multi-select-tree ng-model="adddata.parent" data-input-model="tree_data" data-output-model="adddata.parent" theme="bootstrap" multi-select="false" data-default-label="服务目录" data-callback="onFilterCallback(item)" data-select-only-leafs="false" data-trans-label="label"
+                                            data-switch-view="false"></multi-select-tree>
+                                    </div>
+                                </div>
+                                <div class="tab-mainDiv-body-lineDiv-50">
+                                    <div class="tab-mainDiv-body-lable">线下巡检默认组:</div>
+                                    <ui-select class="tab-mainDiv-body-content" ng-model="userGroupCheckedAdd.groupCheck"
+                                        theme="bootstrap">
+                                        <ui-select-match placeholder="">
+                                            {{$select.selected.groupName}}
+                                        </ui-select-match>
+                                        <ui-select-choices repeat="item in groupList | filter: $select.search">
+                                            <div ng-bind-html="item.groupName | highlight: $select.search"></div>
+                                        </ui-select-choices>
+                                    </ui-select>
+                                </div>
+                                <div class="tab-mainDiv-body-lineDiv-50">
+                                    <div class="tab-mainDiv-body-lable">线上巡检默认人:</div>
+                                    <ui-select class="tab-mainDiv-body-content" ng-model="userGroupCheckedAdd.userCheck"
+                                        theme="bootstrap">
+                                        <ui-select-match placeholder="">
+                                            {{$select.selected.name}}
+                                        </ui-select-match>
+                                        <ui-select-choices repeat="item in userList | filter: $select.search">
+                                            <div ng-bind-html="item.name | highlight: $select.search"></div>
+                                        </ui-select-choices>
+                                    </ui-select>
+                                </div>
+                            </div>
+                            <div class="tab-mainDiv-foot">
+                                <div class="btn btn_search" ng-click="submitadd(adddata,addparent)">
+                                    确认
+                                </div>
+                                <div class="btn btn_clean" ng-click="closethis(addcategory)">
+                                    取消
+                                </div>
+                            </div>
+                        </div>
+                
+                        <div class="mainDivRight" ng-if="addcate==''&&changecate==''">
+                            <!-- <div class="mainDivRight"> -->
+                            <div class="mainDiv-head">
+                                <span>操作提示</span>
+                            </div>
+                            <div class="mainDiv-body">
+                                <div class="mainDiv-body-noList">
+                                    <img src="./assets/images/place/icon_quesheng.png" alt="">
+                                    <p class="handlefont">请选择服务目录</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>   
+                </div>
+                <!-- 巡检范围结束 -->
                 <!-- 事件紧急度开始 -->
                 <div ng-if="leftListName=='事件紧急度'">
                     <div class="col-xs-4">