暂提

assets/js/config.router.js

@@ -769,7 +769,7 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
             }).state('app.performance.scoreConfigurationPerformance', {
                 url: '/scoreConfigurationPerformance',
                 templateUrl: "assets/views/performance/scoreConfigurationPerformance.html",
-                resolve: loadSequence('jquery-sparkline', 'ui.select', 'angularBootstrapNavTree', 'spin', 'ladda', 'angular-ladda', 'moment', 'ui.grid', 'scoreConfigurationPerformanceCtrl'),
+                resolve: loadSequence('jquery-nestable-plugin', 'ng-nestable', 'ui.select', 'angularBootstrapNavTree', 'multi.select.tree', 'ckeditor-plugin', 'ckeditor', 'angularFileUpload', 'spin', 'ladda', 'angular-ladda', 'ui.grid', 'scoreConfigurationPerformanceCtrl'),
                 title: 'Performance.LISTDesc',
                 ncyBreadcrumb: {
                     label: 'Performance View'

assets/js/controllers/performance/scoreConfigurationPerformanceCtrl.js

@@ -29,7 +29,7 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
     }
     var defaultFilterData = {
         "idx": 0,
-        "sum": 10
+        "sum": 9999
     };
 
     $scope.gridOptions = {};
@@ -58,14 +58,6 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
         return row.id;
     };
 
-    $scope.transfer = function (status) {
-        if (status === "执行中") {
-            return "执行中"
-        } else if (status === "暂停中") {
-            return "暂停中"
-        }
-    }
-
     $scope.gridOptions.columnDefs = [{
             name: 'item',
             displayName: '序号',
@@ -74,37 +66,43 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
         },
         
         {
-            name: 'one',
+            name: 'incidentCategory.parent.parent.category',
             displayName: '一级分类',
             width: '10%',
             enableFiltering: false
         },
         {
-            name: 'two',
+            name: 'incidentCategory.parent.category',
             displayName: '二级分类',
             width: '10%',
             enableFiltering: false
         },
         {
-            name: 'three',
+            name: 'incidentCategory.category',
             displayName: '三级分类',
             width: '10%',
             enableFiltering: false
         },
         {
-            name: 'four',
+            name: 'incidentCategory.complexity',
             displayName: '默认积分',
-            width: '10%',
-            enableFiltering: false
+            width: '5%',
+            enableFiltering: false,
+            cellTemplate: '<div style="line-height:34px;">' +
+            '<span>{{row.entity.incidentCategory.complexity?row.entity.incidentCategory.complexity.value:0}}</span>' +
+            '</div>'
         },
         {
             name: 'five',
             displayName: '积分规则',
-            width: '10%',
-            enableFiltering: false
+            width: '50%',
+            enableFiltering: false,
+            cellTemplate: '<div style="line-height:34px;">' +
+            '<span ng-repeat="item in row.entity.rules">【{{item.startCount}}-{{item.endCount}}单】获得积分{{item.score}}；</span>' +
+            '</div>'
         },
         {
-            minWidth: '300',
+            minWidth: '100',
             name: '操作',
             enableFiltering: false,
             cellTemplate: '<div class="cl-effect-1 ui-grid-cell-contents pull-left">' +
@@ -113,6 +111,42 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
         },
     ];
 
+    $scope.gridOptions.onRegisterApi = function (gridApi) {
+
+        //导入gridApi对象
+        $scope.gridApi = gridApi;
+
+        //勾选行事件
+        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.edits = function (data) {
@@ -215,69 +249,12 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
         items: []
     }
 
-    $scope.gridOptions.onRegisterApi = function (gridApi) {
-
-        //导入gridApi对象
-        $scope.gridApi = gridApi;
-
-        //勾选行事件
-        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) {
-            // if ($scope.selected.items.length != 0) {
-            // $scope.selected.items = [];
-            angular.forEach(rows, function (ObjIndex, index, destObj) {
-                if (ObjIndex.isSelected) {
-                    $scope.selected.items.push(ObjIndex.entity);
-                } else {
-                    $scope.selected.items = [];
-                    // $scope.selected.items.splice(index, 1);
-                }
-            });
-            // } else {
-
-            // }
-            // $scope.mySelectedRows = $scope.gridApi.selection.getSelectedRows();
-            // if ($scope.selected.items.length == 0) {
-            //     $scope.selected.items = $scope.mySelectedRows;
-            // } else if ($scope.mySelectedRows.length == 0) {
-            //     for (var i = 0; i < $scope.selected.items.length; i++) {
-            //         for (var j = 0; j < rows.length; j++) {
-            //             if ($scope.selected.items[i].id == rows[j].entity.id) {
-            //                 $scope.selected.items.splice(i, 1);
-            //             }
-            //         }
-            //     }
-            // } else {
-            //     angular.forEach($scope.mySelectedRows, function(item) {
-            //         $scope.selected.items.push(item);
-            //     });
-            // }
-        });
-    };
-
     //重置按钮
     $scope.reload = function () {
-        delete $scope.fileData.inspection.inspectionTypeDTO;
-        delete $scope.fileData.inspection.executeUser;
-        delete $scope.fileData.inspection.createUser;
+        this.one_cates = [];
+        this.two_cates = [];
+        delete $scope.fileData.incidentcategory.oneCate;
+        delete $scope.fileData.incidentcategory.twoCate;
         $scope.refreshData('expand-right', $scope.fileData);
     }
 
