Compare commits

..

5 Commits

Author SHA1 Message Date
50698ac661 hotfix bug screen 10 2025-08-18 09:25:41 +07:00
dev
c815eae2ca Merge pull request 'Fix bug Screen 13' (#70) from dev-trungvq7-0729 into dev
Reviewed-on: #70
2025-08-18 10:50:01 +09:00
dev
8a9dfd9949 Merge pull request 'fix desgin screen 38' (#69) from dev-manhph1-figbug into dev
Reviewed-on: #69
2025-08-18 10:47:00 +09:00
dev
3155258656 Update 1508 2025-08-18 10:44:55 +09:00
dev
68916550e5 Update 1508 2025-08-18 10:40:46 +09:00
5 changed files with 118 additions and 91 deletions

View File

@ -21,15 +21,6 @@
display: none; display: none;
} }
&-no-scroll-y {
.tui-grid-rside-area {
.tui-grid-header-area,
.tui-grid-summary-area {
margin-right: 0 !important;
}
}
}
&-rside-area { &-rside-area {
.tui-grid-header-area, .tui-grid-header-area,
@ -118,6 +109,44 @@
@include theme($theme); @include theme($theme);
.v-application.#{$theme}-mode { .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-content-area {
.tui-grid-header-area { .tui-grid-header-area {
height: auto !important; height: auto !important;
@ -367,6 +396,15 @@
// "tui-grid-cell-insert-color" // "tui-grid-cell-insert-color"
// ); // );
} }
span {
&.custom-link {
color: map-deep-get($config,
#{$theme},
"router-tab-item-active-color"
);
}
}
} }
} }

View File

@ -174,10 +174,6 @@ export default {
this.gridScrollTop = e.target.scrollTop; this.gridScrollTop = e.target.scrollTop;
this.gridScrollLeft = e.target.scrollLeft; this.gridScrollLeft = e.target.scrollLeft;
}); });
if (!(this.scrollBody.scrollHeight > this.scrollBody.clientHeight)) {
this.gridInstance.$el.getElementsByClassName('tui-grid-content-area')[0].classList.add('tui-grid-no-scroll-y');
}
} }
}, },
methods: { methods: {

View File

@ -68,18 +68,6 @@ export default {
loadGrid: false, loadGrid: false,
gridName: 'rowDataSetTagRelGrid', gridName: 'rowDataSetTagRelGrid',
detailDataSetTagList: myDataSetTagDetail, detailDataSetTagList: myDataSetTagDetail,
dataPathMock: {
"rowDataSetTagRelGrid": {
column: [
{ header: 'TAG ID', name: 'id', headerAlign: 'left' },
{ header: 'TAG 명', name: 'name', headerAlign: 'left' },
{ header: '모델 Data 구분', name: 'type', headerAlign: 'left' }
],
data: dataPathDataExample,
defaultRow: dataPathDataExample,
option: {}
}
},
}; };
}, },
computed: { computed: {

View File

@ -41,7 +41,7 @@
<v-card-title> <v-card-title>
<span class="custom-title-4">캘린더 미리보기</span> <span class="custom-title-4">캘린더 미리보기</span>
</v-card-title> </v-card-title>
<v-card-actions class="px-5 d-block" > <v-card-actions class="px-5 d-block">
<Calendar :parentPrgmId="myPrgmId" :gridName="gridName" :headerVisible="false" <Calendar :parentPrgmId="myPrgmId" :gridName="gridName" :headerVisible="false"
:showTitle="false" /> :showTitle="false" />
</v-card-actions> </v-card-actions>
@ -470,20 +470,21 @@ const defaultData = {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.selectbox:focus { ::v-deep {
.selectbox:focus {
outline: none; outline: none;
} }
.calendarOption { .calendarOption {
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
width: 100%; width: 100%;
height: 100%; height: 100%;
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
select.selectbox { select.selectbox {
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
width: 100%; width: 100%;
@ -509,9 +510,13 @@ select.selectbox {
/* 네이티브 외형 감추기 */ /* 네이티브 외형 감추기 */
-moz-appearance: auto; -moz-appearance: auto;
appearance: auto; appearance: auto;
} background: #fff;
border: 1px solid #d9d9d9;
border-radius: 6px;
color: rgba(0,0,0,0.87843);
}
.tui-grid-layer-editing { .tui-grid-layer-editing {
position: absolute; position: absolute;
background: #fff; background: #fff;
// background-image: initial; // background-image: initial;
@ -532,9 +537,9 @@ select.selectbox {
white-space: nowrap; white-space: nowrap;
border-width: 0px; border-width: 0px;
// box-sizing: border-box; // box-sizing: border-box;
} }
::v-deep {
.custom-vc-calender { .custom-vc-calender {
.vc-header { .vc-header {
display: none; display: none;

View File

@ -66,7 +66,7 @@
<v-card-title class="pa-0">설비별 현황 리스트</v-card-title> <v-card-title class="pa-0">설비별 현황 리스트</v-card-title>
</div> </div>
<div class="px-4" style="height:calc(100% - 76px)"> <div class="px-4" style="height:calc(100% - 76px)">
<div ref="gridParent" class="w100 h100"> <div ref="gridParent" class="w100 h100 enrg-effc">
<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" <component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
:parentPrgmId="myPrgmId" :columnClickEventFlag="true" @columnClick="columnClick" /> :parentPrgmId="myPrgmId" :columnClickEventFlag="true" @columnClick="columnClick" />
</div> </div>