优化

assets/js/controllers/desk/jry_emergencyCtrl.js

@@ -64,7 +64,7 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
 
         var mun = $scope.gridOptions.paginationPageSize;
 
-        // $scope.gridOptions.rowTemplate = "<div ng-click=\"lookFunction(row)\" ng-repeat=\"(colRenderIndex, col) in colContainer.renderedColumns track by col.uid\" ui-grid-one-bind-id-grid=\"rowRenderIndex + '-' + col.uid + '-cell'\" class=\"ui-grid-cell\" ng-class=\"{ 'ui-grid-row-header-cell': col.isRowHeader }\" role=\"{{col.isRowHeader ? 'rowheader' : 'gridcell'}}\" ui-grid-cell></div>";
+        $scope.gridOptions.rowTemplate = "<div ng-click=\"lookFunction(row)\" ng-repeat=\"(colRenderIndex, col) in colContainer.renderedColumns track by col.uid\" ui-grid-one-bind-id-grid=\"rowRenderIndex + '-' + col.uid + '-cell'\" class=\"ui-grid-cell\" ng-class=\"{ 'ui-grid-row-header-cell': col.isRowHeader }\" role=\"{{col.isRowHeader ? 'rowheader' : 'gridcell'}}\" ui-grid-cell></div>";
 
 
 
@@ -268,6 +268,72 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
 
         ];
 
+
+        //批量恢复
+        $scope.oneClickRecovery = function () {
+            console.log($scope.selected.items);
+            var modalInstance = $modal.open({
+                templateUrl: 'assets/views/delete.html',
+                controller: function ($scope, $modalInstance) {
+                    $scope.title = '批量恢复';
+                    $scope.connect = '确定要批量恢复？';
+                    $scope.ok = function () {
+                        $modalInstance.close("start");
+                    };
+
+                    $scope.cancel = function () {
+                        $modalInstance.dismiss('cancel');
+                    };
+                },
+                size: 'sm'
+            })
+
+            modalInstance.result.then(function (result) {
+                if (result) {
+                    if ($scope.selected.items.length != 0) {
+                        $rootScope.isMask = true;
+                    }
+                    var rmvList = [];
+                    angular.forEach($scope.selected.items, function (item) {
+                        rmvList.push(item.id);
+                    });
+
+                    if (rmvList.length > 0) {
+                        api_bpm_data.oneClickRecovery({ids: String(rmvList)}).then(function (response) {
+                            if (response.status == 200) {
+                                $rootScope.isMask = false;
+                                SweetAlert.swal({
+                                    title: "操作成功!",
+                                    type: "success",
+                                    confirmButtonColor: "#007AFF"
+                                }, function () {
+                                    $scope.myData = _.reject($scope.myData, function (o) {
+                                        return _.includes(rmvList, o.id);
+                                    });
+                                    $scope.selected = {
+                                        items: []
+                                    };
+                                });
+                                $scope.gridApi.selection.clearSelectedRows();
+                                $scope.refreshData('expand-right', $scope.fileData);
+                            } else {
+                                $rootScope.isMask = false;
+                                SweetAlert.swal({
+                                    title: "操作异常!",
+                                    text: "系统异常，请稍后重试，或者联系管理员！",
+                                    type: "error"
+                                });
+                            }
+                        })
+                    }
+
+                }
+
+            }, function () {
+                // $scope.ldloading[style.replace('-', '_')] = false;
+            });
+        }
+
         // console.log(row);
 
         $scope.wtwt = function(row) {
@@ -376,6 +442,36 @@ app.controller('jry_emergencyCtrl', ["$scope", "i18nService", "$rootScope", "$st
 
             });
 
+            //勾选行事件
+            gridApi.selection.on.rowSelectionChanged($scope, function (data) {
+                if (data.isSelected) {
+                    $scope.selected.items.push(data.entity);
+                } else {
+                    //objs：需要遍历的集合 data:遍历时当前的数据 index:遍历时当前索引 
+                    //array:需要遍历的集合，每次遍历时都会把objs原样的传一次。
+                    //angular.forEach(objs, function(data,index,array)
+                    angular.forEach($scope.selected.items, function (ObjIndex, index, destObj) {
+                        // console.log(ObjIndex);
+                        // console.log(index);
+                        // console.log(destObj);
+                        if (ObjIndex.id == data.entity.id) {
+                            destObj.splice(index, 1)
+                        }
+                    })
+                }
+            });
+
+            //批量全选
+            gridApi.selection.on.rowSelectionChangedBatch($scope, function (rows, event) {
+                angular.forEach(rows, function (ObjIndex, index, destObj) {
+                    if (ObjIndex.isSelected) {
+                        $scope.selected.items.push(ObjIndex.entity);
+                    } else {
+                        $scope.selected.items = [];
+                    }
+                });
+            });
+
 
 
             $scope.selected = {

assets/js/controllers/incident/incidentCtrl.js

@@ -1854,6 +1854,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         var filadata = angular.copy($scope.memoryfilterData);
         filadata.sum = 10000;
         console.log($scope.filadata)
+        $rootScope.isMask = true;
         $http({
             url: api_bpm_data.downDataModel("incident", 3).getRequestedUrl(),
             method: 'POST',
@@ -1864,6 +1865,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             },
             responseType: 'arraybuffer'
         }).success(function (data, status, headers, config) {
+            $rootScope.isMask = false;
             // $scope.ldloading.zoom_in = false;
             var file = new Blob([data], {
                 type: 'application/vnd.ms-excel'
@@ -1878,6 +1880,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             a.click();
         }).error(function (data, status, headers, config) {
             // $scope.ldloading.zoom_in = false;
+            $rootScope.isMask = false;
             console.log(data);
         });
     }

assets/js/controllers/mainCtrl.js

@@ -2964,6 +2964,22 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
               }
             })
           };
