Browse Source

是否简单处理

seimin 3 years ago
parent
commit
95ef9e8b2c

+ 3 - 3
assets/js/controllers/system/processdesign/incidentplan/incidentSetUpCtrl.js

@@ -86,7 +86,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
86
     }
86
     }
87
     var childdata = {};
87
     var childdata = {};
88
     $scope.thisParent={};//当前点击节点的父节点
88
     $scope.thisParent={};//当前点击节点的父节点
89
-    $scope.userOrGroupType={};//当前节点运维组/运维人员
89
+    $scope.userOrGroupType={type:2};//当前节点运维组/运维人员
90
     $scope.dataSave = [];//储存$scope.tree_data
90
     $scope.dataSave = [];//储存$scope.tree_data
91
     $scope.my_tree_handler = function(branch) {
91
     $scope.my_tree_handler = function(branch) {
92
         console.log($scope.dataSave)
92
         console.log($scope.dataSave)
@@ -128,7 +128,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
128
             $scope.userGroupChecked['groupCheck']=branch.group||{};
128
             $scope.userGroupChecked['groupCheck']=branch.group||{};
129
             $scope.userGroupChecked['userCheck']=branch.handleUser||{};
129
             $scope.userGroupChecked['userCheck']=branch.handleUser||{};
130
         }else{
130
         }else{
131
-            $scope.userOrGroupType['type']=0;
131
+            $scope.userOrGroupType['type']=2;
132
             $scope.userGroupChecked={}
132
             $scope.userGroupChecked={}
133
         }
133
         }
134
         // $scope.subdata=branch;
134
         // $scope.subdata=branch;
@@ -657,7 +657,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
657
     // 新增保存提交
657
     // 新增保存提交
658
     $scope.userGroupCheckedAdd={};//选中人/组数据
658
     $scope.userGroupCheckedAdd={};//选中人/组数据
659
     $scope.group_user_Add={};//选中人/组数据
659
     $scope.group_user_Add={};//选中人/组数据
660
-    $scope.userOrGroupTypeAdd={};//运维组/运维人员
660
+    $scope.userOrGroupTypeAdd={type:2};//运维组/运维人员
661
     $scope.submitadd = function(formdata) {
661
     $scope.submitadd = function(formdata) {
662
         console.log(formdata)
662
         console.log(formdata)
663
         // var paret = {};
663
         // var paret = {};

+ 19 - 16
assets/views/system/processdesign/incidentplan/incidentSetUp.html

@@ -565,6 +565,14 @@
565
                                     </ui-select>
565
                                     </ui-select>
566
                                 </div>
566
                                 </div>
567
                                 <div class="tab-mainDiv-body-lineDiv-50">
567
                                 <div class="tab-mainDiv-body-lineDiv-50">
568
+                                    <div class="tab-mainDiv-body-lable">
569
+                                        是否简单处理:
570
+                                    </div>
571
+                                    <div class="tab-mainDiv-body-content">
572
+                                        <switch ng-model="subdata.hasSimple" class="green"></switch>
573
+                                    </div>
574
+                                </div>
575
+                                <div class="tab-mainDiv-body-lineDiv-50">
568
                                     <div class="tab-mainDiv-body-lable">运维组/运维人员:</div>
576
                                     <div class="tab-mainDiv-body-lable">运维组/运维人员:</div>
569
                                     <div class="userGroupType">
577
                                     <div class="userGroupType">
570
                                         <label>
578
                                         <label>
@@ -600,6 +608,7 @@
600
                                     </div>
608
                                     </div>
601
                                 </div>
609
                                 </div>
602
                                 
610
                                 
611
+                                
603
                                 <!-- <div class="tab-mainDiv-body-lineDiv-50">
612
                                 <!-- <div class="tab-mainDiv-body-lineDiv-50">
604
                                     <div class="tab-mainDiv-body-lable">关联组:</div>
613
                                     <div class="tab-mainDiv-body-lable">关联组:</div>
605
                                     <ui-select class="tab-mainDiv-body-content" ng-model="subdata.group" theme="bootstrap">
614
                                     <ui-select class="tab-mainDiv-body-content" ng-model="subdata.group" theme="bootstrap">
@@ -630,16 +639,9 @@
630
                                         <switch ng-model="subdata.hasArea" class="green"></switch>
639
                                         <switch ng-model="subdata.hasArea" class="green"></switch>
631
                                     </div>
640
                                     </div>
632
                                 </div> -->
641
                                 </div> -->
642
+                                
633
                                 <!-- <div class="tab-mainDiv-body-lineDiv-50">
643
                                 <!-- <div class="tab-mainDiv-body-lineDiv-50">
634
                                     <div class="tab-mainDiv-body-lable">
644
                                     <div class="tab-mainDiv-body-lable">
635
-                                        是否简单处理:
636
-                                    </div>
637
-                                    <div class="tab-mainDiv-body-content">
638
-                                        <switch ng-model="subdata.hasSimple" class="green"></switch>
639
-                                    </div>
640
-                                </div>
641
-                                <div class="tab-mainDiv-body-lineDiv-50">
642
-                                    <div class="tab-mainDiv-body-lable">
643
                                         是否关联地点:
645
                                         是否关联地点:
644
                                     </div>
646
                                     </div>
645
                                     <div class="tab-mainDiv-body-content">
647
                                     <div class="tab-mainDiv-body-content">
@@ -726,6 +728,14 @@
726
                                         </ui-select>
728
                                         </ui-select>
727
                                     </div>
729
                                     </div>
728
                                     <div class="tab-mainDiv-body-lineDiv-50">
730
                                     <div class="tab-mainDiv-body-lineDiv-50">
731
+                                        <div class="tab-mainDiv-body-lable">
732
+                                            是否简单处理:
733
+                                        </div>
734
+                                        <div class="tab-mainDiv-body-content">
735
+                                            <switch ng-model="adddata.hasSimple" class="green"></switch>
736
+                                        </div>
737
+                                    </div>
738
+                                    <div class="tab-mainDiv-body-lineDiv-50">
729
                                         <div class="tab-mainDiv-body-lable">运维组/运维人员:</div>
739
                                         <div class="tab-mainDiv-body-lable">运维组/运维人员:</div>
730
                                         <div class="userGroupType">
740
                                         <div class="userGroupType">
731
                                             <label>
741
                                             <label>
@@ -790,16 +800,9 @@
790
                                         <switch ng-model="adddata.hasArea" class="green"></switch>
800
                                         <switch ng-model="adddata.hasArea" class="green"></switch>
791
                                     </div>
801
                                     </div>
792
                                 </div> -->
802
                                 </div> -->
803
+                                
793
                                 <!-- <div class="tab-mainDiv-body-lineDiv-50">
804
                                 <!-- <div class="tab-mainDiv-body-lineDiv-50">
794
                                     <div class="tab-mainDiv-body-lable">
805
                                     <div class="tab-mainDiv-body-lable">
795
-                                        是否简单处理:
796
-                                    </div>
797
-                                    <div class="tab-mainDiv-body-content">
798
-                                        <switch ng-model="adddata.hasSimple" class="green"></switch>
799
-                                    </div>
800
-                                </div>
801
-                                <div class="tab-mainDiv-body-lineDiv-50">
802
-                                    <div class="tab-mainDiv-body-lable">
803
                                         是否关联地点:
806
                                         是否关联地点:
804
                                     </div>
807
                                     </div>
805
                                     <div class="tab-mainDiv-body-content">
808
                                     <div class="tab-mainDiv-body-content">