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/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/layouts/default.vue b/layouts/default.vue index 68f6454..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 e7ecfbb..743c67d 100644 --- a/pages/comm/base/NoticeMngPage.vue +++ b/pages/comm/base/NoticeMngPage.vue @@ -10,7 +10,7 @@ 공지사항
- 작성
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/effc/EnrgMapPage.vue b/pages/ems/effc/EnrgMapPage.vue index b3c2e51..fed1f9d 100644 --- a/pages/ems/effc/EnrgMapPage.vue +++ b/pages/ems/effc/EnrgMapPage.vue @@ -5,14 +5,14 @@ - + - + - + diff --git a/pages/ems/effc/EnrgReptMngPage.vue b/pages/ems/effc/EnrgReptMngPage.vue index e0ea938..a22005e 100644 --- a/pages/ems/effc/EnrgReptMngPage.vue +++ b/pages/ems/effc/EnrgReptMngPage.vue @@ -99,6 +99,8 @@ import EqpmSelectPop from '~/components/common/modal/EqpmSelectPop'; import DateUtility from '~/plugins/dateUtility'; import XLSX from 'xlsx'; +import getLineChartOption from "~/components/common/chartoptions/LineChart"; + let myTitle; let myPrgmId; @@ -764,22 +766,14 @@ export default { ]; } - var chartOption = { - legend: { - top: 'top', - }, - grid: { - top: '10%', - bottom: '20%', - }, - yAxis: {}, - xAxis: { - data: xAxisData, - }, - series: seriesData, - tooltip: {}, + const chartOption = getLineChartOption({ + xAxisData: xAxisData, + seriesData: seriesData, dataZoom: dataZoom, - }; + // legendData: legendData, + // isDarkMode: this.isDarkMode, + }); + this.setChartOption({ chartKey: this.chartName01, value: chartOption }); // this.setChartYAxisData({ chartKey: this.chartName01, value: yAxisData }); // this.setChartXAxisData({ chartKey: this.chartName01, value: xAxisData }); @@ -864,22 +858,13 @@ export default { ]; } - var chartOption = { - legend: { - top: 'top', - }, - grid: { - top: '10%', - bottom: '20%', - }, - yAxis: {}, - xAxis: { - data: xAxisData, - }, - series: seriesData, - tooltip: {}, + const chartOption = getLineChartOption({ + xAxisData: xAxisData, + seriesData: seriesData, dataZoom: dataZoom, - }; + // legendData: legendData, + // isDarkMode: this.isDarkMode, + }); this.setChartOption({ chartKey: this.chartName02, value: chartOption }); // this.setChartDataZoom({chartKey : this.chartName02,value: dataZoom});