巡检优化

assets/js/controllers/inspect/inspectionScopeCtrl.js

@@ -52,6 +52,13 @@ app.controller("inspectionScope", [
           $scope.stateModel = res.data;
           console.log($scope.stateModel);
           $scope.modelName = $scope.stateModel.modelName || $scope.stateModel.title;
+          $scope.everyDay = {
+            time: $scope.stateModel.dayMsgTime?new Date($scope.stateModel.dayMsgTime):new Date(),
+            everyDayNotices: [
+              {id:0 ,name:'线上', checked:$scope.stateModel.dayMsgOnline == 1},
+              {id:1 ,name:'线下', checked:$scope.stateModel.dayMsgOffline == 1}
+            ]
+          }
           if ($scope.stateModel.model != 1) {
             $scope.stateModel.model = 0;
           }
@@ -587,7 +594,6 @@ app.controller("inspectionScope", [
     // 保存设置 liaomingming
     $scope.submit1change = function () {
       console.log($scope.everyDay);
-      debugger;
       console.log($scope.notice);
       console.log($scope.copyInspection.tree);
       console.log($scope.stateModel);
@@ -642,7 +648,6 @@ app.controller("inspectionScope", [
       console.log(arr);
       // return;
       api_simple.addListData("inspectionBind", arr).then(function (response) {
-        $rootScope.isMask = false;
         if (response) {
           if (response.status == 200) {
             var filedata = {
@@ -664,10 +669,17 @@ app.controller("inspectionScope", [
             }else{
               delete filedata.inspection.msgUsers;
             }
+            var dayMsgOnline = $scope.everyDay.everyDayNotices.find(v => v.id === 0).checked;//线上
+            var dayMsgOffline = $scope.everyDay.everyDayNotices.find(v => v.id === 1).checked;//线下
+            var dayMsgTime = $scope.everyDay.time;
+            filedata.inspection.dayMsgOnline = dayMsgOnline ? 1: 0;
+            filedata.inspection.dayMsgOffline = dayMsgOffline ? 1: 0;
+            filedata.inspection.dayMsgTime = dayMsgTime ? (new Date(dayMsgTime).getTime()): (new Date().getTime());
             // 修改巡检计划 baba
             api_bpm_data
               .addData("inspection", filedata)
               .then(function (response) {
+                $rootScope.isMask = false;
                 if (response) {
                   if (response.status == 200) {
                     SweetAlert.swal(
@@ -677,7 +689,15 @@ app.controller("inspectionScope", [
                       },
                       function () {
                         if(flag){
-                          window.history.back();
+                          $state.go('app.inspection.editor', {
+                              formKey: 'inspectionform',
+                              service: 'api_bpm_data',
+                              model: JSON.stringify({
+                                model: {
+                                    inspection: filedata.inspection
+                                }
+                              })
+                          });
                         }else{
                           $scope.selectedchangecategory.value = {};
                           $scope.copyInspection.tree = [];
@@ -698,11 +718,14 @@ app.controller("inspectionScope", [
                 }
               });
           } else {
+            $rootScope.isMask = false;
             SweetAlert.swal({
               title: "保存失败!",
               type: "error",
             });
           }
+        }else{
+          $rootScope.isMask = false;
         }
       });
     };
@@ -792,6 +815,12 @@ app.controller("inspectionScope", [
             }else{
               delete filedata.inspection.msgUsers;
             }
+            var dayMsgOnline = $scope.everyDay.everyDayNotices.find(v => v.id === 0).checked;//线上
+            var dayMsgOffline = $scope.everyDay.everyDayNotices.find(v => v.id === 1).checked;//线下
+            var dayMsgTime = $scope.everyDay.time;
+            filedata.inspection.dayMsgOnline = dayMsgOnline ? 1: 0;
+            filedata.inspection.dayMsgOffline = dayMsgOffline ? 1: 0;
+            filedata.inspection.dayMsgTime = dayMsgTime ? (new Date(dayMsgTime).getTime()): (new Date().getTime());
             // 修改巡检计划 baba
             api_bpm_data
               .addData("inspection", filedata)

assets/js/controllers/performance/scoreConfigurationPerformanceCtrl.js

@@ -241,7 +241,9 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
                 removeRules: 1
             }
             if (result) {
+                $rootScope.isMask = true;
                 api_bpm_data.setScoreRule(postData).then(function (response) {
+                    $rootScope.isMask = false;
                     if(response.status == 200){
                         var postData = {
                             ids: result.selectedItems.map(v => v.id).toString(),
@@ -357,7 +359,9 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
                 removeRules: 1
             }
             if (result) {
+                $rootScope.isMask = true;
                 api_bpm_data.setScoreRule(postData).then(function (response) {
+                    $rootScope.isMask = false;
                     if(response.status == 200){
                         var postData = {
                             ids: result.selectedItems.map(v => v.id).toString(),

assets/js/controllers/performance/servicePerformanceCtrl.js

@@ -74,7 +74,7 @@ app.controller("servicePerformanceCtrl", [
           if (response) {
             if ((response.status = 200)) {
               $scope.isMaskground = false;
-              $scope.charginrow = response.data;
+              $scope.charginrow = response.data.sort((a, b) => b.total - a.total);
               // 图表
               barechart6(response.data);
               barechart7(response.data);