简柏林 / thingskit · Commits

Commit e9730fec993c05680c162861d5007a77a79dd2fe

Authored by Igor Kulikov
1 parent c3e62a7b

UI: minor improvements.

Inline Side-by-side
Showing 2 changed files with 4 additions and 2 deletions
@@ -221,10 +221,10 @@ function AlarmService($http, $q, $interval, $filter, $timeout, utils, types) { @@ -221,10 +221,10 @@ function AlarmService($http, $q, $interval, $filter, $timeout, utils, types) {
221 } else if (alarmsQuery.startTime) { 221 } else if (alarmsQuery.startTime) {
222 pageLink = { 222 pageLink = {
223 limit: 100, 223 limit: 100,
224 - startTime: alarmsQuery.startTime 224 + startTime: Math.round(alarmsQuery.startTime)
225 } 225 }
226 if (alarmsQuery.endTime) { 226 if (alarmsQuery.endTime) {
227 - pageLink.endTime = alarmsQuery.endTime; 227 + pageLink.endTime = Math.round(alarmsQuery.endTime);
228 } 228 }
229 } 229 }
230 230
@@ -73,6 +73,7 @@ export default function WidgetController($scope, $state, $timeout, $window, $ele @@ -73,6 +73,7 @@ export default function WidgetController($scope, $state, $timeout, $window, $ele
73 decimals: angular.isDefined(widget.config.decimals) ? widget.config.decimals : 2, 73 decimals: angular.isDefined(widget.config.decimals) ? widget.config.decimals : 2,
74 subscriptions: {}, 74 subscriptions: {},
75 defaultSubscription: null, 75 defaultSubscription: null,
  76 + dashboardTimewindow: dashboardTimewindow,
76 timewindowFunctions: { 77 timewindowFunctions: {
77 onUpdateTimewindow: function(startTimeMs, endTimeMs) { 78 onUpdateTimewindow: function(startTimeMs, endTimeMs) {
78 if (widgetContext.defaultSubscription) { 79 if (widgetContext.defaultSubscription) {
@@ -646,6 +647,7 @@ export default function WidgetController($scope, $state, $timeout, $window, $ele @@ -646,6 +647,7 @@ export default function WidgetController($scope, $state, $timeout, $window, $ele
646 647
647 $scope.$on('dashboardTimewindowChanged', function (event, newDashboardTimewindow) { 648 $scope.$on('dashboardTimewindowChanged', function (event, newDashboardTimewindow) {
648 vm.dashboardTimewindow = newDashboardTimewindow; 649 vm.dashboardTimewindow = newDashboardTimewindow;
  650 + widgetContext.dashboardTimewindow = newDashboardTimewindow;
649 }); 651 });
650 652
651 $scope.$on("$destroy", function () { 653 $scope.$on("$destroy", function () {