巡检优化

assets/js/controllers/customform/customformCtrl.js

@@ -9900,12 +9900,15 @@ appFormly.config(function config(formlyConfigProvider) {
           5 * 60 * 1000
         );
         if ($scope.model[$scope.options.key]) {
-        } else {
+        } else if($scope.options.key === 'planStartTime' || $scope.options.key === 'planEndTime'){
+          $scope.model[$scope.options.key] = '';
+        }else{
           $scope.model[$scope.options.key] = $filter("date")(
             new Date(new Date().getTime()),
             $scope.options.templateOptions.datepickerPopup
           );
         }
+        
         $scope.options.initialValue = $scope.model[$scope.options.key];
         $scope.endOpen = true;
         $scope.datepicker = {};

assets/js/controllers/inspect/inspectPlanCtrl.js

@@ -180,6 +180,7 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
                 // '<a ng-click="grid.appScope.runFunction(row.entity)" tooltip={{row.entity.runStatus}} tooltip-placement="left"><i class={{row.entity.style}}/></a>' +
                 '<a ng-click="grid.appScope.runFunction(row.entity)"  ng-show="{{row.entity.status.name==\'执行中\'&&grid.appScope.zantingzhixing}}"   class="bianjifont">暂停计划</a>' +
                 '<a ng-click="grid.appScope.runFunction(row.entity)" ng-show="{{row.entity.status.name==\'暂停中\'&&grid.appScope.zantingzhixing}}"   class="bianjifont">继续执行</a>' +
+                '<a ng-click="grid.appScope.executeOnce(row.entity)"  ng-show="{{row.entity.status.name!=\'配置中\'}}"  class="bianjifont">执行一次</a>' +
                 '</div>'
         },
         // { name: 'planTime2', displayName: '截止时间', width: 160, enableFiltering: false },
@@ -215,6 +216,47 @@ app.controller('inspectPlanCtrl', ["$rootScope", "$scope", "$state", "$timeout",
         });
 
     };
+    //执行一次
+    $scope.executeOnce = function (data) {
+        console.log(data);
+        var modalInstance = $modal.open({
+            // templateUrl: 'assets/views/inspect/changRun.html',
+            templateUrl: 'assets/views/delete.html',
+            // size: "sm",
+            controller: function ($scope, $modalInstance) {
+                $scope.title = '提示';
+                $scope.connect = '是否执行一次该巡检计划？';
+
+                $scope.ok = function () {
+                    $modalInstance.close(data);
+                };
+
+                $scope.cancel = function () {
+                    $modalInstance.dismiss('cancel');
+                };
+            },
+            size: 'sm'
+        })
+
+        modalInstance.result.then(function (result) {
+            console.log(result);
+            if (result) {
+                api_bpm_data.executeOnce({inspection:data}).then(function (response) {
+                    if(response.status == 200){
+                        SweetAlert.swal({
+                            title: "操作成功!",
+                            type: "success",
+                        });
+                    }else{
+                        SweetAlert.swal({
+                            title: "操作失败!",
+                            type: "error",
+                        });
+                    }
+                })
+            }
+        });
+    };
     //跳转到查看列表
     $scope.seeFunction = function (data) {
         var filedata = {

assets/js/controllers/inspect/inspectionScopeCtrl.js

@@ -525,6 +525,78 @@ app.controller("inspectionScope", [
       }
       $scope.saveCommon($scope);
     };
+    // 暂存
+    $scope.submit1change_save = function (flag) {
+      $rootScope.isMask = true;
+      var arr = $scope.TreeToArr($scope.copyInspection.tree, []);
+      $scope.stateModel.modelName = $scope.modelName;
+      $scope.stateModel.typeIds = arr.map((v) => v.id).toString();
+      arr = arr.map((v) => ({
+        inspection: $scope.stateModel.id,
+        inspectionType: v.id,
+        inspectionTypeName: v.name,
+        parent: v.parent,
+        user: v.user?v.user.id:undefined,
+        userName: v.user?v.user.name:undefined,
+        group: v.group?v.group.id:undefined,
+        groupName: v.group?v.group.groupName:undefined,
+      }));
+      // 一条都没选择
+      if (arr.length === 0) {
+        arr.push({ inspection: $scope.stateModel.id });
+      }
+      console.log(arr);
+      // return;
+      api_simple.addListData("inspectionBind", arr).then(function (response) {
+        $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)
+                }
+              }
+            );
+          } else {
+            SweetAlert.swal({
+              title: "保存失败!",
+              type: "error",
+            });
+          }
+        }
+      });
+    };
+    // 上一步
+    $scope.submit1change_prev = function(){
+      SweetAlert.swal(
+        {
+          title: "您是否暂存当前设置!",
+          type: "warning",
+          showCancelButton: true,
+          confirmButtonColor: "#DD6B55",
+          confirmButtonText: "是",
+          cancelButtonText: "否",
+        },
+        function (isConfirm) {
+          if (isConfirm) {
+            $scope.submit1change_save(true);
+          }
+        }
+      );
+    }
     $scope.closeModel = function () {
       $state.go("app.inspection.inspectPlan"); //跳转巡检计划列表
     };
@@ -547,6 +619,7 @@ app.controller("inspectionScope", [
         });
         return;
       }
+      $rootScope.isMask = true;
       var arr = $scope.TreeToArr($scope.copyInspection.tree, []);
       $scope.stateModel.modelName = $scope.modelName;
       $scope.stateModel.typeIds = arr.map((v) => v.id).toString();
