diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss index 3ca101f..3bb317a 100644 --- a/assets/scss/common/grid.scss +++ b/assets/scss/common/grid.scss @@ -10,6 +10,14 @@ &-container { width: 100%; border-radius: 10px; + + .tui-select-box-input { + p { + font-size: 14px; + font-family: inherit + } + } + } &-content-area { @@ -23,6 +31,7 @@ &-no-scroll-y { .tui-grid-rside-area { + .tui-grid-header-area, .tui-grid-summary-area { margin-right: 0 !important; @@ -150,6 +159,15 @@ .tui-select-box-input { border-radius: 6px; + + .tui-select-box-icon { + width: 14px; + height: 14px; + + background-repeat: no-repeat; + background-size: contain; + margin-top: -20px; + } } .tui-select-box-dropdown { @@ -158,7 +176,9 @@ padding: 4px; box-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.2), 0px 0px 0px 0px rgba(0, 0, 0, 0.14), 0px 0px 0px 0px rgba(0, 0, 0, 0.12); + .tui-select-box-item { + font-size: 14px; margin-bottom: 4px; position: relative; @@ -204,44 +224,6 @@ @include theme($theme); .v-application.#{$theme}-mode { - .enrg-effc { - .tui-grid-rside-area { - .tui-grid-table { - tr { - - td:nth-child(4), - td:nth-child(10) { - .tui-grid-cell-content { - color: map-deep-get($config, - #{$theme}, - "router-tab-item-active-color" - ); - } - } - } - - .tui-grid { - - &-row-odd, - &-row-even { - &:hover { - - >td:nth-child(4), - td:nth-child(10) { - .tui-grid-cell-content { - color: map-deep-get($config, - #{$theme}, - "router-tab-item-active-color" - ); - } - } - } - } - } - } - } - } - .tui-grid-content-area { .tui-grid-header-area { height: auto !important; @@ -715,7 +697,7 @@ } &-tree-button-expand { - z-index: 9999; + z-index: 7; .tui-grid-btn-tree { i { @@ -735,7 +717,7 @@ } &-tree-button-collapse { - z-index: 9999; + z-index: 7; .tui-grid-btn-tree { i { @@ -862,6 +844,17 @@ "tui-grid-cell-color" ); + .tui-select-box-icon { + + @if $theme ==dark { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2217%22%20height%3D%2216%22%20viewBox%3D%220%200%2017%2016%22%20fill%3D%22none%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%3E%3Cpath%20fill%3D%22rgba(255%2C%20255%2C%20255%2C%200.45)%22%20d%3D%22M1.90728%203.65546L8.20371%2012.3358C8.43228%2012.6501%208.90014%2012.6501%209.12692%2012.3358L15.4251%203.65546C15.4406%203.63411%2015.4499%203.60889%2015.452%203.58259C15.454%203.55628%2015.4487%203.52993%2015.4367%203.50644C15.4247%203.48296%2015.4064%203.46326%2015.3839%203.44954C15.3613%203.43581%2015.3354%203.42859%2015.3091%203.42868H13.9698C13.8787%203.42868%2013.793%203.47332%2013.7394%203.54653L8.66621%2010.5394L3.593%203.54653C3.53942%203.47332%203.45371%203.42868%203.36264%203.42868H2.02335C1.90728%203.42868%201.83943%203.56082%201.90728%203.65546Z%22/%3E%3C/svg%3E"); + } + + @else { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2217%22%20height%3D%2216%22%20viewBox%3D%220%200%2017%2016%22%20fill%3D%22none%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%3E%3Cpath%20fill%3D%22rgba(0%2C%200%2C%200%2C%200.45)%22%20d%3D%22M1.90728%203.65546L8.20371%2012.3358C8.43228%2012.6501%208.90014%2012.6501%209.12692%2012.3358L15.4251%203.65546C15.4406%203.63411%2015.4499%203.60889%2015.452%203.58259C15.454%203.55628%2015.4487%203.52993%2015.4367%203.50644C15.4247%203.48296%2015.4064%203.46326%2015.3839%203.44954C15.3613%203.43581%2015.3354%203.42859%2015.3091%203.42868H13.9698C13.8787%203.42868%2013.793%203.47332%2013.7394%203.54653L8.66621%2010.5394L3.593%203.54653C3.53942%203.47332%203.45371%203.42868%203.36264%203.42868H2.02335C1.90728%203.42868%201.83943%203.56082%201.90728%203.65546Z%22/%3E%3C/svg%3E"); + } + } + } .tui-select-box-dropdown { @@ -886,7 +879,8 @@ .tui-select-box-highlight { - background:none !important; + background: none !important; + &:before { background: map-deep-get($config, #{$theme}, diff --git a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue index 1f77b6a..f1f6e96 100644 --- a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue +++ b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue @@ -69,12 +69,12 @@