+          // 一键已读
+          $scope.redAllIn = function () {
+            $rootScope.isMask = true;
+            api_msg.oneClickRead({userId: $rootScope.user.id}).then(function (data) {
+              $rootScope.isMask = false;
+              if (data.status == 200) {
+                $rootScope.msgData.messageStation.readStatus = 0,
+                  api_msg.msgDataList($rootScope.msgData).then(function (data) {
+                    $scope.wt_msgData = data
+                    $rootScope.msg = data.list
+                    $rootScope.all = data.pageCount;
+                    $rootScope.noReadData = data.totalNum;
+                  })
+              }
+            })
+          };
         },
         size: 'lg',
         resolve: {

assets/js/main.js

@@ -207,6 +207,9 @@ app.factory('api_msg', ['msgRestangular', function (msgRestangular) {
         updateDataList: function (data) {
             return msgService.customPOST(data, 'updateModel/messageStation', {});
         },
+        oneClickRead: function (data) {
+            return msgService.customPOST(data, 'oneClickRead', {});
+        },
     };
 }]);
 
@@ -948,6 +951,10 @@ app.factory('api_bpm_data', ['BpmRestangular', function (BpmRestangular) {
     var inspectionProcessActual = BpmRestangular.all("InspectionProcessActual");
     var solutionService = BpmRestangular.all("solution");
     return {
+        // 批量恢复
+        oneClickRecovery: function (data) {
+            return dataService.customPOST(data, 'oneClickRecovery');
+        },
         // 设置服务台积分规则
         setScoreRule: function (data) {
             return dataService.customPOST(data, 'setScoreRule');

assets/views/desk/jry_emergency.html

@@ -8,18 +8,23 @@
     </div>
 </section>
 <div ng-controller="jry_emergencyCtrl">
-    <div class="btn-group">
-        <button class="btn btn-statebutton statebutton  keepleftbottom wtBtn" ng-click="onChange('')" ng-class="{'statecolor':searchstate==''}">全部</button>
-        <button class="btn btn-statebutton statebutton wtBtn" ng-class="{'statecolor':searchstate==dictionaryData[0]}" ng-click="onChange(dictionaryData[0])">未处理</button>
-        <button class="btn btn-statebutton statebutton wtBtn" ng-class="{'statecolor':searchstate==dictionaryData[1]}" ng-click="onChange(dictionaryData[1])">处理中</button>
-        <button class="btn btn-statebutton statebutton wtBtn" ng-class="{'statecolor':searchstate==dictionaryData[2]}" ng-click="onChange(dictionaryData[2])">不受理</button>
-        <button class="btn btn-statebutton statebutton keeprightbottom wtBtn" ng-class="{'statecolor':searchstate==dictionaryData[3]}" ng-click="onChange(dictionaryData[3])">暂不处理</button>
-        <button class="btn btn-statebutton statebutton keeprightbottom wtBtn" ng-class="{'statecolor':searchstate==dictionaryData[4]}" ng-click="onChange(dictionaryData[4])">已处理</button>
-        <button class="btn btn-statebutton statebutton keeprightbottom wtBtn" ng-class="{'statecolor':searchstate==dictionaryData[5]}" ng-click="onChange(dictionaryData[5])">已恢复</button>
+    <div style="display: flex; justify-content: space-between;">
+        <div class="btn-group">
+            <button class="btn btn-statebutton statebutton  keepleftbottom wtBtn" ng-click="onChange('')" ng-class="{'statecolor':searchstate==''}">全部</button>
+            <button class="btn btn-statebutton statebutton wtBtn" ng-class="{'statecolor':searchstate==dictionaryData[0]}" ng-click="onChange(dictionaryData[0])">未处理</button>
+            <button class="btn btn-statebutton statebutton wtBtn" ng-class="{'statecolor':searchstate==dictionaryData[1]}" ng-click="onChange(dictionaryData[1])">处理中</button>
+            <button class="btn btn-statebutton statebutton wtBtn" ng-class="{'statecolor':searchstate==dictionaryData[2]}" ng-click="onChange(dictionaryData[2])">不受理</button>
+            <button class="btn btn-statebutton statebutton keeprightbottom wtBtn" ng-class="{'statecolor':searchstate==dictionaryData[3]}" ng-click="onChange(dictionaryData[3])">暂不处理</button>
+            <button class="btn btn-statebutton statebutton keeprightbottom wtBtn" ng-class="{'statecolor':searchstate==dictionaryData[4]}" ng-click="onChange(dictionaryData[4])">已处理</button>
+            <button class="btn btn-statebutton statebutton keeprightbottom wtBtn" ng-class="{'statecolor':searchstate==dictionaryData[5]}" ng-click="onChange(dictionaryData[5])">已恢复</button>
+        </div>
+        <div>
+            <div class="btn btn_clean" ng-click="oneClickRecovery()" ng-disabled="selected.items.length==0" ng-show="searchstate.value === '0'">批量恢复</div>
+        </div>
     </div>
     <div class="wt_list">
         <div ui-i18n="{{lang}}" style="background: #fff;">
-            <div id="grid1" ui-grid="gridOptions" ui-grid-pagination external-scopes="$scope" ui-grid-resize-columns ui-grid-auto-resize
+            <div id="grid1" ui-grid="gridOptions" ui-grid-pagination external-scopes="$scope" ui-grid-resize-columns ui-grid-auto-resize ui-grid-selection
                 class="grid" style='    height: 610px;'></div>
         </div>
     </div>

assets/views/wt_messages.html

@@ -49,6 +49,7 @@
 margin-top: 2%;padding-right: 2%;position: relative;">
     <!-- <my-pagination page-option="option"></my-pagination> -->
 
+    <button ng-click="redAllIn()" class="sBtn" ng-show="wt_msgData.list.length && message_type==2">一键已读</button>
     <button ng-click="sBtn()" class="sBtn" ng-hide="msgData.idx==0" id="sBtn1">上一页</button>
     <button ng-click="xBtn()" class="sBtn" ng-hide="wt_msgData.list.length<5" id="xBtn1">下一页</button>
     <button ng-click="closeModel()" class="sBtn">关闭</button>