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 1/2] 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"); }); From 63d649c16dae22afd298113fc8a85cdf128d8171 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Tue, 17 Aug 2021 22:56:34 +0800 Subject: [PATCH 2/2] removed unnecessary jc.jsextend library from Admin UI --- admin/index.html | 1 - admin/js/jc/jc.jsextend.js | 157 ------------------------------------- 2 files changed, 158 deletions(-) delete mode 100644 admin/js/jc/jc.jsextend.js diff --git a/admin/index.html b/admin/index.html index 15c4810f..3a27167a 100644 --- a/admin/index.html +++ b/admin/index.html @@ -44,7 +44,6 @@ - diff --git a/admin/js/jc/jc.jsextend.js b/admin/js/jc/jc.jsextend.js deleted file mode 100644 index 8e70199a..00000000 --- a/admin/js/jc/jc.jsextend.js +++ /dev/null @@ -1,157 +0,0 @@ -var STARTHOUR = 6; -var STARTMINUTE = 30; - -if (!String.prototype.format) { - String.prototype.format = function() { - var formatted = this; - for (var i = 0; i < arguments.length; i++) { - var regexp = new RegExp('\\{'+i+'\\}', 'gi'); - formatted = formatted.replace(regexp, arguments[i]); - } - return formatted; - }; -} - -if (!Object.entries) - Object.entries = function( obj ){ - var ownProps = Object.keys( obj ), - i = ownProps.length, - resArray = new Array(i); // preallocate the Array - while (i--) - resArray[i] = [ownProps[i], obj[ownProps[i]]]; - - return resArray; -}; - -function getFormat(period){ - switch(period){ - case 'day': - return "YYYY-MM-DD"; - break; - case 'hour': - return "YYYY-MM-DD HH:mm"; - break; - case 'month': - return "YYYY-MM"; - break; - case 'year': - return "YYYY"; - break; - } -} - -function getChartFormat(period){ - switch(period){ - case 'day': - return '%m-%d'; - break; - case 'hour': - return '%m-%d %H:%M'; - break; - case 'month': - return '%Y-%m'; - break; - case 'year': - return '%Y'; - break; - } -} - -function saveAs(uri, filename) { - var link = document.createElement('a'); - if (typeof link.download === 'string') { - link.href = uri; - link.download = filename; - - //Firefox requires the link to be in the body - document.body.appendChild(link); - - //simulate click - link.click(); - - //remove the link when done - document.body.removeChild(link); - } else { - window.open(uri); - } -} - - -function SaveToDisk(blobURL, fileName) { - var reader = new FileReader(); - reader.readAsDataURL(blobURL); - //reader.readAsBinaryString(blobURL); - //reader.readAsArrayBuffer(blobURL) - reader.onload = function(event) { - var save = document.createElement('a'); - save.href = event.target.result; - save.download = fileName || 'unknown file'; - - save.style = 'display:none;opacity:0;color:transparent;'; - (document.body || document.documentElement).appendChild(save); - - if (typeof save.click === 'function') { - save.click(); - } else { - save.target = '_blank'; - var event = document.createEvent('Event'); - event.initEvent('click', true, true); - save.dispatchEvent(event); - } - - (window.URL || window.webkitURL).revokeObjectURL(save.href); - }; -} - -function compareRange(start, end, start2, end2) { - var period = "day", range1, range2; - if (start.length < 5) { - start = start + '-01-01'; - end = end + '-01-01'; - period = "year"; - } else if (start.length < 8) { - start = start + '-01'; - end = end + '-01'; - period = "month"; - } else if (start.length < 11) { - - } else if (start.length < 20) { - start = start.replace("-", "/").replace("T", " "); - startNumber = new Date(start).getTime(); - end = end.replace("-", "/").replace("T", " "); - endNumber = new Date(end).getTime(); - start2 = start2.replace("-", "/").replace("T", " "); - startNumber2 = new Date(start2).getTime(); - end2 = end2.replace("-", "/").replace("T", " "); - endNumber2 = new Date(end2).getTime(); - console.log(startNumber); - return (endNumber2-endNumber)==(startNumber2-startNumber)?true:false; - } - - if(start2.length<5){ - start2=start2+'-01-01'; - end2 =end2+'-01-01'; - }else if(start2.length<8){ - start2=start2+'-01'; - end2 =end2+'-01'; - } - - start = new Date(start.replace("-", "/").replace("-","/")); - end = new Date(end.replace("-", "/").replace("-","/")); - start2 = new Date(start2.replace("-", "/").replace("-","/")); - end2 = new Date(end2.replace("-", "/").replace("-","/")); - - if(period=="day"){ - range1=end-start; - range2=end2-start2; - }else if(period=='month'){ - range1=(end.getFullYear()-start.getFullYear())*12+(end.getMonth()-start.getMonth()); - range2=(end2.getFullYear()-start2.getFullYear())*12+(end2.getMonth()-start2.getMonth()); - }else if(period=="year"){ - range1=end.getFullYear()-start.getFullYear(); - range2=end2.getFullYear()-start2.getFullYear(); - } - - - return range1==range2?true:false; -}