From 79c77250613a2a41659e7831d42880df7335ecd3 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Tue, 17 Aug 2021 22:29:08 +0800 Subject: [PATCH] fixed debugging code issues in Admin UI --- .../combinedequipmentmeter.controller.js | 1 - .../combinedequipmentparameter.controller.js | 2 -- .../settings/costcenter/costfile.controller.js | 1 - .../energyflowdiagramlink.controller.js | 1 - .../settings/equipment/equipmentmeter.controller.js | 1 - .../settings/equipment/equipmentparameter.controller.js | 9 ++++----- .../controllers/users/privilege/privilege.controller.js | 1 - admin/app/directives/jc-drag-drop/jc-drag-drop.js | 4 ---- 8 files changed, 4 insertions(+), 16 deletions(-) diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js index 390de9b2..4fd41272 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js @@ -100,7 +100,6 @@ app.controller('CombinedEquipmentMeterController', function ($scope, $timeout, $ $scope.pairMeter = function (dragEl, dropEl) { var tem_uuid = angular.element('#' + dragEl); if (angular.isDefined(tem_uuid.scope().combinedequipmentmeter)) { - console.log("this is a spacemeter"); return; } var modalInstance = $uibModal.open({ diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js index 7f6cdf0d..eec63834 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js @@ -254,8 +254,6 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $uibMod $scope.virtualmeters = []; } }); - - console.log($scope.mergedmeters); }; $scope.getAllPoints = function () { diff --git a/admin/app/controllers/settings/costcenter/costfile.controller.js b/admin/app/controllers/settings/costcenter/costfile.controller.js index a56592f6..635f4c2e 100644 --- a/admin/app/controllers/settings/costcenter/costfile.controller.js +++ b/admin/app/controllers/settings/costcenter/costfile.controller.js @@ -54,7 +54,6 @@ app.controller('CostFileController', function ( $scope.restoreCostFile = function (costfile) { CostFileService.restoreCostFile(costfile, function (response) { - console.log(response); if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js index ad4b416a..8045c480 100644 --- a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js +++ b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js @@ -45,7 +45,6 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$uibModal, $tr EnergyFlowDiagramNodeService.getNodesByEnergyFlowDiagramID(id, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.energyflowdiagramnodes = response.data; - console.log($scope.energyflowdiagramnodes); } else { $scope.energyflowdiagramnodes = []; } diff --git a/admin/app/controllers/settings/equipment/equipmentmeter.controller.js b/admin/app/controllers/settings/equipment/equipmentmeter.controller.js index 90bdc0c4..d980d6e4 100644 --- a/admin/app/controllers/settings/equipment/equipmentmeter.controller.js +++ b/admin/app/controllers/settings/equipment/equipmentmeter.controller.js @@ -100,7 +100,6 @@ app.controller('EquipmentMeterController', function($scope,$timeout,$uibModal, $ $scope.pairMeter=function(dragEl,dropEl){ var tem_uuid = angular.element('#' + dragEl); if (angular.isDefined(tem_uuid.scope().equipmentmeter)) { - console.log("this is a spacemeter"); return; } var modalInstance = $uibModal.open({ diff --git a/admin/app/controllers/settings/equipment/equipmentparameter.controller.js b/admin/app/controllers/settings/equipment/equipmentparameter.controller.js index ab34abf9..9ef38836 100644 --- a/admin/app/controllers/settings/equipment/equipmentparameter.controller.js +++ b/admin/app/controllers/settings/equipment/equipmentparameter.controller.js @@ -177,12 +177,12 @@ app.controller('EquipmentParameterController', function($scope, $uibModal, $tran }); }; - $scope.colorMeterType=function(type){ - if(type=='meters'){ + $scope.colorMeterType = function(type) { + if (type === 'meters') { return 'btn-primary' - }else if(type=='virtualmeters'){ + } else if (type === 'virtualmeters') { return 'btn-info' - }else{ + } else { return 'btn-success' } }; @@ -255,7 +255,6 @@ app.controller('EquipmentParameterController', function($scope, $uibModal, $tran } }); - console.log($scope.mergedmeters); }; $scope.getAllPoints = function() { diff --git a/admin/app/controllers/users/privilege/privilege.controller.js b/admin/app/controllers/users/privilege/privilege.controller.js index d61ac6c3..00c321ea 100644 --- a/admin/app/controllers/users/privilege/privilege.controller.js +++ b/admin/app/controllers/users/privilege/privilege.controller.js @@ -209,7 +209,6 @@ app.controller('ModalEditPrivilegeCtrl', function ($scope, $scope.spaces = []; var privilege_data = JSON.parse(params.privilege.data); $scope.currentSpaceID = privilege_data['spaces'][0]; - console.log($scope.currentSpaceID) $scope.getAllSpaces = function () { SpaceService.getAllSpaces(function (response) { diff --git a/admin/app/directives/jc-drag-drop/jc-drag-drop.js b/admin/app/directives/jc-drag-drop/jc-drag-drop.js index 662f74c5..8e884180 100644 --- a/admin/app/directives/jc-drag-drop/jc-drag-drop.js +++ b/admin/app/directives/jc-drag-drop/jc-drag-drop.js @@ -4,8 +4,6 @@ module.directive('hjcDraggable', ['$rootScope', 'uuid', function($rootScope, uui return { restrict: 'A', link: function(scope, el, attrs, controller) { - //console.log("linking draggable element"); - angular.element(el).attr("draggable", "true"); var id = angular.element(el).attr("id"); if (!id) { @@ -14,9 +12,7 @@ module.directive('hjcDraggable', ['$rootScope', 'uuid', function($rootScope, uui } el.bind("dragstart", function(e) { - //console.log("The dragstart event handler fired, and evt.target = " + e.target); e.dataTransfer.setData('text', id); - $rootScope.$emit("HJC-DRAG-START"); });