巡检优化

assets/js/config.router.js

@@ -1402,7 +1402,7 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
 
             //巡检管理>巡检范围设置
             .state('app.inspectionScope', {
-                url: '/inspectionScope/{model}',
+                url: '/inspectionScope/{id}',
                 templateUrl: "assets/views/inspect/inspectionScope.html",
                 resolve: loadSequence('ui.select', 'multi.select.tree', 'angularBootstrapNavTree', 'spin', 'ladda', 'angular-ladda', 'inspectionScopeCtrl'),
                 title: 'Nav Manager',

assets/js/controllers/inspect/inspectForm.js

@@ -636,7 +636,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
                                             // }, function() {
                                             //     $state.go($scope.formData.cancelUrl);
                                             // });
-                                            $state.go('app.inspectionScope',{ 'model': JSON.stringify(resData.data) });//跳转巡检范围设置-编辑
+                                            $state.go('app.inspectionScope',{ 'id': resData.data.id });//跳转巡检范围设置-编辑
                                         } else {
                                             SweetAlert.swal({
                                                 title: "提交失败",
@@ -670,7 +670,7 @@ sysFormly.controller('SystemformCtrl', ['$rootScope', '$scope', '$parse', '$filt
                                             // }, function() {
                                             //     $state.go($scope.formData.cancelUrl);
                                             // });
-                                            $state.go('app.inspectionScope',{ 'model': JSON.stringify(resData.data) });//跳转巡检范围设置-新增
+                                            $state.go('app.inspectionScope',{ 'id': resData.data.id });//跳转巡检范围设置-新增
                                         } else {
                                             SweetAlert.swal({
                                                 title: "系统错误",

assets/js/controllers/inspect/inspectionScopeCtrl.js

@@ -36,12 +36,89 @@ app.controller("inspectionScope", [
     api_simple
   ) {
     var loginUser = $rootScope.user;
-    $scope.stateModel = JSON.parse($state.params.model);
-    console.log($scope.stateModel);
-    $scope.modelName = $scope.stateModel.modelName || $scope.stateModel.title;
-    if ($scope.stateModel.model != 1) {
-      $scope.stateModel.model = 0;
+    // 回显数据 start
+    $scope.stateModel = {id: $state.params.id};
+    $scope.getInspectionById= function () {
+      api_user_data.fetchgetData("inspection", $state.params.id).then((res) => {
+        console.log(res.data)
+        if(res.status == 200){
+          $scope.stateModel = res.data;
+          console.log($scope.stateModel);
+          $scope.modelName = $scope.stateModel.modelName || $scope.stateModel.title;
+          if ($scope.stateModel.model != 1) {
+            $scope.stateModel.model = 0;
+          }
+          // 通知规则
+          console.log($scope.incidentManageruserList)
+          console.log($scope.notice.inspectionMsgRules)
+          $scope.notice.user = [];
+          var msgRuleIds = $scope.stateModel.msgRules?$scope.stateModel.msgRules.split(','):[];
+          var msgUserIds = $scope.stateModel.msgUsers?$scope.stateModel.msgUsers.split(','):[];
+          if(msgRuleIds.length){
+            msgRuleIds.forEach(v => {
+              for (let i = 0; i < $scope.notice.inspectionMsgRules.length; i++) {
+                if($scope.notice.inspectionMsgRules[i].id == v){
+                  $scope.notice.inspectionMsgRules[i].checked = true;
+                }
+              }
+            })
+          }
+          if(msgUserIds.length){
+            msgUserIds.forEach(v => {
+              let item = $scope.incidentManageruserList.find(vv => vv.id == v);
+              if(item){
+                $scope.notice.user.push(item);
+              }
+            })
+          }
+          
+        }
+      });
+    };
+    console.log($state.params.id)
+    // $scope.stateModel = JSON.parse($state.params.model);
+    // console.log($scope.stateModel);
+    // $scope.modelName = $scope.stateModel.modelName || $scope.stateModel.title;
+    // if ($scope.stateModel.model != 1) {
+    //   $scope.stateModel.model = 0;
+    // }
+    // 回显数据 end
+    // 通知 start
+    // 获取事件经理角色的人
+    $scope.incidentManageruserList = [];
+    $scope.getUserListByRole = function () {
+      var postData = {
+        idx: 0,
+        sum: 1000,
+        "user": {
+          "roledata": {
+              "rolecode": "incident manager"
+          },
+          "simple": true
+        }
+      };
+      api_user_data.fetchDataList("user", postData).then((res) => {
+        $scope.incidentManageruserList = res.list;
+        $scope.getInspectionById();
+      });
+    };
+    // 通知规则
+    $scope.notice = {
+      user: [],
+      inspectionMsgRules: []
+    }
+    $scope.getInspectionMsgRules = function(){
+      var postData = {
+        key: "inspection_msg_rules",
+        type: "list"
+      }
+      api_wechatfile.getDictionary(postData).then(function (res) {
+        $scope.notice.inspectionMsgRules = res.map(v => ({...v, checked:false}));
+        $scope.getUserListByRole();
+      })
     }
+    $scope.getInspectionMsgRules();
+    // 通知 end
     $scope.xinzeng = false;
     $scope.shanchu = false;
     $scope.bianji = false;
@@ -502,6 +579,7 @@ app.controller("inspectionScope", [
     });
     // 保存设置 liaomingming
     $scope.submit1change = function () {
+      console.log($scope.notice);
       console.log($scope.copyInspection.tree);
       console.log($scope.stateModel);
       if ($scope.stateModel.model === 0) {
@@ -558,25 +636,58 @@ app.controller("inspectionScope", [
         $rootScope.isMask = false;
         if (response) {
           if (response.status == 200) {
-            SweetAlert.swal(
-              {
-                title: "暂存成功!",
-                type: "success",
-              },
-              function () {
-                if(flag){
-                  window.history.back();
-                }else{
-                  $scope.selectedchangecategory.value = {};
-                  $scope.copyInspection.tree = [];
-                  $scope.changecateObj.changecate = false;
-                  $scope.selectedInspection.isShowZtree = false;
-                  setTimeout(()=>{
-                      $scope.selectedInspection.isShowZtree = true;
-                  },0)
+            var filedata = {
+              close: "关闭",
+              save: "暂存",
+              submit: "下一步",
+              inspection: $scope.stateModel,
+            };
+            console.log($scope.notice);
+            var inspectionMsgRules = $scope.notice.inspectionMsgRules.filter(v => v.checked);
+            var user = $scope.notice.user;
+            if(inspectionMsgRules.length){
+              filedata.inspection.msgRules = inspectionMsgRules.map(v=>v.id).toString()
+            }else{
+              delete filedata.inspection.msgRules;
+            }
+            if(user.length){
+              filedata.inspection.msgUsers = user.map(v=>v.id).toString()
+            }else{
+              delete filedata.inspection.msgUsers;
+            }
+            // 修改巡检计划 baba
+            api_bpm_data
+              .addData("inspection", filedata)
+              .then(function (response) {
+                if (response) {
+                  if (response.status == 200) {
+                    SweetAlert.swal(
+                      {
+                        title: "暂存成功!",
+                        type: "success",
+                      },
+                      function () {
+                        if(flag){
+                          window.history.back();
+                        }else{
+                          $scope.selectedchangecategory.value = {};
+                          $scope.copyInspection.tree = [];
+                          $scope.changecateObj.changecate = false;
+                          $scope.selectedInspection.isShowZtree = false;
+                          setTimeout(()=>{
+                              $scope.selectedInspection.isShowZtree = true;
+                          },0)
+                        }
+                      }
+                    );
+                  } else {
+                    SweetAlert.swal({
+                      title: "保存失败!",
+                      type: "error",
+                    });
+                  }
                 }
-              }
-            );
+              });
           } else {
             SweetAlert.swal({
               title: "保存失败!",
@@ -659,6 +770,20 @@ app.controller("inspectionScope", [
               submit: "下一步",
               inspection: $scope.stateModel,
             };
+            console.log($scope.notice);
+            var inspectionMsgRules = $scope.notice.inspectionMsgRules.filter(v => v.checked);
+            var user = $scope.notice.user;
+            if(inspectionMsgRules.length){
+              filedata.inspection.msgRules = inspectionMsgRules.map(v=>v.id).toString()
+            }else{
+              delete filedata.inspection.msgRules;
+            }
+            if(user.length){
+              filedata.inspection.msgUsers = user.map(v=>v.id).toString()
+            }else{
+              delete filedata.inspection.msgUsers;
+            }
+            // 修改巡检计划 baba
             api_bpm_data
               .addData("inspection", filedata)
               .then(function (response) {
@@ -670,13 +795,6 @@ app.controller("inspectionScope", [
                         type: "success",
                       },
                       function () {
-                        // $scope.selectedchangecategory.value = {};
-                        // $scope.copyInspection.tree = [];
-                        // $scope.changecateObj.changecate = false;
-                        // $scope.selectedInspection.isShowZtree = false;
-                        // setTimeout(()=>{
-                        //     $scope.selectedInspection.isShowZtree = true;
-                        // },0)
                         $state.go("app.inspection.inspectPlan"); //跳转巡检计划列表
                       }
                     );
@@ -963,12 +1081,17 @@ app.directive("zTree", function () {
       function tranListToTreeData(nodes){
         var arr = nodes.filter((v) => v.pId === 0);
         arr.forEach((v) => {
-          v.children = [];
+          // v.children = [];
+          delete v.children;
         });
-        arr.forEach((v, i) => {
+        arr.forEach((v) => {
           nodes.forEach((vv) => {
             if (vv.pId == v.id) {
-              arr[i].children.push(vv);
+              if(v.children){
+                v.children.push(vv);
+              }else{
+                v.children = [vv];
+              }
             }
           });
         });

assets/views/inspect/inspectionScope.html

@@ -533,7 +533,7 @@
                 
                         <div class="mainDivRight" ng-if="changecateObj.changecate && copyInspection.tree.length">
                             <div class="mainDiv-head">
-                                <!-- <span>服务目录修改</span> -->
+                                <span>默认组和默认人</span>
                             </div>
                             <div class="mainDiv-body">
                                 <div class="tab-mainDiv-body-lineDiv-50">
@@ -570,7 +570,7 @@
                 
                         <div class="mainDivRight" ng-if="!(changecateObj.changecate && copyInspection.tree.length)">
                             <div class="mainDiv-head">
-                                <span>操作提示</span>
+                                <span>默认组和默认人</span>
                             </div>
                             <div class="mainDiv-body">
                                 <div class="mainDiv-body-noList">
@@ -578,6 +578,29 @@
                                     <p class="handlefont">请选择巡检范围</p>
                                 </div>
                             </div>
+                            <div class="mainDiv-head">
+                                <span>通知规则</span>
+                            </div>
+                            <div class="mainDiv-body" style="padding: 16px;">
+                                <div>
+                                    <label>通知人：</label>
+                                    <ui-select class="tab-mainDiv-body-content" ng-model="notice.user"
+                                        theme="bootstrap" multiple>
+                                        <ui-select-match placeholder="">
+                                            {{$item.name}}
+                                        </ui-select-match>
+                                        <ui-select-choices repeat="item in incidentManageruserList | filter: $select.search">
+                                            <div ng-bind-html="item.name | highlight: $select.search"></div>
+                                        </ui-select-choices>
+                                    </ui-select>
+                                </div>
+                                <div style="margin-top: 8px;">
+                                    <label>通知选项：</label>
+                                    <div ng-repeat="item in notice.inspectionMsgRules">
+                                        <label style="cursor: pointer;"><input type="checkbox" name="inspectionMsgRules" ng-model="item.checked" style="position: relative;top:2px;margin-right:2px;">{{item.name}}</label>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>   
                 </div>