diff --git a/assets/scss/common/text.scss b/assets/scss/common/text.scss
index 448ec11..a849c86 100644
--- a/assets/scss/common/text.scss
+++ b/assets/scss/common/text.scss
@@ -113,6 +113,14 @@
color: map-deep-get($config, #{$theme}, "h1-title");
}
+
+ .custom-subtitle-tab {
+ font-size: 1.25rem !important;
+ font-weight: 600 !important;
+ line-height: 1.25 !important;
+ color: map-deep-get($config, #{$theme}, "subtitle-tab");
+ }
+
.v-dialog {
.custom-title-4 {
font-size: 16px !important;
diff --git a/assets/scss/var.scss b/assets/scss/var.scss
index 0619caf..ec638ff 100644
--- a/assets/scss/var.scss
+++ b/assets/scss/var.scss
@@ -171,6 +171,7 @@ $config: (
ant-btn-default-border-outlined:#424242,
btn-header-select-bg: #1F1F1F,
btn-header-select-color:#FFFFFFD9,
+ subtitle-tab: #FFFFFFA6,
),
light: (w-g5: $--color-gray_555,
g5-w: $--color-white,
@@ -306,5 +307,6 @@ $config: (
ant-btn-default-border-outlined:#D9D9D9,
btn-header-select-color:#1F1F1F,
btn-header-select-bg:#FFFFFF,
+ subtitle-tab: #000000A6,
),
);
\ No newline at end of file
diff --git a/components/common/button/BtnExcelDownload.vue b/components/common/button/BtnExcelDownload.vue
index 1fa3fd5..abdcc36 100644
--- a/components/common/button/BtnExcelDownload.vue
+++ b/components/common/button/BtnExcelDownload.vue
@@ -45,7 +45,7 @@ export default {
size: {
type: String,
require: false,
- default: "middle", // small, middle, large
+ default: "default", // small, middle, large
}
},
data() {
diff --git a/components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue b/components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue
index 394f981..d009a7e 100644
--- a/components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue
+++ b/components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue
@@ -4,7 +4,7 @@
class="d-flex justify-space-between align-center"
style="height: 80px;"
>
- 검침 대상 추가 정보
+ 검침 대상 추가 정보
@@ -55,23 +53,10 @@ export default {
},
data() {
return {
- loadGrid: true,
+ loadGrid: false,
gridName: 'rowDetailGrid',
rowKey: null,
edtingFinishFlag: 'Y',
- dataPathMock: {
- "rowDetailGrid": {
- column: [
- { header: '검침 대상 ID', name: 'readObjId', align: 'left' },
- { header: '검침 대상 명', name: 'readObjNm', align: 'left' },
- { header: '검침 대상 유형', name: 'readObjKind', align: 'left' },
- { header: '그룹', name: 'grpCd', align: 'left' },
- ],
- data: dataPathDataExample,
- defaultRow: dataPathDataExample,
- option: {}
- }
- },
};
},
computed: {
@@ -276,7 +261,7 @@ export default {
{ header: '검침 대상 ID', name: 'readObjId', hidden: true },
{
header: '추가 정보',
- name: 'addInfoId',
+ name: 'addInfoId',
align: 'left',
formatter({ value }) {
let retVal = '';
@@ -461,25 +446,4 @@ export default {
search() {},
},
};
-const dataPathDataExample = [
- {
- readObjId: 'OBJ001',
- readObjNm: '서울 본사',
- readObjKind: 'TYPE01',
- grpCd: 'GRP01',
- },
- {
- readObjId: 'OBJ002',
- readObjNm: '부산 지사',
- readObjKind: 'TYPE02',
- grpCd: 'GRP02',
- },
- {
- readObjId: 'OBJ003',
- readObjNm: '대전 공장',
- readObjKind: 'TYPE03',
- grpCd: 'GRP01',
- }
-];
-
diff --git a/pages/comm/auth/RoleMngPage.vue b/pages/comm/auth/RoleMngPage.vue
index 1bb2763..930c5d7 100644
--- a/pages/comm/auth/RoleMngPage.vue
+++ b/pages/comm/auth/RoleMngPage.vue
@@ -67,7 +67,6 @@
:gridName="gridName"
:parentPrgmId="myPrgmId"
@getRowsData="getRowData"
- :dataPath="dataPathMock"
/>
@@ -132,22 +131,8 @@ export default {
return {
myPrgmId: myPrgmId,
gridName: 'rowGrid',
- loadGrid: true,
+ loadGrid: false,
detailList: myDetail,
- dataPathMock : {
- rowGrid: {
- column: [
- { header: '추가 정보 그룹', name: 'addGrpId', align: 'left' },
- { header: '추가 정보 ID', name: 'addInfoId', align: 'left' },
- { header: '추가 정보 명', name: 'addInfoNm', align: 'left' },
- { header: 'Data 형식', name: 'addInfoDataKind', align: 'center' },
- { header: '사용여부', name: 'useFg', align: 'center' },
- ],
- data: dataMockExample,
- defaultRow: dataMockExample,
- option: {},
- },
- },
};
},
computed: {
@@ -518,43 +503,4 @@ const myDetail = [
placeholder: '시스템 자동입력',
},
];
-
-const dataMockExample = [
- {
- addGrpId: 'GRP001',
- addInfoId: 'INFO001',
- addInfoNm: '온도 센서',
- addInfoDataKind: 'DATA01',
- useFg: true,
- },
- {
- addGrpId: 'GRP002',
- addInfoId: 'INFO002',
- addInfoNm: '압력 센서',
- addInfoDataKind: 'DATA02',
- useFg: false,
- },
- {
- addGrpId: 'GRP003',
- addInfoId: 'INFO003',
- addInfoNm: '압력 센서',
- addInfoDataKind: 'DATA03',
- useFg: false,
- },
- {
- addGrpId: 'GRP004',
- addInfoId: 'INFO004',
- addInfoNm: '압력 센서',
- addInfoDataKind: 'DATA04',
- useFg: false,
- },
- {
- addGrpId: 'GRP005',
- addInfoId: 'INFO005',
- addInfoNm: '압력 센서',
- addInfoDataKind: 'DATA05',
- useFg: false,
- },
-];
-
diff --git a/pages/comm/base/BatchLogMngPage.vue b/pages/comm/base/BatchLogMngPage.vue
index 53b73dc..f82e108 100644
--- a/pages/comm/base/BatchLogMngPage.vue
+++ b/pages/comm/base/BatchLogMngPage.vue
@@ -4,28 +4,24 @@
-
-
+
+
-
+
-
+
-
+
-
-
-
+
+
+
+
@@ -63,11 +57,10 @@
@@ -140,56 +133,10 @@ export default {
data() {
return {
myPrgmId: myPrgmId,
- loadGrid: true,
+ loadGrid: false,
gridName: 'rowGrid',
// rowGridOrigin: [],
detailList: myDetail,
- dataPathMock : {
- 'rowGrid': {
- column: [
- { header: 'No.', name: 'batchLogSeq', align: 'center', width: 100 },
- { header: '배치ID', name: 'batchId', align: 'center', width: 100 },
- { header: '배치명', name: 'batchNm', align: 'left', width: 150 },
- { header: '실행 일자', name: 'execDt', align: 'center', width: 80 },
- {
- header: '실행 결과',
- name: 'execRsltCd',
- align: 'center',
- width: 80,
- // formatter({ value }) {
- // let retVal = '';
- // const newValue = _this.pageData.execRsltCdList.filter(
- // item => item.commCd == value,
- // );
- // if (newValue.length > 0) {
- // retVal = newValue[0].commCdNm;
- // }
- // return retVal;
- // },
- }, // "1": 프로그램, "2": 팝업
- { header: '실행 로그', name: 'execLogCont', minWidth: 150 },
- {
- header: '배치 시작 일시',
- name: 'batchStrtDttm',
- align: 'center',
- width: 160,
- },
- {
- header: '배치 종료 일시',
- name: 'batchEndDttm',
- align: 'center',
- width: 160,
- },
- { header: '등록자NO', name: 'regUserNo', width: 120 },
- { header: '등록일시', name: 'regDttm', align: 'center', width: 160 },
- { header: '수정자NO', name: 'procUserNo', width: 120 },
- { header: '수정일시', name: 'procDttm', align: 'center', width: 160 },
- ],
- data: dataMockExample,
- defaultRow: dataMockExample,
- option: {},
- },
- },
};
},
computed: {
@@ -248,14 +195,6 @@ export default {
init() {
// this.layoutInit();
this.gridInit();
-
- // _this.pageData = {
- // execRsltCdList: [
- // { commCd: '1', commCdNm: '성공' },
- // { commCd: '2', commCdNm: '실패' },
- // ],
- // };
-
},
// layoutInit() {
// const searchFilterHeight = this.$refs.searchFilter.offsetHeight;
@@ -368,13 +307,10 @@ export default {
}
});
},
- // async getRowData(data) {
- async getRowData() {
- console.log("something")
+ async getRowData(data) {
this.setPageData({
- // rowGridSelectKey: data.rowKey,
- rowGridSelectKey: 1,
- rowGridSelectData: fakeRowData,
+ rowGridSelectKey: data.rowKey,
+ rowGridSelectData: data,
});
},
compareData(type, newDt) {
@@ -481,86 +417,16 @@ const defaultData = {
},
};
-const dataMockExample = [
- {
- batchLogSeq: 1,
- batchId: 'BATCH001',
- batchNm: '일일 데이터 백업',
- execDt: '2025-07-15',
- execRsltCd: '1', // sẽ được formatter thành "성공" hoặc tương tự
- execLogCont: '백업 완료. 오류 없음.',
- batchStrtDttm: '2025-07-15 01:00:00',
- batchEndDttm: '2025-07-15 01:30:00',
- regUserNo: 'admin01',
- regDttm: '2025-07-15 01:00:00',
- procUserNo: 'admin02',
- procDttm: '2025-07-15 01:35:00',
- },
- {
- batchLogSeq: 2,
- batchId: 'BATCH002',
- batchNm: '월간 리포트 생성',
- execDt: '2025-07-01',
- execRsltCd: '2',
- execLogCont: '리포트 생성 중 오류 발생: 파일 접근 실패.',
- batchStrtDttm: '2025-07-01 03:00:00',
- batchEndDttm: '2025-07-01 03:10:00',
- regUserNo: 'reportUser',
- regDttm: '2025-07-01 03:00:00',
- procUserNo: 'admin03',
- procDttm: '2025-07-01 03:15:00',
- },
- {
- batchLogSeq: 3,
- batchId: 'BATCH003',
- batchNm: '사용자 통계 갱신',
- execDt: '2025-07-14',
- execRsltCd: '1',
- execLogCont: '통계 갱신 완료.',
- batchStrtDttm: '2025-07-14 23:00:00',
- batchEndDttm: '2025-07-14 23:20:00',
- regUserNo: 'statUser',
- regDttm: '2025-07-14 23:00:00',
- procUserNo: 'admin01',
- procDttm: '2025-07-14 23:25:00',
- },
-];
-
-const fakeRowData = {
- rowKey: 1,
- batchLogSeq: 1,
- batchId: 'BATCH001',
- batchNm: '일일 데이터 백업',
- execDt: '2025-07-15',
- execRsltCd: '1',
- execLogCont: JSON.stringify({
- session: {
- userNo: 'admin01',
- userNm: '관리자',
- comId: 'SKCC',
- locale: 'ko_KR',
- },
- batch: {
- comId: 'SKCC',
- totStdDt: '20230110',
- },
- }),
- batchStrtDttm: '2025-07-15 01:00:00',
- batchEndDttm: '2025-07-15 01:30:00',
- regUserNo: 'admin01',
- regDttm: '2025-07-15 01:00:00',
- procUserNo: 'admin02',
- procDttm: '2025-07-15 01:35:00',
-};
-
-
const myDetail = [
{
type: 'TextArea',
valueNm: 'execLogCont',
readonly: true,
cols: 12,
- class: 'py-2 transparent',
+ class: 'py-2',
},
];
+
diff --git a/pages/ems/base/ReadObjectMngPage.vue b/pages/ems/base/ReadObjectMngPage.vue
index 6d7476d..0d35b99 100644
--- a/pages/ems/base/ReadObjectMngPage.vue
+++ b/pages/ems/base/ReadObjectMngPage.vue
@@ -28,7 +28,7 @@
customClass="select-large"
/>
-
+
@@ -81,7 +80,7 @@
>검침대상 상세
-
+
+