diff --git a/assets/scss/layout.scss b/assets/scss/layout.scss index 715c112..a008ef5 100644 --- a/assets/scss/layout.scss +++ b/assets/scss/layout.scss @@ -448,8 +448,8 @@ .router-tab { .router-tab__header { - background-color: map-deep-get($config, #{$theme}, "router-header"); - border-color: map-deep-get($config, #{$theme}, "router-header"); + // background-color: map-deep-get($config, #{$theme}, "router-header"); + // border-color: map-deep-get($config, #{$theme}, "router-header"); height: 46px; z-index: 7; max-width: calc(100vw - 290px); diff --git a/components/common/PastRsltDatePicker.vue b/components/common/PastRsltDatePicker.vue index a73b12a..f14d18f 100644 --- a/components/common/PastRsltDatePicker.vue +++ b/components/common/PastRsltDatePicker.vue @@ -58,6 +58,11 @@ export default { require: false, default: false, }, + required: { + type: Boolean, + require: false, + default: false, + }, labelCols: { type: Number, require: false, diff --git a/components/common/modal/EqpmSelectPop.vue b/components/common/modal/EqpmSelectPop.vue index 7cea177..3c1cbc7 100644 --- a/components/common/modal/EqpmSelectPop.vue +++ b/components/common/modal/EqpmSelectPop.vue @@ -400,7 +400,6 @@ export default { header: { height: 'auto', }, - // rowHeaders:[{ type: 'checkbox' }], rowHeight: 'auto', }; if (this.isMulti) { @@ -408,8 +407,6 @@ export default { myOptions['rowHeight'] = 'auto'; } - - this.setModalGridOption({ modalKey: this.myModalKey, gridKey: this.gridName, @@ -463,8 +460,6 @@ export default { modalDataKey: this.modalDataKey, value: myColumns, }); - - // this.getRowGridData(); }, async getRowGridData() { @@ -588,6 +583,18 @@ var eqpmSelectPop = { overflow-y: hidden; } + .tui-grid-lside-area { + .tui-grid-table { + .tui-grid-cell-header { + &.tui-grid-cell { + input[type=checkbox] { + margin-top: 0px; + } + } + } + } + } + } diff --git a/layouts/default.vue b/layouts/default.vue index d32df3a..06d74ff 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -104,7 +104,9 @@ :items="treevieItems" activatable hoverable color="#3896ff" open-on-click @update:open="openNode">