DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: DBNT:408c7a13f3eb190378101416728c5bcd26df1ea0
Branches Tags
DBNT:master
..
compare: DBNT:607bba164f5c4a1b42620f441afc2f8ebead2c55
Branches Tags
DBNT:master

2 Commits
408c7a13f3 ... 607bba164f

Author SHA1 Message Date
강석 최 607bba164f Merge branch 'master' of http://118.219.150.34:50501/DBNT/FAISP 2022-11-08 11:57:25 +09:00
강석 최 ca027f29c6 dateTimeCalc 함수 위치 변경. 2022-11-08 11:57:22 +09:00
2 changed files with 18 additions and 18 deletions
Show Stats Expand all files Collapse all files

19
src/main/resources/static/js/common.js
View File

@ -205,9 +205,26 @@ function departmentDynamicOption(targetTagName, code, defaultOptionName='') {
$(targetTagName).empty(); $(targetTagName).empty();
let option = ''; let option = '';
organConfigList.forEach(function (organConfig) { organConfigList.forEach(function (organConfig) {
if (organConfig.parentOrgan != null && organConfig.organType != 'OGC002' && organConfig.parentOrgan == code) { if (organConfig.parentOrgan != null && organConfig.organType !== 'OGC002' && organConfig.parentOrgan === code) {
option += '<option value="' + organConfig.organCd + '">' + organConfig.organNm + '</option>'; option += '<option value="' + organConfig.organCd + '">' + organConfig.organNm + '</option>';
} }
}); });
$(targetTagName).append('<option value="">' + defaultOptionName + '선택</option>' + option); $(targetTagName).append('<option value="">' + defaultOptionName + '선택</option>' + option);
} }
function dateTimeCalc(startDateTime, endDateTime) {
if (startDateTime !== '' &&endDateTime !== '' && startDateTime !== undefined && endDateTime !== undefined) {
const startDate = new Date(startDateTime);
const endDate = new Date(endDateTime);
let diffTime = endDate.getTime() - startDate.getTime();
const day = Math.floor(diffTime / (1000* 60 * 60 * 24));
const hour = Math.floor((diffTime % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
const minute = Math.floor((diffTime % (1000 * 60 * 60)) / (1000 * 60));
return day + '일' + hour + '시간' + minute + '분';
}
return null;
}

17
src/main/resources/static/js/faStatistics/crackdownStatus.js
View File

@ -459,20 +459,3 @@ function getToday() {
var date = new Date(); var date = new Date();
var year = date.getFullYear(); var year = date.getFullYear();
} }
function dateTimeCalc(startDateTime, endDateTime) {
if (startDateTime != '' &&endDateTime != '' && startDateTime != undefined && endDateTime != undefined) {
const startDate = new Date(startDateTime);
const endDate = new Date(endDateTime);
let diffTime = endDate.getTime() - startDate.getTime();
const day = Math.floor(diffTime / (1000* 60 * 60 * 24));
const hour = Math.floor((diffTime % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
const minute = Math.floor((diffTime % (1000 * 60 * 60)) / (1000 * 60));
return day + '일' + hour + '시간' + minute + '분';
}
return null;
}