绩效统计修改

assets/js/controllers/report/chargingCtrl.js

@@ -1,5 +1,35 @@
-'use strict';
-app.controller('chartingCtrl', ["$scope", "$rootScope", "$state", "$timeout", "$interval", "$http", "$cookieStore", "moment", "SweetAlert", "Restangular", "api_report", "api_statistic", "api_bpm_data", "api_user_data", function($scope, $rootScope, $state, $timeout, $interval, $http, $cookieStore, moment, SweetAlert, Restangular, api_report, api_statistic, api_bpm_data, api_user_data) {
+"use strict";
+app.controller("chartingCtrl", [
+  "$scope",
+  "$rootScope",
+  "$state",
+  "$timeout",
+  "$interval",
+  "$http",
+  "$cookieStore",
+  "moment",
+  "SweetAlert",
+  "Restangular",
+  "api_report",
+  "api_statistic",
+  "api_bpm_data",
+  "api_user_data",
+  function (
+    $scope,
+    $rootScope,
+    $state,
+    $timeout,
+    $interval,
+    $http,
+    $cookieStore,
+    moment,
+    SweetAlert,
+    Restangular,
+    api_report,
+    api_statistic,
+    api_bpm_data,
+    api_user_data
+  ) {
     // var ROWS = "ROWS";
     // var COLUMNS = "COLUMNS";
     // $scope.treeshow = true;
@@ -16,32 +46,35 @@ app.controller('chartingCtrl', ["$scope", "$rootScope", "$state", "$timeout", "$
     $scope.reportName = "计费";
     $scope.allheight = 100;
     $scope.isMaskground = false;
-    $scope.open = function($event) {
-        $event.preventDefault();
-        $event.stopPropagation();
+    $scope.open = function ($event) {
+      $event.preventDefault();
+      $event.stopPropagation();
 
-        $scope.opened = !$scope.opened;
+      $scope.opened = !$scope.opened;
     };
-    $scope.endOpen = function($event) {
-        $event.preventDefault();
-        $event.stopPropagation();
-        $scope.startOpened = false;
-        $scope.endOpened = !$scope.endOpened;
+    $scope.endOpen = function ($event) {
+      $event.preventDefault();
+      $event.stopPropagation();
+      $scope.startOpened = false;
+      $scope.endOpened = !$scope.endOpened;
     };
-    $scope.startOpen = function($event) {
-        $event.preventDefault();
-        $event.stopPropagation();
-        $scope.endOpened = false;
-        $scope.startOpened = !$scope.startOpened;
+    $scope.startOpen = function ($event) {
+      $event.preventDefault();
+      $event.stopPropagation();
+      $scope.endOpened = false;
+      $scope.startOpened = !$scope.startOpened;
     };
     // var starttime, endtime
     // $scope.starttimes = moment().startOf('month').format('YYYYMMDD');
     // $scope.endtimes = moment().format('YYYYMMDD');
-    $scope.starttimes = moment((new Date(moment().startOf('month'))).setMonth((new Date()).getMonth() - 1)).format('YYYY-MM-DD HH:mm:ss');
-    $scope.endtimes = moment((new Date(moment().startOf('month'))).setMonth((new Date()).getMonth()) - 1).format('YYYY-MM-DD HH:mm:ss')
+    $scope.starttimes = moment(
+      new Date(moment().startOf("month")).setMonth(new Date().getMonth() - 1)
+    ).format("YYYY-MM-DD HH:mm:ss");
+    $scope.endtimes = moment(
+      new Date(moment().startOf("month")).setMonth(new Date().getMonth()) - 1
+    ).format("YYYY-MM-DD HH:mm:ss");
     $scope.parameters.paramDateFrom = $scope.starttimes;
     $scope.parameters.paramDateTo = $scope.endtimes;
-    $scope.parameters.group = { "id": 1, "groupName": "网络维修组" };
     // $scope.charginrow = [{
     //     complexity: 774,
     //     incidentCount: 18,
@@ -51,81 +84,106 @@ app.controller('chartingCtrl', ["$scope", "$rootScope", "$state", "$timeout", "$
     //     incidentCount: 12,
     //     name: "王磊"
     // }]
-    api_user_data.fetchDataList('group', { "idx": 0, "sum": 1000 }).then(function(response) {
+    api_user_data
+      .fetchDataList("group", {
+        idx: 0,
+        sum: 1000,
+        group: { selectType: "nouser" },
+      })
+      .then(function (response) {
         if (response) {
-            if (response.status = 200) {
-                $scope.groups = response.list;
-            }
-        }
-    });
-    reshdata(1);
-    var sumChargin = 0;
-    angular.forEach($scope.charginrow, function(item) {
-            sumChargin = sumChargin + item.complexity;
-        })
-        // $scope.shareMoney = function(allMoney) {
-        //     $scope.allMoney = allMoney;
-        //     $scope.reportData = angular.copy($scope.manyData);
-        //     $scope.rRows = [];
-        //     $scope.rheaders = [];
-        //     checkmoney(allMoney)
-        // }
-
-    $scope.shareMoney = function(key) {
-        $scope.allMoney = key;
-        angular.forEach($scope.charginrow, function(item) {
-            item.money = (key * item.complexity / sumChargin).toFixed(2);
-        })
-    }
-    $scope.mdxquerym = function(group) {
-        $scope.starttimes = moment($scope.parameters.paramDateFrom).format('YYYY-MM-DD HH:mm:ss');
-        $scope.endtimes = moment($scope.parameters.paramDateTo).format('YYYY-MM-DD HH:mm:ss');
-        $scope.isMaskground = true;
-        $scope.shows = false;
-        if (group) {
-            reshdata(group.id);
-        } else {
-            reshdata();
+          if ((response.status = 200)) {
+            $scope.groups = response.list;
+          }
         }
-        // if (angular.isDefined(workspace.query)) {
-        //     if ($scope.rptUUID) {
-        //         // workspace.query.parameters = ConvertDateParameter($scope.parameters);
-        //         $scope.starttimes = workspace.query.parameters.paramDateFrom;
-        //         $scope.endtimes = workspace.query.parameters.paramDateTo;
-        //         reshdata();
-        //     } else {
-        //         // $scope.rptUUID = undefined;
-        //         // workspace.query.parameters = ConvertDateParameter($scope.parameters);
-        //         if (angular.isDefined($scope.parameters.paramDateFrom) && angular.isDefined($scope.parameters.paramDateTo)) {
-        //             $scope.starttimes = workspace.query.parameters.paramDateFrom;
-        //             $scope.endtimes = workspace.query.parameters.paramDateTo;
-        //             reshdata();
-        //         }
-        //     }
-        // }
+      });
+    reshdata();
+    $scope.reset = function () {
+      $scope.parameters = {};
+      $scope.starttimes = moment(
+        new Date(moment().startOf("month")).setMonth(new Date().getMonth() - 1)
+      ).format("YYYY-MM-DD HH:mm:ss");
+      $scope.endtimes = moment(
+        new Date(moment().startOf("month")).setMonth(new Date().getMonth()) - 1
+      ).format("YYYY-MM-DD HH:mm:ss");
+      $scope.parameters.paramDateFrom = $scope.starttimes;
+      $scope.parameters.paramDateTo = $scope.endtimes;
+      $scope.allMoney = 0;
+      $scope.mdxquerym($scope.parameters.group);
+    };
+    // var sumChargin = 0;
+    // angular.forEach($scope.charginrow, function(item) {
+    //         sumChargin = sumChargin + item.complexity;
+    //     })
+    // $scope.shareMoney = function(allMoney) {
+    //     $scope.allMoney = allMoney;
+    //     $scope.reportData = angular.copy($scope.manyData);
+    //     $scope.rRows = [];
+    //     $scope.rheaders = [];
+    //     checkmoney(allMoney)
+    // }
 
-    }
+    // $scope.shareMoney = function(key) {
+    //     $scope.mdxquerym($scope.parameters.group);
+    // }
+    $scope.mdxquerym = function (group) {
+      $scope.starttimes = moment($scope.parameters.paramDateFrom).format(
+        "YYYY-MM-DD HH:mm:ss"
+      );
+      $scope.endtimes = moment($scope.parameters.paramDateTo).format(
+        "YYYY-MM-DD HH:mm:ss"
+      );
+      $scope.isMaskground = true;
+      $scope.shows = false;
+      if (group) {
+        reshdata(group.id);
+      } else {
+        reshdata();
+      }
+      // if (angular.isDefined(workspace.query)) {
+      //     if ($scope.rptUUID) {
+      //         // workspace.query.parameters = ConvertDateParameter($scope.parameters);
+      //         $scope.starttimes = workspace.query.parameters.paramDateFrom;
+      //         $scope.endtimes = workspace.query.parameters.paramDateTo;
+      //         reshdata();
+      //     } else {
+      //         // $scope.rptUUID = undefined;
+      //         // workspace.query.parameters = ConvertDateParameter($scope.parameters);
+      //         if (angular.isDefined($scope.parameters.paramDateFrom) && angular.isDefined($scope.parameters.paramDateTo)) {
+      //             $scope.starttimes = workspace.query.parameters.paramDateFrom;
+      //             $scope.endtimes = workspace.query.parameters.paramDateTo;
+      //             reshdata();
+      //         }
+      //     }
+      // }
+    };
 
     function reshdata(group) {
-        api_bpm_data.fetchDataByGroupId({ "groupID": group, "startTime": $scope.starttimes, "finishTime": $scope.endtimes }).then(function(response) {
-            if (response) {
-                if (response.status = 200) {
-                    $scope.isMaskground = false;
-                    $scope.charginrow = response.data;
-                    angular.forEach($scope.charginrow, function(item) {
-                        sumChargin = sumChargin + item.complexity;
-                    })
-                    if (response.list && response.list.length == 0) {
-                        $scope.shows = true;
-                        $scope.empty = "数据为空！"
-                    }
-                    if ($scope.allMoney != 0) {
-                        $scope.shareMoney($scope.allMoney)
-                    }
-                }
+      api_bpm_data
+        .fetchDataByGroupId({
+          groupID: group,
+          startTime: $scope.starttimes,
+          finishTime: $scope.endtimes,
+          weight: $scope.allMoney,
+        })
+        .then(function (response) {
+          if (response) {
+            if ((response.status = 200)) {
+              $scope.isMaskground = false;
+              $scope.charginrow = response.data;
+              // angular.forEach($scope.charginrow, function(item) {
+              //     sumChargin = sumChargin + item.complexity;
+              // })
+              if (response.list && response.list.length == 0) {
+                $scope.shows = true;
+                $scope.empty = "数据为空！";
+              }
+              // if ($scope.allMoney != 0) {
+              //     $scope.shareMoney($scope.allMoney)
+              // }
             }
+          }
         });
     }
-
-
-}]);
+  },
+]);

assets/views/report/charging.html

@@ -62,7 +62,7 @@
                             <input type="text" class="form-control" datepicker-popuptime="yyyy-MM-dd" ng-model="parameters.paramDateTo" hour-time=true min-date="parameters.paramDateFrom" is-open="endOpened" ng-init="endOpened = false" close-text="关闭" ng-click="endOpen($event)" />
                         </div>
                         <div class="form-group margin-right-5">
-                            <span class="panel-title text-dark pull-left">工作组:</span>
+                            <span class="panel-title text-dark pull-left">工作组：</span>
                             <div class="pull-right" style="width:158px">
                                 <ui-select ng-model="parameters.group" theme="bootstrap">
                                     <ui-select-match placeholder="选择工作组">
@@ -76,19 +76,23 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <button class="btn btn-searchbutton steelbutton" ng-click="mdxquerym(parameters.group)" type="button">搜索</button>
-                        </div>
-                        <div class="form-group">
-                            <a class="btn btn-exportbutton  exportbutton" ng-click="exportData()" ng-disabled="disabledParentGroup" type="button">导出</a>
+                            <span class="panel-title text-dark pull-left">计费：</span>
+                            <div class="pull-right" style="width:158px">
+                                <input class="form-control" style="border-radius: 4px 0px 0px 4px !important" type="number" min="0" max="1000000000" ng-minlength="1" ng-maxlength="1000" ng-model="allMoney">
+                            </div>
                         </div>
+                        
                         <div class="form-group pull-right">
                             <div class="input-group">
-                                <input class="form-control" style="border-radius: 4px 0px 0px 4px !important" type="number" min="0" max="1000000000" ng-minlength="1" ng-maxlength="1000" ng-model="allMoney">
-                                <span class="input-group-btn">
-                                                    <button class="btn btn-primary" ng-disabled="getmoney()"
-                                                            ng-click="shareMoney(allMoney)"
-                                                            type="button">计费<i class="moneground"></i></button>
-                                                </span>
+                                <div class="form-group margin-right-5">
+                                    <button class="btn btn-searchbutton steelbutton" ng-click="mdxquerym(parameters.group)" type="button">搜索</button>
+                                </div>
+                                <div class="form-group margin-right-5">
+                                    <a class="btn btn-exportbutton exportbutton" ng-click="exportData()" ng-disabled="disabledParentGroup" type="button">导出</a>
+                                </div>
+                                <div class="form-group margin-right-5">
+                                    <a class="btn btn-default defaultheight" ng-click="reset()" type="button">重置</a>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -121,7 +125,7 @@
                                             {{rowData.complexity}}
                                         </td>
                                         <td ng-class="fieldData.thclass">
-                                            {{rowData.money||0}}
+                                            {{rowData.score||0}}
                                         </td>
                                     </tr>
                                 </tbody>