@@ -567,6 +640,7 @@ app.controller("inspectionScope", [
       console.log(arr);
       // return;
       api_simple.addListData("inspectionBind", arr).then(function (response) {
+        $rootScope.isMask = false;
         if (response) {
           if (response.status == 200) {
             $scope.stateModel.status = { id: 120 }; //强制扭转状态为正常
@@ -745,12 +819,26 @@ app.directive("zTree", function () {
                   node.checked = true;
                   //注：设置checked属性之后，一定要更新该节点
                   zTree.updateNode(node);
+                  console.log($scope.copyInspectionType)
                   // 展开
-                  zTree.expandNode(node);
-                  setTimeout(() => {
-                    zTreeOnCheck(null, null, node);
-                  }, 0);
+                  // zTree.expandNode(node);
+                  // setTimeout(() => {
+                  //   zTreeOnCheck(null, null, node);
+                  // }, 0);
                 });
+                //展示选中的数据
+                var arr = [];
+                $scope.cachehttp.forEach(v=>{
+                  arr.push({
+                    id: v.inspectionType,
+                    name: v.inspectionTypeName,
+                    group: v.group?{id:v.group,groupName:v.groupName}:undefined,
+                    user: v.user?{id:v.user,name:v.userName}:undefined,
+                    parent: v.parent ? { id: v.parent.inspectionType } : undefined,
+                    pId: v.parent ? v.parent.inspectionType : 0,
+                  });
+                })
+                $scope.copyInspectionType = tranListToTreeData(arr);
               });
             // ==================end================
           });
@@ -840,17 +928,6 @@ app.directive("zTree", function () {
         var nodes_arr = treeObj.getCheckedNodes(true);
         var nodes = angular.copy(nodes_arr);
         console.log(nodes);
-        var arr = nodes.filter((v) => v.pId === 0);
-        arr.forEach((v) => {
-          v.children = [];
-        });
-        arr.forEach((v, i) => {
-          nodes.forEach((vv) => {
-            if (vv.pId == v.id) {
-              arr[i].children.push(vv);
-            }
-          });
-        });
         if ($scope.cachehttp && $scope.cachehttp.length) {
           var result = angular.copy($scope.cachehttp);
           zTreeOnCheckCommon(result, nodes);
@@ -867,6 +944,20 @@ app.directive("zTree", function () {
             });
         }
       }
+      function tranListToTreeData(nodes){
+        var arr = nodes.filter((v) => v.pId === 0);
+        arr.forEach((v) => {
+          v.children = [];
+        });
+        arr.forEach((v, i) => {
+          nodes.forEach((vv) => {
+            if (vv.pId == v.id) {
+              arr[i].children.push(vv);
+            }
+          });
+        });
+        return arr;
+      }
       // 点击复选框-common
       function zTreeOnCheckCommon(result, nodes) {
         // 如果有值，则不覆盖
@@ -884,8 +975,8 @@ app.directive("zTree", function () {
           result = result.map((v) => ({
             id: v.inspectionType,
             name: v.inspectionTypeName,
-            group: {id:v.group,groupName:v.groupName},
-            user: {id:v.user,name:v.userName},
+            group: v.group?{id:v.group,groupName:v.groupName}:undefined,
+            user: v.user?{id:v.user,name:v.userName}:undefined,
             parent: v.parent ? { id: v.parent.inspectionType } : undefined,
             pId: v.parent ? v.parent.inspectionType : 0,
           }));
@@ -898,19 +989,7 @@ app.directive("zTree", function () {
             }
           }
         }
-        var arr = nodes.filter((v) => v.pId === 0);
-        arr.forEach((v) => {
-          v.children = [];
-        });
-        arr.forEach((v, i) => {
-          nodes.forEach((vv) => {
-            if (vv.pId == v.id) {
-              arr[i].children.push(vv);
-            }
-          });
-        });
-        console.log(arr);
-        $scope.copyInspectionType = arr;
+        $scope.copyInspectionType = tranListToTreeData(nodes);
       }
     },
   };

assets/js/main.js

@@ -947,6 +947,10 @@ app.factory('api_bpm_data', ['BpmRestangular', function (BpmRestangular) {
     var inspectionProcessActual = BpmRestangular.all("InspectionProcessActual");
     var solutionService = BpmRestangular.all("solution");
     return {
+        // 执行一次
+        executeOnce: function (data) {
+            return dataService.customPOST(data, 'triggerInspection');
+        },
         // 获取首页今日上班清空
         getManagerIndexInfo: function (data) {
             return dataService.customPOST(data, 'getManagerIndexInfo');

assets/views/inspect/inspectionScope.html

@@ -583,7 +583,9 @@
                 <!-- 巡检范围结束 -->
             </div>
             <div class="inspection_btns col-xs-12">
-                <div class="btn btn_search" ng-click="submit1change()" ng-show="xinzeng">执行巡检计划</div>
+                <div class="btn btn_search" ng-click="submit1change_prev()" ng-show="xinzeng">上一步</div>
+                <div class="btn btn_search" ng-click="submit1change()" ng-show="xinzeng">开始计划</div>
+                <div class="btn btn_search" ng-click="submit1change_save()" ng-show="xinzeng">暂存</div>
                 <div class="btn btn_remove" ng-class="isMousedown?'btn_removeMousedown':''" ng-click="closeModel()" ng-show="shanchu">关闭</div>
             </div>
         </div>