diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss index e1268ab..baa07d9 100644 --- a/assets/scss/common/grid.scss +++ b/assets/scss/common/grid.scss @@ -17,18 +17,6 @@ border: 0 !important; } - // &-body-container { - // width: 100% !important; - // } - - // &-table { - // width: 100% !important; - // } - - // &-lside-area .tui-grid-body-area { - // margin-right: -11px; - // } - &-lside-area .tui-grid-scrollbar-left-bottom { display: none; } @@ -150,50 +138,28 @@ &-body-container{ border-right: 0; - // border-right-color: map-deep-get($config, - // #{$theme}, - // "tui-grid-cell-borderColor" - // ); + // position: relative; width: auto !important; + .tui-grid-table-container{ - width: 100% !important; + // width: 100% !important; .tui-grid-table { - width: 100% !important; + // width: 100% !important; + // table-layout: fixed; + // th, td { + // &:last-child{ + // width: auto !important; + // } + // } } } } - &-container, - &-summary-area { + &-summary-area, + &-container { font-family: Inter; - // color: #000000E0; - & ::-webkit-scrollbar { - width: 0 !important; - height: $scrollbar-width !important; - -webkit-appearance: initial; - background-color: rgba(0, 0, 0, 0) !important; - border-radius: 3px !important; - } - - & ::-webkit-scrollbar-track { - // background-color: map-deep-get($config, - // #{$theme}, - // "tui-grid-cell-borderColor" - // ) !important; - background-color: rgba(0, 0, 0, 0) !important; - } - - & ::-webkit-scrollbar-thumb { - // width: 50px !important; - height: 50px !important; - background-color: map-deep-get($config, #{$theme}, "scrollbar-thumb"); - // background-color: rgba(0, 0, 0, 0); - border-radius: 3px; - } - .tui-grid-cell { - &.tui-grid-cell-summary { color: map-deep-get($config, #{$theme}, @@ -203,6 +169,32 @@ } } + &-body-area { + overflow: auto; + + &::-webkit-scrollbar { + width: $scrollbar-width !important; + height: $scrollbar-width !important; + -webkit-appearance: initial; + background-color: rgba(0, 0, 0, 0) !important; + border-radius: 3px !important; + // border-right: 1px solid; + // border-right-color: map-deep-get($config, #{$theme}, "tui-grid-cell-borderColor"); + } + + &::-webkit-scrollbar-track { + background-color: rgba(0, 0, 0, 0) !important; + } + + &::-webkit-scrollbar-thumb { + height: 50px !important; + background-color: map-deep-get($config, #{$theme}, "scrollbar-thumb"); + border-radius: 3px; + // width: 50px !important; + // background-color: rgba(0, 0, 0, 0); + } + } + &-rside-area { background-color: map-deep-get($config, #{$theme}, "scrollbar-track"); } @@ -241,13 +233,13 @@ &-scrollbar-right-bottom { width: $scrollbar-width !important; height: $scrollbar-width !important; - // display: none !important; border-color: map-deep-get($config, #{$theme}, "cardBackground"); background-color: map-deep-get($config, #{$theme}, "cardBackground"); + box-sizing: border-box; + // display: none !important; // border: none !important; // bottom: -1px; // right: -2px; - box-sizing: border-box; // display: none; } @@ -358,10 +350,10 @@ #{$theme}, "tui-grid-cell-backgroundColor" ); - width: 100% !important; - .tui-grid-table { - width: 100% !important; - } + // width: 100% !important; + // .tui-grid-table { + // width: 100% !important; + // } } &-row-odd, diff --git a/assets/scss/datepicker.scss b/assets/scss/datepicker.scss index ffc8c88..0bfa128 100644 --- a/assets/scss/datepicker.scss +++ b/assets/scss/datepicker.scss @@ -15,8 +15,9 @@ border-radius: 6px; border: solid 1px; height: 32px; - // border-color: #424242; - border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color"); + color: map-deep-get($config, #{$theme}, "v-input-fieldset-color") !important; + border-color: currentColor; + // border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color"); &.datepicker-large { height: 40px; diff --git a/components/common/modal/EqpmSelectPop.vue b/components/common/modal/EqpmSelectPop.vue index 4d28f74..1d5f863 100644 --- a/components/common/modal/EqpmSelectPop.vue +++ b/components/common/modal/EqpmSelectPop.vue @@ -36,21 +36,21 @@ - + - + - + - 조회 + 조회 -
+
diff --git a/pages/ems/base/EquipmentMasterMngPage.vue b/pages/ems/base/EquipmentMasterMngPage.vue index 938faf2..966038d 100644 --- a/pages/ems/base/EquipmentMasterMngPage.vue +++ b/pages/ems/base/EquipmentMasterMngPage.vue @@ -382,7 +382,7 @@ export default { header: '사용 여부', name: 'useFg', width: 100, - align: 'center', + align: 'left', formatter({ value }) { const newValue = _this.pageData.useFgList.filter( item => item.commCd == value,