@@ -291,38 +268,40 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
 
         $scope.myData = [];
 
-        api_bpm_data.fetchDataList('inspection', filterData).then(function (data) {
+        var postData = angular.copy(filterData);
+        if(postData.incidentcategory.twoCate){
+            postData.incidentcategory.categoryid = postData.incidentcategory.twoCate.id;
+            delete postData.incidentcategory.oneCate;
+            delete postData.incidentcategory.twoCate;
+        }else if(postData.incidentcategory.oneCate){
+            postData.incidentcategory.categoryid = postData.incidentcategory.oneCate.id;
+            delete postData.incidentcategory.oneCate;
+        }
+
+        api_bpm_data.fetchDataList('incidentcategory', postData).then(function (data) {
             var myData = Restangular.stripRestangular(data);
             $scope.gridOptions.totalItems = myData.totalNum;
             if (angular.isArray(myData.list)) {
                 $scope.myData = myData.list;
-                for (var i = 0; i < $scope.myData.length; i++) {
-                    $scope.myData[i]['item'] = i + 1 + filterData.idx * filterData.sum
-                    if($scope.myData[i].onDoing + $scope.myData[i].onCompleted != 0){
-                        $scope.myData[i].onPercent = ($scope.myData[i].onCompleted*100/($scope.myData[i].onDoing + $scope.myData[i].onCompleted)).toFixed(1);
-                    }else if($scope.myData[i].onCompleted == 0){
-                        $scope.myData[i].onPercent = '0.0';
+                var arr = [];
+                $scope.myData.forEach(v => {
+                    // 判断arr数组里是否有该事件分类
+                    let index = arr.findIndex(vv => vv.id == v.categoryid);
+                    if(index > -1){
+                        arr[index].rules.push(v);
                     }else{
-                        $scope.myData[i].onPercent = '0.0';
+                        arr.push({
+                            id: v.categoryid,
+                            incidentCategory: v.incidentCategory,
+                            rules: [v]
+                        })
                     }
-
-                    if($scope.myData[i].offDoing + $scope.myData[i].offCompleted != 0){
-                        $scope.myData[i].offPercent = ($scope.myData[i].offCompleted*100/($scope.myData[i].offDoing + $scope.myData[i].offCompleted)).toFixed(1);
-                    }else if($scope.myData[i].offCompleted == 0){
-                        $scope.myData[i].offPercent = '0.0';
-                    }else{
-                        $scope.myData[i].offPercent = '0.0';
-                    }
-                }
-                console.log($scope.myData)
+                })
+                $scope.myData = arr;
                 for (var i = 0; i < $scope.myData.length; i++) {
-                    if ($scope.myData[i].status == "执行中") {
-                        $scope.myData[i].style = "fa fa-play";
-                    } else if ($scope.myData[i].status == "暂停中") {
-                        $scope.myData[i].style = "fa fa-pause";
-                    };
-                    $scope.myData[i].runStatus = $scope.transfer($scope.myData[i].status);
+                    $scope.myData[i]['item'] = i + 1 + filterData.idx * filterData.sum;
                 }
+                console.log($scope.myData)
             } else {
                 SweetAlert.swal({
                     title: "数据为空",
@@ -342,30 +321,40 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
             filterData = defaultFilterData;
         }
 
-        api_bpm_data.fetchDataList('inspection', filterData).then(function (data) {
+        var postData = angular.copy(filterData);
+        if(postData.incidentcategory.twoCate){
+            postData.incidentcategory.categoryid = postData.incidentcategory.twoCate.id;
+            delete postData.incidentcategory.oneCate;
+            delete postData.incidentcategory.twoCate;
+        }else if(postData.incidentcategory.oneCate){
+            postData.incidentcategory.categoryid = postData.incidentcategory.oneCate.id;
+            delete postData.incidentcategory.oneCate;
+        }
+
+        api_bpm_data.fetchDataList('incidentcategory', postData).then(function (data) {
             var myData = Restangular.stripRestangular(data);
             $scope.gridOptions.totalItems = myData.totalNum;
             if (angular.isArray(myData.list)) {
                 $scope.myData = myData.list;
-                for (var i = 0; i < $scope.myData.length; i++) {
-                    $scope.myData[i]['item'] = i + 1 + filterData.idx * filterData.sum
-                    if($scope.myData[i].doing + $scope.myData[i].completed != 0){
-                        $scope.myData[i].percent = ($scope.myData[i].completed*100/($scope.myData[i].doing + $scope.myData[i].completed)).toFixed(1);
-                    }else if($scope.myData[i].completed == 0){
-                        $scope.myData[i].percent = '0.0';
+                var arr = [];
+                $scope.myData.forEach(v => {
+                    // 判断arr数组里是否有该事件分类
+                    let index = arr.findIndex(vv => vv.id == v.categoryid);
+                    if(index > -1){
+                        arr[index].rules.push(v);
                     }else{
-                        $scope.myData[i].percent = '0.0';
+                        arr.push({
+                            id: v.categoryid,
+                            incidentCategory: v.incidentCategory,
+                            rules: [v]
+                        })
                     }
-                }
-                console.log($scope.myData)
+                })
+                $scope.myData = arr;
                 for (var i = 0; i < $scope.myData.length; i++) {
-                    if ($scope.myData[i].status == "执行中") {
-                        $scope.myData[i].style = "fa fa-play";
-                    } else if ($scope.myData[i].status == "暂停中") {
-                        $scope.myData[i].style = "fa fa-pause";
-                    };
-                    $scope.myData[i].runStatus = $scope.transfer($scope.myData[i].status);
+                    $scope.myData[i]['item'] = i + 1 + filterData.idx * filterData.sum
                 }
+                console.log($scope.myData)
             } else {
                 SweetAlert.swal({
                     title: "数据为空",
@@ -382,38 +371,47 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
     $scope.ldloading = {};
     $scope.fileData = {
         "idx": 0,
-        "sum": 10,
-        "inspection": {}
+        "sum": 9999,
+        "incidentcategory": {}
     }
     $scope.searchinspe = function () {
         $scope.refreshData('expand-right', $scope.fileData);
     }
     // 获取一级分类
-    $scope.getOneCates = function () {
+    $scope.getOneCates = function (keyword='') {
+        $scope.one_cates = [];
         api_configure_data.fetchDataList("incidentcategory", {
             "idx": 0,
             "sum": 1000,
             "incidentcategory": {
-                hierarchy: 1
+                category: keyword,
+                selectType: 'one'
             }
         }).then(function (res) {
-            $scope.one_cates = res.list
+            $scope.one_cates = res.list;
         })
     }
-    $scope.getOneCates()
+    // 选择一级分类
+    $scope.changeOneCate = function(oneCate){
+        $scope.getTwoCates(oneCate);
+    }
     // 获取二级分类
-    $scope.getTwoCates = function () {
+    $scope.getTwoCates = function (oneCate, keyword='') {
+        $scope.two_cates = [];
+        if(!oneCate){
+            return;
+        }
         api_configure_data.fetchDataList("incidentcategory", {
             "idx": 0,
             "sum": 1000,
             "incidentcategory": {
-                hierarchy: 1
+                category: keyword,
+                parentCategory:{id:oneCate.id}
             }
         }).then(function (res) {
             $scope.two_cates = res.list
         })
     }
-    $scope.getTwoCates()
 
     $scope.refreshData('expand-right', $scope.fileData);
     $scope.timer = $interval(function () {
@@ -422,75 +420,4 @@ app.controller('scoreConfigurationPerformanceCtrl', ["$rootScope", "$scope", "$s
     $scope.$on('$destroy', function () {
         $interval.cancel($scope.timer)
     })
-}]);
-
-app.factory('inspectListMobileCtrlTree', ['api_bpm_data', function (api_bpm_data) {
-
-    function convertListToTree(data, treeMap) {
-        var idToNodeMap = {};
-        var root = null;
-        var parentNode = null;
-        for (var i = 0; i < data.length; i++) {
-            var datum = data[i];
-            datum.children = [];
-            idToNodeMap[datum.id] = datum;
-            if (typeof datum.parent === "undefined" || datum.parent == null) {
-                root = datum;
-                treeMap[datum.id] = root;
-            } else {
-                parentNode = idToNodeMap[datum.parent];
-                delete datum.parent;
-                parentNode.children.push(datum);
-            }
-        }
-        return root;
-    };
-
-    function convertParentToChildList(data) {
-        var treeMap = {};
-        var list = [];
-        convertListToTree(data, treeMap);
-        angular.forEach(treeMap, function (item) {
-            list.push(item);
-        });
-        return list;
-    };
-
-
-    var forEachEelement = function forEachEelement(response) {
-        var objects = [];
-        angular.forEach(response.list, function (ObjIndex, index, destObj) {
-            var object = {};
-            object.id = ObjIndex.id;
-            object.label = ObjIndex.type;
-            if (ObjIndex.parent && ObjIndex.parent.id != 0) {
-                object.parent = ObjIndex.parent.id;
-            };
-            if (ObjIndex.formUiEdit) {
-                object.formUiEdit = ObjIndex.formUiEdit;
-            };
-            if (ObjIndex.formUiName) {
-                object.formUiName = ObjIndex.formUiName;
-            };
-
-            if (ObjIndex.processKey) {
-                object.processKey = ObjIndex.processKey;
-            };
-            if (ObjIndex.formUiStart) {
-                object.formUiStart = ObjIndex.formUiStart;
-            };
-
-            objects.push(object);
-        });
-        var my_data = convertParentToChildList(objects);
-        var tree_data = angular.copy(my_data);
-
-        return {
-            'my_data': my_data,
-            'tree_data': tree_data
-        }
-    }
-
-    return forEachEelement;
-
 }]);

assets/views/performance/scoreConfigurationPerformance.html

@@ -33,24 +33,24 @@
                     <form class="form-inline incidentsearchsize">
                         <div class="form-group incidentsearch">
                             <div class=" pull-left" style="padding-top:4px">一级分类:</div>
-                            <ui-select class="pull-right iptSize" ng-model="fileData.inspection.executeUser"
+                            <ui-select class="pull-right iptSize" ng-model="fileData.incidentcategory.oneCate" ng-change="changeOneCate(fileData.incidentcategory.oneCate)"
                                 theme="bootstrap">
                                 <ui-select-match placeholder="">
                                     {{$select.selected.category}}
                                 </ui-select-match>
-                                <ui-select-choices repeat="item in one_cates">
+                                <ui-select-choices repeat="item in one_cates" refresh="getOneCates($select.search)">
                                     <div ng-bind-html="item.category | highlight: $select.search"></div>
                                 </ui-select-choices>
                             </ui-select>
                         </div>
                         <div class="form-group incidentsearch">
-                            <div class=" pull-left" style="padding-top:4px">二级分类:</div>
-                            <ui-select class="pull-right iptSize" ng-model="fileData.inspection.createUser"
+                            <div class="pull-left" style="padding-top:4px">二级分类:</div>
+                            <ui-select class="pull-right iptSize" ng-model="fileData.incidentcategory.twoCate"
                                 theme="bootstrap">
                                 <ui-select-match placeholder="">
                                     {{$select.selected.category}}
                                 </ui-select-match>
-                                <ui-select-choices repeat="item in two_cates">
+                                <ui-select-choices repeat="item in two_cates" refresh="getTwoCates(fileData.incidentcategory.oneCate, $select.search)">
                                     <div ng-bind-html="item.category | highlight: $select.search"></div>
                                 </ui-select-choices>
                             </ui-select>
@@ -62,7 +62,7 @@
                         <div class="pull-left margin-top-10 searchBtnBox">
                             <div class="btn btn_search" ng-click="searchinspe()"><span>搜索</span></div>
                             <div class="btn btn_clean" ng-click="reload()">重置</div>
-                            <button class="btn btn_clean" ng-click="edits()" ng-disabled="selected.items.length==0">批量修改积分</div>
+                            <button class="btn btn_clean" ng-click="edits()" ng-disabled="selected.items.length==0">批量修改积分</button>
                         </div>
                     </div>
                 </div>
@@ -71,7 +71,7 @@
     </div>
     <div class="tableList" ui-i18n="{{lang}}">
         <div>
-            <div id="grid1" ui-grid="gridOptions" external-scopes="$scope" ui-grid-resize-columns ui-grid-selection ui-grid-auto-resize class="grid">
+            <div id="grid1 " ui-grid="gridOptions" external-scopes="$scope" ui-grid-resize-columns ui-grid-selection ui-grid-auto-resize class="grid">
             </div>
         </div>
     </div>