巡检配置修改

assets/js/controllers/inspect/inspectionScopeCtrl.js

@@ -592,33 +592,34 @@ app.controller("inspectionScope", [
         delete $scope.selectedchangecategory.value.user;
       }
     });
-    // 保存设置 liaomingming
+    // 保存设置
     $scope.submit1change = function () {
       console.log($scope.everyDay);
       console.log($scope.notice);
       console.log($scope.copyInspection.tree);
       console.log($scope.stateModel);
-      // let trees = $scope.copyInspection.tree;
-      // for (let i = 0; i < trees.length; i++) {
-      //   let element = trees[i];
-      //   if(!element.group){
-      //     SweetAlert.swal({
-      //       title: "校验错误",
-      //       text: `【${element.name}】未选择线下巡检默认组`,
-      //       type: "error",
-      //       confirmButtonColor: "#DD6B55"
-      //     });
-      //     return;
-      //   }
-      //   if(!element.user){
-      //     SweetAlert.swal({
-      //       title: "校验错误",
-      //       text: `【${element.name}】未选择线上巡检默认人`,
-      //       type: "error",
-      //       confirmButtonColor: "#DD6B55"
-      //     });
-      //     return;
-      //   }
+
+      let trees = $scope.copyInspection.tree;
+      for (let i = 0; i < trees.length; i++) {
+        let element = trees[i];
+        if(($scope.stateModel.onlineType.value == 2 || $scope.stateModel.onlineType.value == 3) && !element.group){
+          SweetAlert.swal({
+            title: "校验错误",
+            text: `【${element.name}】未选择线下巡检默认组`,
+            type: "error",
+            confirmButtonColor: "#DD6B55"
+          });
+          return;
+        }
+        if(($scope.stateModel.onlineType.value == 1 || $scope.stateModel.onlineType.value == 3) && !element.user){
+          SweetAlert.swal({
+            title: "校验错误",
+            text: `【${element.name}】未选择线上巡检默认人`,
+            type: "error",
+            confirmButtonColor: "#DD6B55"
+          });
+          return;
+        }
 
       //   let children = trees[i].children || [];
       //   for (let i = 0; i < children.length; i++) {
@@ -642,7 +643,7 @@ app.controller("inspectionScope", [
       //       return;
       //     }
       //   }
-      // }
+      }
       if ($scope.stateModel.model === 0) {
         // 不设置为模块的时候需要弹窗提示
         var modalInstance = $modal.open({

assets/views/inspect/inspectionScope.html

@@ -92,29 +92,29 @@
     }
    /* 事件分类开始 */
    /* 公共css,需要复用 */
-    
+
    .iconfont {
         font-size: 14px;
     }
-    
+
     .nav-pills>li>a {
         border-radius: 0px;
         color: #333;
     }
-    
+
     .nav-pills>li.active>a,
     .nav-pills>li.active>a:hover,
     .nav-pills>li.active>a:focus {
         background-color: #006bbf;
         color: white !important;
     }
-    
+
     .panel-tabs,
     .tabbable {
         /* padding: 14px; */
         background-color: white;
     }
-    
+
     .tab-content>.tab-pane,
     .pill-content>.pill-pane {
         padding: 14px;
@@ -123,14 +123,14 @@
         border-right: 1px solid #eeeeee;
         border-radius: 0px 0px 8px 8px;
     }
-    
+
     .nav-tabs>li.active a,
     .nav-tabs>li.active a:hover,
     .nav-tabs>li.active a:focus {
         background-color: #006bc0;
         color: white;
     }
-    
+
     .nav-tabs {
         border-top: 1px solid #eeeeee;
         border-bottom: 1px solid #eeeeee;
@@ -139,16 +139,16 @@
         border-radius: 8px 8px 0 0;
         height: 47px;
     }
-    
+
     .nav-tabs>li {
         border-right: 1px solid #eeeeee;
     }
-    
+
     .nav-tabs>li:last-child {
         border-right: none;
     }
     /* 独立css */
-    
+
     .mainDiv {
         /* background: red; */
         /* padding: 14px; */
@@ -156,7 +156,7 @@
         overflow: hidden;
         /* zoom: 1; */
     }
-    
+
     .mainDivLeft {
         border-radius: 8px;
         border: 1px solid #eeeeee;
@@ -164,14 +164,14 @@
         float: left;
         min-height: 541px;
     }
-    
+
     .mainDivRight {
         margin-left: 302px;
         border-radius: 8px;
         border: 1px solid #eeeeee;
         /* min-height: 541px; */
     }
-    
+
     .mainDiv-head {
         height: 30px;
         line-height: 30px;
@@ -182,7 +182,7 @@
         padding-left: 10px;
         padding-right: 4px;
     }
-    
+
     .mainDivLeft-span {
         border: 1px solid;
         /* padding: 15px 0px 15px 0px; */
@@ -196,35 +196,35 @@
         margin-right: 10px;
         font-size: 14px;
     }
-    
+
     .mainDiv-head-right {
         display: inline-block;
         float: right;
     }
-    
+
     .edit-left {
         display: inline-block;
         /* float: left; */
         margin-left: 10px;
     }
-    
+
     .span-1 {
         border-color: #006bc0;
         color: #006bc0;
     }
-    
+
     .span-2 {
         border: none;
         color: white;
         background-color: #006bc0;
     }
-    
+
     .span-3 {
         border: none;
         color: white;
         background-color: #fc4c58;
     }
-    
+
     .mainDiv-body {
         border-radius: 8px;
         border: 1px solid #eeeeee;
@@ -233,7 +233,7 @@
         /* height: 402px; */
         /* overflow: auto; */
     }
-    
+
     .mainDiv-body-1 {
         height: 50px;
         line-height: 50px;
@@ -242,7 +242,7 @@
         padding: 0px 14px;
         border-bottom: 1px solid #eeeeee;
     }
-    
+
     .mainDiv-body-2 {
         height: 70px;
         line-height: 70px;
@@ -251,16 +251,16 @@
         padding: 0px 30px;
         border-bottom: 1px solid #eeeeee;
     }
-    
+
     .mainDiv-body-2:last-child {
         border-bottom: none;
     }
-    
+
     /* .fixHeight {
         height: 450px;
         overflow: auto;
     } */
-    
+
     .mainDiv-body-3 {
         height: 50px;
         line-height: 50px;
@@ -269,7 +269,7 @@
         padding: 0px 30px;
         border-bottom: 1px solid #eeeeee;
     }
-    
+
     .mainDiv-body-3:last-child {
         border-bottom: none;
     }
@@ -283,7 +283,7 @@
         margin-bottom: 0px;
         overflow: hidden;
     }
-    
+
     .mainDiv-body-noList {
         height: 180px;
         display: flex;
@@ -291,11 +291,11 @@
         justify-content: center;
         align-items: center;
     }
-    
+
     .form-control {
         display: inline-block;
     }
-    
+
     .mainDivLeft-span-1 {
         border: 1px solid;
         padding-left: 15px;
@@ -309,7 +309,7 @@
         font-size: 14px;
         display: inline-block;
     }
-    
+
     .mainDivLeft-span-2 {
         border: 1px solid;
         padding-left: 15px;
@@ -323,7 +323,7 @@
         font-size: 14px;
         display: inline-block;
     }
-    
+
     .mainDivLeft-span-edit-1 {
         border: 1px solid;
         padding-left: 8px;
@@ -337,7 +337,7 @@
         font-size: 12px;
         display: inline-block;
     }
-    
+
     .mainDivLeft-span-edit-2 {
         border: 1px solid;
         padding-left: 8px;
@@ -352,13 +352,13 @@
         display: inline-block;
     }
     /* tab内容css */
-    
+
     .tab-mainDiv {
         border: 1px solid #eeeeee;
         border-radius: 8px;
         /* min-height: 360px; */
     }
-    
+
     .tab-mainDiv-head {
         text-align: center;
         border-bottom: 1px solid #eeeeee;
@@ -367,7 +367,7 @@
         font-size: 14px;
         color: #93989e;
     }
-    
+
     .tab-mainDiv-body {
         padding: 14px;
         min-height: 280px;
@@ -376,7 +376,7 @@
         /* padding-top: 14px; */
         /* padding-bottom: 14px; */
     }
-    
+
     .tab-mainDiv-body-lineDiv-50 {
         /* display: inline-block; */
         font-size: 14px;
@@ -385,7 +385,7 @@
         width: 47%;
         padding-left: 14px;
     }
-    
+
     .tab-mainDiv-body-lineDiv-100 {
         /* display: inline-block; */
         font-size: 14px;
@@ -394,29 +394,29 @@
         width: 96%;
         padding-left: 14px;
     }
-    
+
     .tab-mainDiv-body-lable {
         padding-bottom: 10px;
         /* width: 370px; */
     }
-    
+
     .tab-mainDiv-body-content {
         padding-bottom: 10px;
         /* width: 370px; */
     }
-    
+
     .tab-mainDiv-body-content>textarea {
         min-height: 68px;
         width: 100%;
     }
-    
+
     .tab-mainDiv-foot {
         /* margin: 14px auto; */
         border-top: 1px solid #eeeeee;
         text-align: center;
         padding: 7px;
     }
-    
+
     .tab-mainDiv-body-button-1 {
         display: inline-block;
         width: 80px;
@@ -429,7 +429,7 @@
         border-radius: 4px;
         margin-right: 14px;
     }
-    
+
     .tab-mainDiv-body-button-2 {
         display: inline-block;
         width: 80px;
@@ -443,7 +443,7 @@
         box-sizing: border-box;
         border: 1px solid #eeeeee;
     }
-    
+
     .tree-control .tree-view {
         width: inherit;
         z-index: 9999;
@@ -536,13 +536,13 @@
                                 </div>
                             </div>
                         </div>
-                
+
                         <div class="mainDivRight" ng-if="changecateObj.changecate && copyInspection.tree.length">
                             <div class="mainDiv-head">
                                 <span>默认组和默认人</span>
                             </div>
                             <div class="mainDiv-body" style="padding: 16px;height:182px;">
-                                <div class="tab-mainDiv-body-lineDiv-50">
+                                <div class="tab-mainDiv-body-lineDiv-50" ng-if="stateModel.onlineType.value == 2 || stateModel.onlineType.value == 3">
                                     <div class="tab-mainDiv-body-lable">线下巡检默认组:</div>
                                     <ui-select class="tab-mainDiv-body-content" ng-model="group_user.offlineGroup"
                                         theme="bootstrap">
@@ -554,7 +554,7 @@
                                         </ui-select-choices>
                                     </ui-select>
                                 </div>
-                                <div class="tab-mainDiv-body-lineDiv-50">
+                                <div class="tab-mainDiv-body-lineDiv-50" ng-if="stateModel.onlineType.value == 1 || stateModel.onlineType.value == 3">
                                     <div class="tab-mainDiv-body-lable">线上巡检默认人:</div>
                                     <ui-select class="tab-mainDiv-body-content" ng-model="group_user.onlineUser"
                                         theme="bootstrap">
@@ -573,7 +573,7 @@
                                 </div>
                             </div> -->
                         </div>
-                
+
                         <div class="mainDivRight" ng-if="!(changecateObj.changecate && copyInspection.tree.length)">
                             <div class="mainDiv-head">
                                 <span>默认组和默认人</span>
@@ -634,7 +634,7 @@
                                 </div>
                             </div>
                         </div>
-                    </div>   
+                    </div>
                 </div>
                 <!-- 巡检范围结束 -->
             </div>
@@ -665,6 +665,6 @@
                 </div>
             </div>
         </div>
-        
+
     </div>
 </div>