diff --git a/assets/scss/common.scss b/assets/scss/common.scss index bac9445..b0d4fa3 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -12,8 +12,7 @@ html, body { - overflow: auto; - + // overflow: auto; } a { @@ -119,7 +118,7 @@ a { .v-main, .v-main__wrap, .container { - height: 100%; + // height: 100%; } .v-main__wrap>.container { @@ -144,7 +143,9 @@ a { } & .router-tab__container { - min-height: calc(100% - 72px); + overflow-y: auto; + min-height: calc(100vh - 105px); + max-height: calc(100vh - 105px); padding: 20px; } @@ -484,6 +485,10 @@ a { .container--fluid { background-color: map-deep-get($config, #{$theme}, "container-fluid"); + .menu-container { + max-height:calc(100vh - 60px); + overflow-y: auto; + } } .v-icon { @@ -529,8 +534,6 @@ a { } } - - .router-tab { .router-tab__header { background-color: map-deep-get($config, #{$theme}, "router-header"); diff --git a/assets/scss/common/button.scss b/assets/scss/common/button.scss index 6f60886..7528ba3 100644 --- a/assets/scss/common/button.scss +++ b/assets/scss/common/button.scss @@ -92,10 +92,13 @@ background: map-deep-get($config, #{$theme}, "basic-button-background"); } - .search-button { - color: map-deep-get($config, #{$theme}, "search-btn-color"); + .searchFilter{ + .search-button { + height: 40px; + color: map-deep-get($config, #{$theme}, "search-btn-color"); + } } - + .v-dialog { .ant-btn-icon-only { color: map-deep-get( @@ -118,6 +121,9 @@ background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg"); border-color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg"); color:map-deep-get($config, #{$theme}, "ant-btn-primary-color"); + &.ant-btn-background-ghost{ + color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg"); + } } &.ant-btn-default { @@ -132,6 +138,15 @@ background: map-deep-get($config, #{$theme}, "ant-btn-danger-bg") !important; } } + + &.expand-btn { + .v-icon { + color: map-deep-get($config, #{$theme}, "basic-button-color"); + svg { + fill: map-deep-get($config, #{$theme}, "basic-button-color"); + } + } + } } } } @@ -158,4 +173,13 @@ height: 16px; background:none; } -} \ No newline at end of file +} +.ant-btn { + &.expand-btn { + .v-icon { + span { + margin-right: 8px; + } + } + } +} diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss index e20897c..2eeabc9 100644 --- a/assets/scss/common/grid.scss +++ b/assets/scss/common/grid.scss @@ -98,6 +98,17 @@ @include theme($theme); .v-application.#{$theme}-mode { + .grid-title { + font-weight: 600; + font-size: 16px; + line-height: 24px; + letter-spacing: 0; + color: map-deep-get($config, + #{$theme}, + "tui-grid-title-color" + ); + } + .tui-grid { &-table { border: 1px solid; diff --git a/assets/scss/var.scss b/assets/scss/var.scss index 60de483..ec638ff 100644 --- a/assets/scss/var.scss +++ b/assets/scss/var.scss @@ -102,6 +102,7 @@ $config: ( v-calendar-day-color: #fff, v-calendar-day-in-not-month-color: rgba(255, 255, 255, 0.05), v-calendar-is-today-background-color: #2d4571, + tui-grid-title-color: #FFFFFFD9, tui-grid-header-backgroundColor: #2a2b2d, tui-grid-header-color: #FFFFFFD9, tui-grid-border-horziontal-color: #212224, @@ -239,6 +240,7 @@ $config: ( v-calendar-day-color: #111, v-calendar-day-in-not-month-color: #f8f8f8, v-calendar-is-today-background-color: #e3eaf3, + tui-grid-title-color: #000000E0, tui-grid-header-backgroundColor: #fafafa, //#e0e0e0, tui-grid-header-color: rgba(0, 0, 0, 0.88), tui-grid-border-horziontal-color: #e0e0e0, diff --git a/components/common/Chart.vue b/components/common/Chart.vue index c9aa472..4dcc7c1 100644 --- a/components/common/Chart.vue +++ b/components/common/Chart.vue @@ -351,25 +351,25 @@ export default { tmpChrtOp.color = light_Col; } } - console.log('ops11:',tmpChrtOp) + // console.log('ops11:',tmpChrtOp) return tmpChrtOp; }, }), }, created() { - console.log('wd data:',this.widgetData) + // console.log('wd data:',this.widgetData) }, methods: { onClick(event, instance, ECharts) { - console.log('onClick : ', event); + // console.log('onClick : ', event); this.$emit('click', event); }, onDblClick(event, instance, ECharts) { - console.log('onDblClick : ', event); + // console.log('onDblClick : ', event); this.$emit('dblclick', event); }, onRightClick(event, instance, ECharts) { - console.log('onRightClick : ', event); + // console.log('onRightClick : ', event); this.$emit('rclick', event); }, onLegendSelect(params) { diff --git a/components/common/Datepicker.vue b/components/common/Datepicker.vue index a17ec0b..0a71957 100644 --- a/components/common/Datepicker.vue +++ b/components/common/Datepicker.vue @@ -30,7 +30,7 @@ - - - diff --git a/components/common/Grid.vue b/components/common/Grid.vue index 0270b89..34c3f4b 100644 --- a/components/common/Grid.vue +++ b/components/common/Grid.vue @@ -163,7 +163,7 @@ export default { }, created() {}, async mounted() { - console.log('--------------DEBUG----gridData: ', this.gridData); + // console.log('--------------DEBUG----gridData: ', this.gridData); if (this.gridName) { this.gridInstance = this.$refs['tuigrid' + this.gridName]; @@ -666,6 +666,8 @@ export default { store.dimension.offsetLeft = offsetLeft; }, setHeight(_a,height){ + return; // setting auto height + // console.log("setHeight"); var dimension = _a.dimension; var headerHeight = dimension.headerHeight, summaryHeight = dimension.summaryHeight, tableBorderWidth = dimension.tableBorderWidth; diff --git a/components/common/button/ActionButtons.vue b/components/common/button/ActionButtons.vue index 2b61640..c5baa1a 100644 --- a/components/common/button/ActionButtons.vue +++ b/components/common/button/ActionButtons.vue @@ -3,8 +3,7 @@ - - + - - + diff --git a/components/common/chartoptions/GaugeChart.js b/components/common/chartoptions/GaugeChart.js index d08b9aa..d29225c 100644 --- a/components/common/chartoptions/GaugeChart.js +++ b/components/common/chartoptions/GaugeChart.js @@ -1,5 +1,5 @@ // Gauge chart options -export default function getGaugeChartOption({ title, value, min = 0, max = 160, unit = '%', isDarkMode = false, backgroundRadius = 97 }) { +export default function getGaugeChartOption({ title, min = 0, max = 160, unit = '%', isDarkMode = false, backgroundRadius = 97 }) { const colorRanges = isDarkMode ? [ [0.375, '#49AA19'], // Dark Green diff --git a/components/common/chartoptions/LineChart.js b/components/common/chartoptions/LineChart.js index b514378..7d5ebce 100644 --- a/components/common/chartoptions/LineChart.js +++ b/components/common/chartoptions/LineChart.js @@ -2,7 +2,7 @@ export default function getLineChartOption({ xAxisData = [], seriesData = [], - legendData = [], + // legendData = [], isDarkMode = false, }) { @@ -31,7 +31,7 @@ export default function getLineChartOption({ }, legend: { - data: legendData, + // data: legendData, icon: 'circle', top: '0%', right: '5%', diff --git a/components/common/modal/EnrgUsePlanModiPop.vue b/components/common/modal/EnrgUsePlanModiPop.vue index 05592d6..4fa2137 100644 --- a/components/common/modal/EnrgUsePlanModiPop.vue +++ b/components/common/modal/EnrgUsePlanModiPop.vue @@ -318,7 +318,7 @@ export default { // } }, mounted(){ - this.initTest(); return; + // this.initTest(); return; }, methods: { ...mapMutations({ @@ -478,10 +478,6 @@ export default { // }) }, async setChart(){ - // test - this.initTestChart(); return; - // end test - this.loadChart = false; let xAxisData = []; let seriesData = []; diff --git a/components/common/modal/EvtObjPop.vue b/components/common/modal/EvtObjPop.vue index 30919b6..6a3bae7 100644 --- a/components/common/modal/EvtObjPop.vue +++ b/components/common/modal/EvtObjPop.vue @@ -7,12 +7,15 @@ {{ option.labelContent }} - - - + + @@ -21,10 +24,10 @@ {{ option.modalTitle }} mdi-close - + - + - + 역할 메뉴별 권한 @@ -70,7 +69,7 @@ :style="{ minHeight: '36px' }" >[미배정]메뉴리스트 -
+
-
+
{ + return ``; + } + }, { header: '메뉴명', name: 'menuNm', @@ -415,6 +425,17 @@ export default { }, ]; const myTreeColumns2 = [ + { + header: '', + name: '', + align: 'center', + width: 30, + formatter: (props) => { + return ``; + } + }, { header: '역할ID', name: 'roleId', hidden: true }, { header: '메뉴ID', name: 'menuId', hidden: true }, { header: '메뉴명', name: 'menuNm', minWidth: '235' }, diff --git a/pages/comm/base/CommCdMngPage.vue b/pages/comm/base/CommCdMngPage.vue index e12aca4..db344e4 100644 --- a/pages/comm/base/CommCdMngPage.vue +++ b/pages/comm/base/CommCdMngPage.vue @@ -1,33 +1,65 @@