diff --git a/assets/scss/common.scss b/assets/scss/common.scss index 763638a..f3d3a69 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -266,7 +266,7 @@ a { } &>.v-treeview-node__root:hover:before { - opacity: 1 !important; + opacity: 0 !important; } .v-treeview-node__children { @@ -280,13 +280,17 @@ a { .v-treeview-node--click[aria-expanded="true"] { &>.v-treeview-node__root:before { - opacity: 1 !important; + opacity: 0 !important; } } .v-treeview-node[aria-expanded="true"] { - &>.v-treeview-node__root>.v-treeview-node__content>.v-treeview-node__label>button>.v-icon.mdi-chevron-down { - transform: rotate(-180deg); + &>.v-treeview-node__root>.v-treeview-node__content + >.v-treeview-node__label>button { + >.anticon, + >.v-icon.mdi-chevron-down { + transform: rotate(-180deg); + } } } @@ -298,15 +302,17 @@ a { // justify-content: center; } + & .anticon, & .v-icon.mdi-chevron-down { margin-left: auto; + animation-duration: 0.5s; } } } .v-treeview-node--active { &:before { - opacity: 1 !important; + opacity: 0 !important; } } @@ -322,7 +328,8 @@ a { .v-treeview-node__content span:not(.v-icon), .v-treeview-node__root>button, .v-treeview-node__level, - .v-treeview-node__content .v-icon.mdi-chevron-down { + .v-treeview-node__content .v-icon.mdi-chevron-down, + .v-treeview-node__content .anticon { display: none; } @@ -615,36 +622,36 @@ a { .v-navigation-drawer__append { >p { - @if $theme ==dark { - color: rgba(255, 255, 255, 0.6); - } + color: map-deep-get($config, #{$theme}, "v-banner-border-color" ) !important; + // @if $theme ==dark { + // color: rgba(255, 255, 255, 0.6); + // } - @else { - color: #999; - } + // @else { + // color: #999; + // } } } - .v-footer { - @if $theme ==light { - background-color: #dfdfe5; - color: #767d83; - } - } + // .v-footer { + // @if $theme ==light { + // background-color: #dfdfe5; + // color: #767d83; + // } + // } - .bd { - @if $theme ==dark { - &-r-1 { - border-right: 1px #373f45 solid; - } - } - - @else { - &-r-1 { - border-right: 1px #efefef solid; - } - } - } + // .bd { + // @if $theme ==dark { + // &-r-1 { + // border-right: 1px #373f45 solid; + // } + // } + // @else { + // &-r-1 { + // border-right: 1px #efefef solid; + // } + // } + // } .border-bottom-1 { border-bottom: 1px solid map-deep-get($config, #{$theme}, "border-color"); @@ -692,183 +699,224 @@ a { } &>.v-treeview-node { - - .v-treeview-node--active { - background-color: map-deep-get($config, - #{$theme}, - "v-treeview-node-label-active-bg" - ); - border: 1px solid map-deep-get($config, - #{$theme}, - "v-treeview-node-label-active-border" - ); + .v-treeview-node__root { border-radius: 8px; - - &:before { - background-color: map-deep-get($config, - #{$theme}, - "v-treeview-node-subroot-backgroundColor" - ); - } - - &>.v-treeview-node__content { - .v-treeview-node__label { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-label-active-color" - ); - } - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "v-treeview-icon-active-color" - ); - } - } - - } - - &>.v-treeview-node__root { - &:before { - background-color: map-deep-get($config, - #{$theme}, - "v-treeview-node-root-backgroundColor" - ); - } - - &>.v-treeview-node__content { - .v-treeview-node__label { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-root-label-color" - ); - } - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-root-icon-color" - ); - } - } - &:hover { - &>.v-treeview-node__content { - .v-treeview-node__label { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-root-label-active-color" - ); - } - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-root-icon-active-color" - ); - } - } + background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color" ); } - } - - &>.v-treeview-node__children { - &>.v-treeview-node { - - &>.v-treeview-node__root { - &:before { - background-color: map-deep-get($config, - #{$theme}, - "v-treeview-node-subroot-backgroundColor" - ); - } - - &>.v-treeview-node__content { - .v-treeview-node__label { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-label-color" - ); - } - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "v-treeview-icon-color" - ); - } - } - - &:not(.v-treeview-node--active):hover { - &:before { - background-color: map-deep-get($config, - #{$theme}, - "v-treeview-leaf-active-backgroundColor" - ); - } - - &>.v-treeview-node__content { - .v-treeview-node__label { - color: map-deep-get($config, - #{$theme}, - "v-treeview-leaf-active-color" - ); - } - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "v-treeview-leaf-active-color" - ); - } - } - } - } - - &>.v-treeview-node__children { - background-color: map-deep-get($config, - #{$theme}, - "v-treeview-leaf-subchildren-backgroundColor" - ); - } - - &[aria-expanded="true"] { - & .v-treeview-node__root>.v-treeview-node__content { - .v-treeview-node__label { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-label-children-color" - ); - } - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "v-treeview-icon-active-color" - ); - } - } - } - } - } - - &[aria-expanded="true"] { - & .v-treeview-node__root>.v-treeview-node__content { + .v-treeview-node__content { .v-treeview-node__label { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-root-label-active-color" - ); - } - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-root-icon-active-color" - ); + color: map-deep-get($config, #{$theme}, "tui-grid-title-color"); } } + } + + &[aria-expanded="true"]{ + + // Level 1 + &>.v-treeview-node__root { + background-color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-bg" ); + border: 1px solid map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" ); + color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border"); + + &:before { + background-color: map-deep-get($config, #{$theme}, "v-treeview-node-subroot-backgroundColor"); + } + + .v-treeview-node__content { + .v-treeview-node__label { + color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border"); + } + + .v-icon:first-child, + .v-icon:first-child::before { + color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" ); + } + } + } + + &>.v-treeview-node__children { + // Level 2 + .v-treeview-node__root { + color: map-deep-get($config, #{$theme}, "v-treeview-node-root-label-color"); + &:hover { + background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-backgroundColor"); + } + } + &>[aria-expanded="true"] >.v-treeview-node__root, + .v-treeview-node__root.v-treeview-node--active { + background-color: map-deep-get($config, #{$theme}, "v-calendar-day-in-not-month-color" ); + .v-treeview-node__content { + .v-treeview-node__label { + color: map-deep-get($config, #{$theme}, "card-title-color"); + } + + .v-icon, + .v-icon::before, + .anticon { + color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" ); + } + } + } + + // Level 3 + .v-treeview-node__children { + .v-treeview-node { + >.v-treeview-node__root { + .v-treeview-node__content { + .v-treeview-node__label { + color: map-deep-get($config, #{$theme}, "card-default-color"); + } + } + + *:hover, + :hover { + border-width: 0; + } + + &:hover { + border: 1px solid map-deep-get($config, #{$theme}, "v-input-textarea-border"); + border-radius: 8px; + background-color: rgba(0, 0, 0, 0); + .v-treeview-node__content { + .v-treeview-node__label { + color: map-deep-get($config, #{$theme}, "tui-grid-title-color"); + } + } + + } + + &.v-treeview-node--active { + // color: map-deep-get($config, #{$theme}, "card-title-color"); + background-color: rgba(0, 0, 0, 0); + .v-treeview-node__content { + .v-treeview-node__label { + color: map-deep-get($config, #{$theme}, "tui-grid-title-color"); + } + + .v-icon, + .v-icon::before, + .anticon { + color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" ); + } + } + } + + } + } + + } + + } + + + } + + // &>.v-treeview-node__root { + // &:before { + // background-color: map-deep-get($config, #{$theme}, "v-treeview-node-root-backgroundColor" ); + // } + + // &>.v-treeview-node__content { + // .v-treeview-node__label { + // color: map-deep-get($config, #{$theme}, "v-treeview-node-root-label-color"); + // } + // } + + // &:hover { + // &>.v-treeview-node__content { + // .v-treeview-node__label { + // color: map-deep-get($config, + // #{$theme}, + // "v-treeview-node-root-label-active-color" + // ); + // } + + // .v-icon { + // color: map-deep-get($config, + // #{$theme}, + // "v-treeview-node-root-icon-active-color" + // ); + // } + // } + // } + // } + + // &>.v-treeview-node__children { + // &>.v-treeview-node { + + // &>.v-treeview-node__root { + // &:before { + // background-color: map-deep-get($config, + // #{$theme}, + // "v-treeview-node-subroot-backgroundColor" + // ); + // } + + // &>.v-treeview-node__content { + // .v-treeview-node__label { + // color: map-deep-get($config, #{$theme}, "v-treeview-node-label-color" ); + // } + + // .v-icon { + // color: map-deep-get($config, #{$theme}, "v-treeview-icon-color" ); + // } + // } + + // &:not(.v-treeview-node--active):hover { + // &:before { + // background-color: map-deep-get($config, + // #{$theme}, + // "v-treeview-leaf-active-backgroundColor" + // ); + // } + + // &>.v-treeview-node__content { + // .v-treeview-node__label { + // color: map-deep-get($config, + // #{$theme}, + // "v-treeview-leaf-active-color" + // ); + // } + + // .v-icon { + // color: map-deep-get($config, + // #{$theme}, + // "v-treeview-leaf-active-color" + // ); + // } + // } + // } + // } + + // &>.v-treeview-node__children { + // // background-color: map-deep-get($config, + // // #{$theme}, + // // "v-treeview-leaf-subchildren-backgroundColor" + // // ); + // } + + // // &[aria-expanded="true"] { + // // & .v-treeview-node__root>.v-treeview-node__content { + // // .v-treeview-node__label { + // // color: map-deep-get($config, + // // #{$theme}, + // // "v-treeview-node-label-children-color" + // // ); + // // } + + // // .v-icon { + // // color: map-deep-get($config, + // // #{$theme}, + // // "v-treeview-icon-active-color" + // // ); + // // } + // // } + // // } + // } + // } + } } diff --git a/components/common/modal/ElecPowChrgPop.vue b/components/common/modal/ElecPowChrgPop.vue index c2e7770..56efac4 100644 --- a/components/common/modal/ElecPowChrgPop.vue +++ b/components/common/modal/ElecPowChrgPop.vue @@ -58,7 +58,7 @@
- + - + - + -
+ + - + + + 초기화 + @@ -310,7 +335,11 @@ export default { }, // 공정/설비 트리 그리드 세팅 gridInit() { - const myOptions = {}; + const myOptions = { + header: { + height: 38, + }, + }; this.setModalGridOption({ modalKey: this.myModalKey, gridKey: this.gridName, @@ -606,11 +635,11 @@ const myColumns = [ { header: '전력계약 ID', name: 'eleclContId', hidden: true}, { header: '전력계약 명', name: 'eleclContNm', hidden: true}, { header: '전력계약구분CD', name: 'elecContKind', hidden: true}, - { header: '전력계약구분', name: 'elecContKindNm', align: 'center'}, + { header: '전력계약구분', name: 'elecContKindNm', align: 'left'}, { header: '전압구분CD', name: 'voltKind', hidden: true }, - { header: '전압구분', name: 'voltKindNm', align: 'center' }, + { header: '전압구분', name: 'voltKindNm', align: 'left' }, { header: '옵션CD', name: 'optKind', hidden: true }, - { header: '옵션', name: 'optKindNm', align: 'center' }, + { header: '옵션', name: 'optKindNm', align: 'left' }, { header: '기본요금(원/kW)', name: 'baseChrg', @@ -620,7 +649,7 @@ const myColumns = [ }, }, { header: '시간대CD', name: 'peakKind', hidden: true }, - { header: '시간대', name: 'peakKindNm', align: 'center' }, + { header: '시간대', name: 'peakKindNm', align: 'left' }, { header: '여름철(6~8월)', name: 'unitPrcSum', diff --git a/components/common/modal/EqpmSelectPop.vue b/components/common/modal/EqpmSelectPop.vue index 0fe794e..959de8b 100644 --- a/components/common/modal/EqpmSelectPop.vue +++ b/components/common/modal/EqpmSelectPop.vue @@ -16,54 +16,52 @@ - - + + 설비 선택
- - - - - - - - - - - - - - - - - + - - - 조회 - - - - + + + 조회 + +
-
-
+ + +
-
+ + 닫기 확인 diff --git a/components/common/modal/TagTrndTagPop.vue b/components/common/modal/TagTrndTagPop.vue index fa0b2d4..1eccc1d 100644 --- a/components/common/modal/TagTrndTagPop.vue +++ b/components/common/modal/TagTrndTagPop.vue @@ -273,9 +273,9 @@ export default { }); }, async created() { - // await this.setSelectValueList01(); - // await this.setSelectValueList02(); - // await this.setSelectValueList03(); + await this.setSelectValueList01(); + await this.setSelectValueList02(); + await this.setSelectValueList03(); this.init(); // if(this.searchParam.isMulti == true){ // this.setPageData({ @@ -487,40 +487,40 @@ export default { eqpmId: this.selectValue03, searchWord: this.searchWord, }; - let res = [ - { - eqpmGrpNm: "냉각 시스템", - eqpmGrpId: "GRP001", - eqpmId: "EQ001", - eqpmNm: "냉각기 A", - tagId: "TAG001-001", - tagNm: "냉각 온도 센서", - rowStat: "I", - }, - { - eqpmGrpNm: "전력 시스템", - eqpmGrpId: "GRP002", - eqpmId: "EQ002", - eqpmNm: "변압기 B", - tagId: "TAG002-002", - tagNm: "전류 센서", - rowStat: "U", - }, - { - eqpmGrpNm: "공기압 시스템", - eqpmGrpId: "GRP003", - eqpmId: "EQ003", - eqpmNm: "압축기 C", - tagId: "TAG003-003", - tagNm: "압력 센서", - rowStat: "D", - }, - ]; - // res = await this.postApiReturn({ - // apiKey: "selectTagAndEqpmList", - // resKey: "tagTrndDatas", - // sendParam: searchParam, - // }); + // let res = [ + // { + // eqpmGrpNm: "냉각 시스템", + // eqpmGrpId: "GRP001", + // eqpmId: "EQ001", + // eqpmNm: "냉각기 A", + // tagId: "TAG001-001", + // tagNm: "냉각 온도 센서", + // rowStat: "I", + // }, + // { + // eqpmGrpNm: "전력 시스템", + // eqpmGrpId: "GRP002", + // eqpmId: "EQ002", + // eqpmNm: "변압기 B", + // tagId: "TAG002-002", + // tagNm: "전류 센서", + // rowStat: "U", + // }, + // { + // eqpmGrpNm: "공기압 시스템", + // eqpmGrpId: "GRP003", + // eqpmId: "EQ003", + // eqpmNm: "압축기 C", + // tagId: "TAG003-003", + // tagNm: "압력 센서", + // rowStat: "D", + // }, + // ]; + let res = await this.postApiReturn({ + apiKey: "selectTagAndEqpmList", + resKey: "tagTrndDatas", + sendParam: searchParam, + }); let newRes = []; if (this.searchParam["tagList"].length > 0) { newRes = res.filter((item) => { diff --git a/layouts/default.vue b/layouts/default.vue index 87ee665..f803b26 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -9,7 +9,6 @@ @@ -40,16 +39,16 @@ @@ -805,7 +786,7 @@ export default { // console.log('if isLoading stmt3'); // return; // } - alert("move to", url); + // alert("move to", url); this.$router.push({ path: url + "?prgmId=" + prgmId, }); diff --git a/pages/comm/base/NoticeMngPage.vue b/pages/comm/base/NoticeMngPage.vue index c99974f..cc71731 100644 --- a/pages/comm/base/NoticeMngPage.vue +++ b/pages/comm/base/NoticeMngPage.vue @@ -10,8 +10,8 @@ 공지사항
- 작성 + 작성
@@ -1053,16 +1053,16 @@ const defaultData = { } } - .toastui-editor-mode-switch{ + .toastui-editor-mode-switch { font-family: Inter !important; font-size: 1.0rem !important; } - .toastui-editor-mode-switch .tab-item.active{ + .toastui-editor-mode-switch .tab-item.active { color: #1677FF } - .toastui-editor-mode-switch .tab-item{ + .toastui-editor-mode-switch .tab-item { color: #000000E0 } } diff --git a/pages/ems/base/EquipmentMasterMngPage.vue b/pages/ems/base/EquipmentMasterMngPage.vue index acc09f1..938faf2 100644 --- a/pages/ems/base/EquipmentMasterMngPage.vue +++ b/pages/ems/base/EquipmentMasterMngPage.vue @@ -53,7 +53,7 @@ - 설비 상세 + 설비 상세
diff --git a/pages/ems/base/ReadResultCloseMngPage.vue b/pages/ems/base/ReadResultCloseMngPage.vue index 8a64eea..0720a38 100644 --- a/pages/ems/base/ReadResultCloseMngPage.vue +++ b/pages/ems/base/ReadResultCloseMngPage.vue @@ -43,6 +43,7 @@ :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'조회기간'" + customClass="datepicker-large" />
diff --git a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue index 351da39..0a98351 100644 --- a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue +++ b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue @@ -49,7 +49,7 @@ + :textCols="12" :customClass="'datepicker-large'" /> diff --git a/pages/ems/effc/EnrgEffcTotSummPage.vue b/pages/ems/effc/EnrgEffcTotSummPage.vue index a6e53e3..97b6233 100644 --- a/pages/ems/effc/EnrgEffcTotSummPage.vue +++ b/pages/ems/effc/EnrgEffcTotSummPage.vue @@ -1,5 +1,6 @@