巡检修改

assets/js/controllers/customform/customformCtrl.js

@@ -11139,7 +11139,12 @@ appFormly.config(function config(formlyConfigProvider) {
 
             if($scope.to.onlyKey === 'inspection.dictionary'){
               //巡检列表-新增-巡检类型baba
-              $scope.model.id = 1714;//默认按组
+              console.log(location)
+              var loc = location.href.split('api_bpm_data')[1] || '';
+              if(loc.length <= 2){
+                // 新增轮询计划的时候
+                $scope.model.id = 1715;//默认系统默认
+              }
             }
             //工作组添加全部选项
             // if($scope.options.templateOptions.label == '工作组'){
@@ -13059,7 +13064,7 @@ appFormly.config(function config(formlyConfigProvider) {
           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.processUser.name}}</div>' +
                 '<div class="ui-grid-cell-contents" ng-if="row.entity.group">{{row.entity.group.groupName}}</div>' +
                 '</div>'
         },
@@ -13074,6 +13079,9 @@ appFormly.config(function config(formlyConfigProvider) {
           displayName: "结束时间",
           width: 160,
           enableFiltering: false,
+          cellTemplate: '<div>' +
+                '<div class="ui-grid-cell-contents">{{row.entity.endTime?grid.appScope.transferTime(row.entity.endTime):""}}</div>' +
+                '</div>'
         },
         
         // {
@@ -13088,6 +13096,9 @@ appFormly.config(function config(formlyConfigProvider) {
         idx: 0,
         sum: 10,
       };
+      $scope.transferTime = function (time) {
+        return moment(time).format("YYYY-MM-DD HH:mm");
+      };
 
       //分页控制
       $scope.gridOptions.onRegisterApi = function (gridApi) {

assets/js/controllers/inspect/inspectForm.js

@@ -421,9 +421,9 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
                         switch ($scope.formData.url) {
                             case "start":
                                 if(vm.model.inspection){
-                                    if(vm.model.inspection.executeUser.id){
+                                    if(vm.model.inspection.executeUser&&vm.model.inspection.executeUser.id){
                                         delete vm.model.inspection.group;
-                                    }else if(vm.model.inspection.group){
+                                    }else if(vm.model.inspection.group&&vm.model.inspection.group.id){
                                         delete vm.model.inspection.executeUser;
                                     }else{
                                         delete vm.model.inspection.group
@@ -610,9 +610,9 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
                         case "start":
                             console.log(vm);
                             if(vm.model.inspection){
-                                if(vm.model.inspection.executeUser.id){
+                                if(vm.model.inspection.executeUser&&vm.model.inspection.executeUser.id){
                                     delete vm.model.inspection.group;
-                                }else if(vm.model.inspection.group){
+                                }else if(vm.model.inspection.group&&vm.model.inspection.group.id){
                                     delete vm.model.inspection.executeUser;
                                 }else{
                                     delete vm.model.inspection.group;

assets/js/controllers/inspect/inspectListCtrl.js

@@ -192,7 +192,7 @@ app.controller("inspectListCtrl", [
         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.processUser.name}}</div>' +
                 '<div class="ui-grid-cell-contents" ng-if="row.entity.group">{{row.entity.group.groupName}}</div>' +
                 '</div>'
       },
@@ -256,6 +256,24 @@ app.controller("inspectListCtrl", [
         } else {
           return false;
         }
+      }else if(data.inspection.dictionary.value == 4){
+        // 系统默认
+        if(data.online){
+          // 线上人
+          if (data.processUser.id == loginUser.id && data.stateName == "执行中") {
+            return true;
+          } else {
+            return false;
+          }
+        }else{
+          // 线下组
+          var hasGroup = loginUser.group.some(v=>v.id == data.group.id);
+          if (hasGroup && data.stateName == "执行中") {
+            return true;
+          } else {
+            return false;
+          }
+        }
       }
     };
     $scope.selectRowFunction = function (data) {
@@ -615,6 +633,13 @@ app.controller("inspectListCtrl", [
       if (angular.isUndefined(filterData)) {
         filterData = defaultFilterData;
       }
+      if(filterData.searchType === 'todo'){
+        // 待处理添加筛选条件
+        console.log(filterData,'2022年5月30日')
+        filterData.candidateGroups = $rootScope.user.group.map(function(v){return v.id}).toString()
+      }else{
+        delete filterData.candidateGroups;
+      }
       $scope.myData = [];
       $scope.memoryfilterData = filterData;
       api_bpm_data.fetchInspectServiceTasks(filterData.status, filterData).then(
@@ -648,6 +673,13 @@ app.controller("inspectListCtrl", [
       if (angular.isUndefined(filterData)) {
         filterData = defaultFilterData;
       }
+      if(filterData.searchType === 'todo'){
+        // 待处理添加筛选条件
+        console.log(filterData,'2022年5月30日')
+        filterData.candidateGroups = $rootScope.user.group.map(function(v){return v.id}).toString()
+      }else{
+        delete filterData.candidateGroups;
+      }
       // $scope.myData = [];
       $scope.memoryfilterData = filterData;
       api_bpm_data.fetchInspectServiceTasks(filterData.status, filterData).then(

assets/js/controllers/inspect/inspectReportCtrl.js

@@ -206,7 +206,7 @@ app.controller("inspectReportCtrl", [
       },
       {
         name: "type",
-        displayName: "巡检类型",
+        displayName: "巡检范围",
         width: "17%",
         enableFiltering: false,
       },

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

@@ -63,7 +63,9 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
     $scope.outdata = [];
     var systemtype = [];
     $scope.subdata={};
+    $scope.sub1data={};
     $scope.addcate = false;
+    $scope.add1cate = false;
     $scope.changecate = false;
     // $scope.refreshListData = function(){
     //   var data ={"idx":0,"sum":1000};
@@ -100,7 +102,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         $scope.changecate = true;
         $scope.addcate = false;
         filterData.treeIds = branch.id;
-        $scope.selectedTreeNode = branch;
+        // $scope.selectedTreeNode = branch;
         $scope.output = branch;
         $scope.thisParent=branch.parent||null;
         if($scope.thisParent){
@@ -157,8 +159,12 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         }        
 
     };
-    // $scope.thisParent1={};//当前点击节点的父节点
+    $scope.thisParent={};//当前点击节点的父节点
     // $scope.userOrGroupType1={};//当前节点运维组/运维人员
+    $scope.group_user = {
+        // offlineGroup:{},//线下组
+        // onlineUser:{}//线上人
+    }
     $scope.dataSave1 = [];//储存$scope.tree_data
     $scope.my_tree_1handler = function(branch) {
         console.log($scope.dataSave1)
@@ -172,31 +178,30 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         }
 
         $scope.changecate = true;
-        $scope.addcate = false;
+        $scope.add1cate = false;
         filterData.treeIds = branch.id;
-        $scope.selectedTreeNode = branch;
+        // $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
+             $scope.sub1data['parent']=$scope.thisParent
         };
         convertchildToTree(branch,'巡检范围');//2022年5月27日,暂存,明明
-        console.log(branch)
-        if(branch.managerUser){
-            $scope.subdata.managerUser = branch.managerUser
+        console.log(branch);
+        if(branch.user){
+            $scope.group_user['onlineUser']=branch.user||{};
+        }else{
+            $scope.group_user['onlineUser']={}
         }
-        if(branch.userOrGroupType){
-            $scope.userOrGroupType['type']=branch.userOrGroupType;
-            $scope.userGroupChecked['groupCheck']=branch.group||{};
-            $scope.userGroupChecked['userCheck']=branch.handleUser||{};
+        if(branch.group){
+            $scope.group_user['offlineGroup']=branch.group||{};
         }else{
-            $scope.userOrGroupType['type']=0;
-            $scope.userGroupChecked={}
+            $scope.group_user['offlineGroup']={}
         }
-        $scope.subdata.category=branch.label;
+        $scope.sub1data.type=branch.label;
         var eqflag = false;
         angular.forEach($scope.outdata, function(item) {
             if (item.id == $scope.output.id) eqflag = true;
@@ -232,6 +237,11 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
                 //     }
                 // });
         }
+        $scope.addType1 = function(element) {
+            $scope.tree_1data = $scope.dataSave1.length?angular.copy($scope.dataSave1):$scope.tree_1data;
+            $scope.add1cate = true
+            $scope.changecate = false
+        }
         /* -----start remove incidet category----- */
     $scope.remove = function(element) {
             var modalInstance = $modal.open({
@@ -289,21 +299,76 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
                 }
             })
         }
+        $scope.remove1 = function(element) {
+            var modalInstance = $modal.open({
+                templateUrl: 'assets/views/delete.html',
+                controller: function($scope, scope, $modalInstance, api_bpm_data) {
+                    $scope.title = "巡检范围删除?";
+                    $scope.connect = "确定要删除此巡检范围？";
+                    $scope.ok = function() {
+                        $modalInstance.close(element);
+                    };
+                    $scope.cancel = function() {
+                        $modalInstance.dismiss('cancel');
+                    };
+                },
+                size: 'sm',
+                resolve: {
+                    scope: function() {
+                        return $scope;
+                    }
+                }
+            });
+            modalInstance.result.then(function(selectedItem) {
+                if (selectedItem) {
+                    var rmvList = [];
+                    rmvList.push(selectedItem.id);
+                    if (selectedItem.children.length > 0) {
+                        SweetAlert.swal({
+                            title: "删除失败!",
+                            text: "请先删除选中的范围的子级",
+                            type: "error"
+                        })
+                    } else {
+                        api_bpm_data.rmvData('inspectionType', rmvList).then(function(response) {
+                            if (response.data) {
+                                SweetAlert.swal({
+                                    title: "删除成功!",
+                                    type: "success",
+                                    confirmButtonColor: "#007AFF"
+                                }, function() {
+                                    $scope.try_async_1load();
+                                    $scope.$apply($scope.my_1data);
+                                });
+
+                            } else {
+                                SweetAlert.swal({
+                                    title: "操作异常!",
+                                    text: "系统异常，请稍后重试，或者联系管理员！",
+                                    type: "error"
+                                });
+                            }
+                        })
+                    }
+                }
+            })
+        }
         /* -----end remove incidet category----- */
 
     function convertchildToTree(datum,type) {
-        $scope.subdata = {};
         if(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 }
             }
         }else if(type === '巡检范围'){
+            $scope.sub1data = {};
             if (datum.parent) {
-                $scope.subdata = { 'id': datum.id, 'type': datum.label, 'parent': datum.parent }
+                $scope.sub1data = { 'id': datum.id, 'type': datum.label, 'parent': datum.parent }
             } else {
-                $scope.subdata = { 'id': datum.id, 'type': datum.label }
+                $scope.sub1data = { 'id': datum.id, 'type': datum.label }
             }
         }
     }
@@ -426,13 +491,19 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         $scope.my_1data = [];
         
         $scope.doing_async = true;
-        var data = { "idx": 0, "sum": 1000 };
+        var data = { "idx": 0, "sum": 1000,inspectionType:{deleteFlag:0} };
         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].user)) {
+                    object.user = data[i].user||{};
+                }
+                if (angular.isDefined(data[i].group)) {
+                    object.group = data[i].group||{};
+                }
                 if (angular.isDefined(data[i].parent)) {
                     object.parent = data[i].parent;
                 }
@@ -508,7 +579,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         }
 
         var filedata = { "incidentcategory": formdata }
-        console.log(filedata);
+        console.log(filedata,$scope.userGroupChecked);
         // return;
         api_bpm_data.updData('incidentcategory', filedata).then(function(response) {
             if (response) {
@@ -529,10 +600,63 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
             }
         });
     };
+    $scope.submit1change = function(formdata) {
+        console.log($scope.output)
+        if($scope.selectedChangeCategory){
+            formdata['parent'] ={'id':$scope.selectedChangeCategory.id};
+        }else if($scope.thisParent){
+            formdata['parent'] ={'id':$scope.thisParent.id};
+        }
+        if($scope.group_user.offlineGroup&&$scope.group_user.offlineGroup.id){
+            formdata.group={id:$scope.group_user.offlineGroup.id};
+        }
+        if($scope.group_user.onlineUser&&$scope.group_user.onlineUser.id){
+            formdata.user={id:$scope.group_user.onlineUser.id};
+        }
+        // if($scope.userGroupChecked&&$scope.userGroupChecked.groupCheck){
+        //     formdata.group={id:$scope.userGroupChecked.groupCheck.id};
+        // }
+        // if($scope.userGroupChecked&&$scope.userGroupChecked.userCheck){
+        //     formdata.handleUser={id:$scope.userGroupChecked.userCheck.id};
+        // }
+        // if($scope.subdata.complexity){
+        //     formdata.complexity=$scope.subdata.complexity
+        // }
+        // if($scope.subdata.priority){
+        //     formdata.priority=$scope.subdata.priority
+        // }
+        // if($scope.subdata.managerUser){
+        //     formdata.managerUser=$scope.subdata.managerUser
+        // }
+
+        var filedata = { "inspectionType": formdata }
+        console.log(filedata,$scope.group_user);
+        // return;
+        api_bpm_data.updData('inspectionType', filedata).then(function(response) {
+            if (response) {
+                if (response.status == 200) {
+                    $scope.try_async_1load()
+                    SweetAlert.swal({
+                        title: "修改成功!",
+                        type: "success"
+                    }, function() {
+                        $scope.$apply($scope.my_1data);
+                    })
+                } else {
+                    SweetAlert.swal({
+                        title: "修改失败!",
+                        type: "error"
+                    })
+                }
+            }
+        });
+    };
     $scope.adddata = {};
+    $scope.add1data = {};
     $scope.addparent = false;
     // 新增保存提交
     $scope.userGroupCheckedAdd={};//选中人/组数据
+    $scope.group_user_Add={};//选中人/组数据
     $scope.userOrGroupTypeAdd={};//运维组/运维人员
     $scope.submitadd = function(formdata) {
         console.log(formdata)
@@ -612,6 +736,46 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
             }
         });
     };
+    $scope.submit1add = function(formdata) {//lmm
+        console.log(formdata)
+        if($scope.group_user_Add&&$scope.group_user_Add.group&&$scope.group_user_Add.group.id){
+            formdata.group={id:$scope.group_user_Add.group.id};
+        }
+        if($scope.group_user_Add&&$scope.group_user_Add.user&&$scope.group_user_Add.user.id){
+            formdata.user={id:$scope.group_user_Add.user.id};
+        }
+        formdata.deleteFlag = 0;
+        formdata.formUiName = 'inspection_LinHu_detail';
+        formdata.formUiEdit = 'inspection_LinHu_confirm';
+        formdata.processKey = 'bpm_inspection';
+        var filedata = { "inspectionType": formdata }
+        console.log(filedata);
+        // return;
+        api_bpm_data.addData('inspectionType', filedata).then(function(response) {
+            if (response) {
+                if (response.status == 200) {
+                    $scope.userdata = [];
+                    $scope.outdata = [];
+                    $scope.try_async_1load();
+                    SweetAlert.swal({
+                        title: "增加成功!",
+                        type: "success"
+                    })
+                } else if (response.status == 408) {
+                    SweetAlert.swal({
+                        title: "增加失败!",
+                        text: response.error,
+                        type: "error"
+                    })
+                } else {
+                    SweetAlert.swal({
+                        title: "增加失败!",
+                        type: "error"
+                    })
+                }
+            }
+        });
+    };
     /* -----end submit incidet category----- */
     $scope.try_async_load();
     $scope.try_async_1load();

assets/views/inspect/inspectList.html

@@ -153,7 +153,7 @@
             </div>
           </div>
         <div class="form-group inspectlistsearch">
-          <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

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

@@ -842,8 +842,8 @@
                             <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 class="btn btn_search" ng-click="addType1(output)" ng-show="xinzeng">新增</div>
+                                    <div class="btn btn_remove" ng-class="isMousedown?'btn_removeMousedown':''" ng-mousedown="changeRemoveClass()" ng-click="remove1(output)" ng-show="shanchu">删除</div>
                                 </div>
                             </div>
                             <div class="mainDiv-body fixHeight">
@@ -864,7 +864,7 @@
                                         服务目录名称:
                                     </div>
                                     <div class="tab-mainDiv-body-content">
-                                        <input class="form-control" ng-model="subdata.category" placeholder="服务目录名称..." />
+                                        <input class="form-control" ng-model="sub1data.type" placeholder="服务目录名称..." />
                                     </div>
                                 </div>
                                 <div class="tab-mainDiv-body-lineDiv-50" ng-if="thisParent">
@@ -872,13 +872,13 @@
                                         父类:
                                     </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"
+                                        <multi-select-tree ng-model="sub1data.parent" data-input-model="tree_1data" data-output-model="sub1data.parent" theme="bootstrap" multi-select="false" data-default-label="{{thisParent.type}}" 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"
+                                    <ui-select class="tab-mainDiv-body-content" ng-model="group_user.offlineGroup"
                                         theme="bootstrap">
                                         <ui-select-match placeholder="">
                                             {{$select.selected.groupName}}
@@ -890,7 +890,7 @@
                                 </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"
+                                    <ui-select class="tab-mainDiv-body-content" ng-model="group_user.onlineUser"
                                         theme="bootstrap">
                                         <ui-select-match placeholder="">
                                             {{$select.selected.name}}
@@ -902,13 +902,13 @@
                                 </div>
                             </div>
                             <div class="tab-mainDiv-foot">
-                                <div class="btn btn_search" ng-click="submitchange(subdata)" ng-show="bianji">
+                                <div class="btn btn_search" ng-click="submit1change(sub1data)" ng-show="bianji">
                                     确认
                                 </div>
                             </div>
                         </div>
                 
-                        <div class="mainDivRight" ng-if="addcate">
+                        <div class="mainDivRight" ng-if="add1cate">
                             <div class="mainDiv-head">
                                 <span>服务目录新增</span>
                             </div>
@@ -918,7 +918,7 @@
                                         服务目录名称:
                                     </div>
                                     <div class="tab-mainDiv-body-content">
-                                        <input class="form-control" ng-model="adddata.category" placeholder="服务目录名称..." />
+                                        <input class="form-control" ng-model="add1data.type" placeholder="服务目录名称..." />
                                     </div>
                                 </div>
                                 <div class="tab-mainDiv-body-lineDiv-50">
@@ -934,13 +934,13 @@
                                         父类:
                                     </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"
+                                        <multi-select-tree ng-model="add1data.parent" data-input-model="tree_1data" data-output-model="add1data.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"
+                                    <ui-select class="tab-mainDiv-body-content" ng-model="group_user_Add.group"
                                         theme="bootstrap">
                                         <ui-select-match placeholder="">
                                             {{$select.selected.groupName}}
@@ -952,7 +952,7 @@
                                 </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"
+                                    <ui-select class="tab-mainDiv-body-content" ng-model="group_user_Add.user"
                                         theme="bootstrap">
                                         <ui-select-match placeholder="">
                                             {{$select.selected.name}}
@@ -964,7 +964,7 @@
                                 </div>
                             </div>
                             <div class="tab-mainDiv-foot">
-                                <div class="btn btn_search" ng-click="submitadd(adddata,addparent)">
+                                <div class="btn btn_search" ng-click="submit1add(add1data)">
                                     确认
                                 </div>
                                 <div class="btn btn_clean" ng-click="closethis(addcategory)">
@@ -973,7 +973,7 @@
                             </div>
                         </div>
                 
-                        <div class="mainDivRight" ng-if="addcate==''&&changecate==''">
+                        <div class="mainDivRight" ng-if="add1cate==''&&changecate==''">
                             <!-- <div class="mainDivRight"> -->
                             <div class="mainDiv-head">
                                 <span>操作提示</span>