Merge remote-tracking branch 'origin/develop' into develop

master
dalong306 4 years ago
commit 19583d8869

@ -251,7 +251,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
$scope.chooseLastConfig = function (mon) { $scope.chooseLastConfig = function (mon) {
let year = new Date(mon).getFullYear(); let year = new Date(mon).getFullYear();
let month = new Date(mon).getMonth(); let month = new Date(mon).getMonth();
if(index == 0){ if(month == 0){
year--; year--;
month = year + '-12'; month = year + '-12';
}else if(month <= 9){ }else if(month <= 9){

Loading…
Cancel
Save