xit-app
/
fims-java-all
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

대시보드 수정

Browse Source
main
이범준 1 year ago
parent defff182f2
commit e94ecffb9b
2 changed files with 183 additions and 194 deletions
Show Stats Download Patch File Download Diff File

266
src/main/webapp/WEB-INF/jsp/include/dashboard.jsp
Unescape Escape View File

@ -200,41 +200,21 @@ function fnMakeStatReq(taskSeCd){
var lastDay = DateUtil.getDate().date.replace("-",""); var lastDay = DateUtil.getDate().date.replace("-","");
var firstDay = DateUtil.getDateDay(-14).date.replaceAll("-",""); var firstDay = DateUtil.getDateDay(-14).date.replaceAll("-","");
var mergedQuery = {};
var groupInfoList = [];
var numberValueInfoList = [];
var codeSubsetInfoList = [];
var defaultQuery = {}; var defaultQuery = {};
var queryInQuery1 = {};
var queryInQuery2 = {};
var queryInQuery3 = {};
//단속구분별 전체/완료 건수 //단속구분별 전체/완료 건수
defaultQuery = { defaultQuery = {
structureType : "dummy", structureType : "dummy",
statDomain : "crdn", statDomain : "crdn",
fixedItemId : ["01","02","minwon","dobo"], groupInfoList : [
namedNumberValueSeperator : "completeAndTotal",
globalAggregate : "count",
taskSeCd : taskSeCd,
dayColumn : "REG_DT",
firstDay : firstDay,
lastDay : lastDay
};
groupInfoList = [
{ {
refCol : "CRDN_SE_CD", refCol : "CRDN_SE_CD",
ctgrType : ["code"], ctgrType : ["code"],
dtlCtgr : ["FIM002"] dtlCtgr : ["FIM002"]
} }
]; ],
codeSubsetInfoList : [
queryInQuery1 = fnJsonArrayToFormData(groupInfoList, "groupInfoList");
codeSubsetInfoList = [
{ {
sourceGroup : "FIM002", sourceGroup : "FIM002",
sourceCodes : ["08","09","10","11"], sourceCodes : ["08","09","10","11"],
@ -247,15 +227,22 @@ function fnMakeStatReq(taskSeCd){
targetCode : "dobo", targetCode : "dobo",
targetCodeVal : "도보" targetCodeVal : "도보"
} }
]; ],
fixedItemId : ["01","02","minwon","dobo"],
queryInQuery3 = fnJsonArrayToFormData(codeSubsetInfoList, "codeSubsetInfoList"); namedNumberValueSeperator : "completeAndTotal",
globalAggregate : "count",
mergedQuery = {...defaultQuery, ...queryInQuery1, ...queryInQuery3}; taskSeCd : taskSeCd,
dayColumn : "REG_DT",
firstDay : firstDay,
lastDay : lastDay
};
defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList");
defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList");
defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList");
statReqArr.push({ statReqArr.push({
query : mergedQuery, query : defaultQuery,
cursor : "card1", cursor : "card1",
statType : "progressAndTotal" statType : "progressAndTotal"
}); });
@ -264,6 +251,13 @@ function fnMakeStatReq(taskSeCd){
defaultQuery = { defaultQuery = {
structureType : "dummy", structureType : "dummy",
statDomain : "crdn", statDomain : "crdn",
groupInfoList : [
{
refCol : "등록대상이첩대상구분",
ctgrType : ["code"],
dtlCtgr : ["FIM999"]
}
],
fixedItemId : ["등록대상","이첩대상"], fixedItemId : ["등록대상","이첩대상"],
namedNumberValueSeperator : "completeAndTotal", namedNumberValueSeperator : "completeAndTotal",
globalAggregate : "count", globalAggregate : "count",
@ -273,20 +267,12 @@ function fnMakeStatReq(taskSeCd){
lastDay : lastDay lastDay : lastDay
}; };
groupInfoList = [ defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList");
{ defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList");
refCol : "등록대상이첩대상구분", defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList");
ctgrType : ["code"],
dtlCtgr : ["FIM999"]
}
];
queryInQuery1 = fnJsonArrayToFormData(groupInfoList, "groupInfoList");
mergedQuery = {...defaultQuery, ...queryInQuery1 };
statReqArr.push({ statReqArr.push({
query : mergedQuery, query : defaultQuery,
cursor : "card2", cursor : "card2",
statType : "progressAndTotal" statType : "progressAndTotal"
}); });
@ -295,6 +281,13 @@ function fnMakeStatReq(taskSeCd){
defaultQuery = { defaultQuery = {
structureType : "dummy", structureType : "dummy",
statDomain : "sndb", statDomain : "sndb",
groupInfoList : [
{
refCol : "SNDNG_SE_CD",
ctgrType : ["code"],
dtlCtgr : ["FIM047"]
}
],
fixedItemId : ["01", "02", "03"], fixedItemId : ["01", "02", "03"],
namedNumberValueSeperator : "completeAndTotal", namedNumberValueSeperator : "completeAndTotal",
globalAggregate : "count", globalAggregate : "count",
@ -304,20 +297,12 @@ function fnMakeStatReq(taskSeCd){
lastDay : lastDay lastDay : lastDay
}; };
groupInfoList = [ defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList");
{ defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList");
refCol : "SNDNG_SE_CD", defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList");
ctgrType : ["code"],
dtlCtgr : ["FIM047"]
}
];
queryInQuery1 = fnJsonArrayToFormData(groupInfoList, "groupInfoList");
mergedQuery = {...defaultQuery, ...queryInQuery1 };
statReqArr.push({ statReqArr.push({
query : mergedQuery, query : defaultQuery,
cursor : "card3", cursor : "card3",
statType : "progressAndTotal" statType : "progressAndTotal"
}); });
@ -326,40 +311,36 @@ function fnMakeStatReq(taskSeCd){
defaultQuery = { defaultQuery = {
structureType : "dummy", structureType : "dummy",
statDomain : "excl", statDomain : "excl",
fixedItemId : ["00", "acceptOrNonAccept", "03"], groupInfoList : [
namedNumberValueSeperator : "completeAndTotal",
globalAggregate : "count",
taskSeCd : taskSeCd,
dayColumn : "REG_DT",
firstDay : firstDay,
lastDay : lastDay
};
groupInfoList = [
{ {
refCol : "OPNN_SBMSN_STTS_CD", refCol : "OPNN_SBMSN_STTS_CD",
ctgrType : ["code"], ctgrType : ["code"],
dtlCtgr : ["FIM031"] dtlCtgr : ["FIM031"]
} }
]; ],
codeSubsetInfoList : [
queryInQuery1 = fnJsonArrayToFormData(groupInfoList, "groupInfoList");
codeSubsetInfoList = [
{ {
sourceGroup : "FIM031", sourceGroup : "FIM031",
sourceCodes : ["01","02"], sourceCodes : ["01","02"],
targetCode : "acceptOrNonAccept", targetCode : "acceptOrNonAccept",
targetCodeVal : "수용/미수용" targetCodeVal : "수용/미수용"
} }
]; ],
fixedItemId : ["00", "acceptOrNonAccept", "03"],
queryInQuery3 = fnJsonArrayToFormData(codeSubsetInfoList, "codeSubsetInfoList"); namedNumberValueSeperator : "completeAndTotal",
globalAggregate : "count",
taskSeCd : taskSeCd,
dayColumn : "REG_DT",
firstDay : firstDay,
lastDay : lastDay
};
mergedQuery = {...defaultQuery, ...queryInQuery1, ...queryInQuery3}; defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList");
defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList");
defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList");
statReqArr.push({ statReqArr.push({
query : mergedQuery, query : defaultQuery,
cursor : "card4", cursor : "card4",
statType : "progressAndTotal" statType : "progressAndTotal"
}); });
@ -368,25 +349,14 @@ function fnMakeStatReq(taskSeCd){
defaultQuery = { defaultQuery = {
structureType : "aggregate", structureType : "aggregate",
statDomain : "crdn", statDomain : "crdn",
fixedItemId : ["01","02","dobo","minwon"], groupInfoList : [
namedNumberValueSeperator : "lastFewDays",
globalAggregate : "count",
taskSeCd : taskSeCd,
dayColumn : "CRDN_YMD",
dayRange : 15
};
groupInfoList = [
{ {
refCol : "CRDN_SE_CD", refCol : "CRDN_SE_CD",
ctgrType : ["code"], ctgrType : ["code"],
dtlCtgr : ["FIM002"] dtlCtgr : ["FIM002"]
} }
]; ],
codeSubsetInfoList : [
queryInQuery1 = fnJsonArrayToFormData(groupInfoList, "groupInfoList");
codeSubsetInfoList = [
{ {
sourceGroup : "FIM002", sourceGroup : "FIM002",
sourceCodes : ["08","09","10","11"], sourceCodes : ["08","09","10","11"],
@ -399,14 +369,21 @@ function fnMakeStatReq(taskSeCd){
targetCode : "dobo", targetCode : "dobo",
targetCodeVal : "도보" targetCodeVal : "도보"
} }
]; ],
fixedItemId : ["01","02","dobo","minwon"],
queryInQuery3 = fnJsonArrayToFormData(codeSubsetInfoList, "codeSubsetInfoList"); namedNumberValueSeperator : "lastFewDays",
globalAggregate : "count",
taskSeCd : taskSeCd,
dayColumn : "CRDN_YMD",
dayRange : 15
};
mergedQuery = {...defaultQuery, ...queryInQuery1, ...queryInQuery3}; defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList");
defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList");
defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList");
statReqArr.push({ statReqArr.push({
query : mergedQuery, query : defaultQuery,
cursor : "lineChart", cursor : "lineChart",
statType : "line" statType : "line"
}); });
@ -415,46 +392,39 @@ function fnMakeStatReq(taskSeCd){
defaultQuery = { defaultQuery = {
structureType : "aggregate", structureType : "aggregate",
statDomain : "crdnSttsHstry", statDomain : "crdnSttsHstry",
fixedItemId : ["dansokProcess","81","83"], groupInfoList : [
taskSeCd : taskSeCd,
dayColumn : "REG_DT",
firstDay : firstDay,
lastDay : firstDay
};
groupInfoList = [
{ {
refCol : "CRDN_STTS_CD", refCol : "CRDN_STTS_CD",
ctgrType : ["code"], ctgrType : ["code"],
dtlCtgr : ["FIM010"] dtlCtgr : ["FIM010"]
} }
]; ],
numberValueInfoList : [
queryInQuery1 = fnJsonArrayToFormData(groupInfoList, "groupInfoList");
numberValueInfoList = [
{ {
aggregateType : "count" aggregateType : "count"
} }
]; ],
codeSubsetInfoList : [
queryInQuery2 = fnJsonArrayToFormData(numberValueInfoList, "numberValueInfoList");
codeSubsetInfoList = [
{ {
sourceGroup : "FIM010", sourceGroup : "FIM010",
sourceCodes : ["21"], sourceCodes : ["21"],
targetCode : "dansokProcess", targetCode : "dansokProcess",
targetCodeVal : "단속" targetCodeVal : "단속"
} }
]; ],
fixedItemId : ["dansokProcess","81","83"],
queryInQuery3 = fnJsonArrayToFormData(codeSubsetInfoList, "codeSubsetInfoList"); taskSeCd : taskSeCd,
dayColumn : "REG_DT",
firstDay : firstDay,
lastDay : firstDay
};
mergedQuery = {...defaultQuery, ...queryInQuery1, ...queryInQuery2, ...queryInQuery3}; defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList");
defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList");
defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList");
statReqArr.push({ statReqArr.push({
query : mergedQuery, query : defaultQuery,
cursor : "doughnutChart1", cursor : "doughnutChart1",
statType : "doughnut" statType : "doughnut"
}); });
@ -463,35 +433,31 @@ function fnMakeStatReq(taskSeCd){
defaultQuery = { defaultQuery = {
structureType : "aggregate", structureType : "aggregate",
statDomain : "sndb", statDomain : "sndb",
fixedItemId : ["01", "02", "03"], groupInfoList : [
taskSeCd : taskSeCd,
dayColumn : "SNDNG_YMD",
firstDay : firstDay,
lastDay : firstDay
};
groupInfoList = [
{ {
refCol : "SNDNG_SE_CD", refCol : "SNDNG_SE_CD",
ctgrType : ["code"], ctgrType : ["code"],
dtlCtgr : ["FIM047"] dtlCtgr : ["FIM047"]
} }
]; ],
numberValueInfoList : [
queryInQuery1 = fnJsonArrayToFormData(groupInfoList, "groupInfoList");
numberValueInfoList = [
{ {
aggregateType : "count" aggregateType : "count"
} }
]; ],
fixedItemId : ["01", "02", "03"],
queryInQuery2 = fnJsonArrayToFormData(numberValueInfoList, "numberValueInfoList"); taskSeCd : taskSeCd,
dayColumn : "SNDNG_YMD",
firstDay : firstDay,
lastDay : firstDay
};
mergedQuery = {...defaultQuery, ...queryInQuery1, ... queryInQuery2}; defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList");
defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList");
defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList");
statReqArr.push({ statReqArr.push({
query : mergedQuery, query : defaultQuery,
cursor : "doughnutChart2", cursor : "doughnutChart2",
statType : "doughnut" statType : "doughnut"
}); });
@ -500,35 +466,31 @@ function fnMakeStatReq(taskSeCd){
defaultQuery = { defaultQuery = {
structureType : "aggregate", structureType : "aggregate",
statDomain : "excl", statDomain : "excl",
fixedItemId : ["01", "02", "03"], groupInfoList : [
taskSeCd : taskSeCd,
dayColumn : "REG_DT",
firstDay : firstDay,
lastDay : firstDay
};
groupInfoList = [
{ {
refCol : "OPNN_SBMSN_STTS_CD", refCol : "OPNN_SBMSN_STTS_CD",
ctgrType : ["code"], ctgrType : ["code"],
dtlCtgr : ["FIM031"] dtlCtgr : ["FIM031"]
} }
]; ],
numberValueInfoList : [
queryInQuery1 = fnJsonArrayToFormData(groupInfoList, "groupInfoList");
numberValueInfoList = [
{ {
aggregateType : "count" aggregateType : "count"
} }
]; ],
fixedItemId : ["01", "02", "03"],
queryInQuery2 = fnJsonArrayToFormData(numberValueInfoList, "numberValueInfoList"); taskSeCd : taskSeCd,
dayColumn : "REG_DT",
firstDay : firstDay,
lastDay : firstDay
};
mergedQuery = {...defaultQuery, ...queryInQuery1, ...queryInQuery2 }; defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList");
defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList");
defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList");
statReqArr.push({ statReqArr.push({
query : mergedQuery, query : defaultQuery,
cursor : "doughnutChart3", cursor : "doughnutChart3",
statType : "doughnut" statType : "doughnut"
}); });

33
src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js
Unescape Escape View File

@ -296,8 +296,8 @@ function camelToKebab(text){
* jsonArray를 FormData형식의 키를 갖는 json으로 치환한다. * jsonArray를 FormData형식의 키를 갖는 json으로 치환한다.
* @return FormData형식의 키를 갖는 json * @return FormData형식의 키를 갖는 json
*/ */
function fnJsonArrayToFormData(array, name){ function fnJsonArrayToFormData(array, arrayName){
newObj = {}; var newObj = {};
for(var i=0; i<array.length; i++){ for(var i=0; i<array.length; i++){
var json = array[i]; var json = array[i];
@ -305,9 +305,36 @@ function fnJsonArrayToFormData(array, name){
var keys = Object.keys(json); var keys = Object.keys(json);
for(var j=0; j<keys.length; j++){ for(var j=0; j<keys.length; j++){
var key = keys[j]; var key = keys[j];
newObj[name+"["+i+"]."+key] = json[key]; newObj[arrayName+"["+i+"]."+key] = json[key];
} }
} }
return newObj; return newObj;
} }
/**
* json객체 안의 jsonArray를 FormData형식의 키로 치환한다.
* @return FormData형식의 키를 갖는 json
*/
function fnJsonToFormData(originalJson, arrayName){
if(originalJson[arrayName] == undefined){
return originalJson;
} else {
var newObj = {};
var array = originalJson[arrayName];
for(var i=0; i<array.length; i++){
var json = array[i];
var keys = Object.keys(json);
for(var j=0; j<keys.length; j++){
var key = keys[j];
newObj[arrayName+"["+i+"]."+key] = json[key];
}
}
delete originalJson[arrayName];
return {...originalJson, ...newObj};
}
}
Write Preview
Loading…
Cancel
Save