seimin 5 kuukautta sitten
vanhempi
commit
2766a999c1
1 muutettua tiedostoa jossa 7 lisäystä ja 5 poistoa
  1. 7 5
      assets/js/controllers/desk/chartCtrl.js

+ 7 - 5
assets/js/controllers/desk/chartCtrl.js

@@ -220,7 +220,7 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
220 220
             //     cellTemplate: '<div>' +
221 221
             //         '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.requester.name}}</div>' +
222 222
             //         '</div>'
223
-            // }, 
223
+            // },
224 224
             {
225 225
                 name: 'serviceState.name',
226 226
                 displayName: '状态',
@@ -326,7 +326,7 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
326 326
         //     cellTemplate: '<div>' +
327 327
         //         '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center"  >{{row.entity.requester.name}}</div>' +
328 328
         //         '</div>'
329
-        // }, 
329
+        // },
330 330
         {
331 331
             name: 'serviceState.name',
332 332
             displayName: '状态',
@@ -446,10 +446,10 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
446 446
         // sessionStorage['searchchart'] = angular.copy(JSON.stringify(fildata));
447 447
         // $scope.memoryfilterData = fildata;
448 448
         if ($scope.fileData.wxincident.createTime) {
449
-            $scope.fileData.wxincident.createTime = moment($scope.fileData.wxincident.createTime).format('YYYY-MM-DD HH:mm:ss');
449
+            $scope.fileData.wxincident.createTime = moment($scope.fileData.wxincident.createTime).startOf('day').format('YYYY-MM-DD HH:mm:ss');
450 450
         }
451 451
         if ($scope.fileData.wxincident.createTimeEnd) {
452
-            $scope.fileData.wxincident.createTimeEnd = moment($scope.fileData.wxincident.createTimeEnd).format('YYYY-MM-DD HH:mm:ss');
452
+            $scope.fileData.wxincident.createTimeEnd = moment($scope.fileData.wxincident.createTimeEnd).endOf('day').format('YYYY-MM-DD HH:mm:ss');
453 453
         }
454 454
         $scope.refreshData('expand-right', $scope.fileData);
455 455
     }
@@ -639,7 +639,9 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
639 639
         delete $scope.fileData.wxincident.createTimeEnd;
640 640
         delete $scope.fileData.wxincident.departmentDTO;
641 641
         delete $scope.fileData.wxincident.sourceType;
642
-        $scope.seiminObj = null;
642
+        $scope.seiminObj = {
643
+            sourceType: null
644
+        };
643 645
         $scope.ksModel = '';
644 646
         $scope.refreshData('expand-right', $scope.fileData);
645 647
     }