Merge pull request 'Fix bug Screen 13' (#70) from dev-trungvq7-0729 into dev
Reviewed-on: #70
This commit is contained in:
@ -109,6 +109,44 @@
|
||||
@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;
|
||||
@ -358,6 +396,15 @@
|
||||
// "tui-grid-cell-insert-color"
|
||||
// );
|
||||
}
|
||||
|
||||
span {
|
||||
&.custom-link {
|
||||
color: map-deep-get($config,
|
||||
#{$theme},
|
||||
"router-tab-item-active-color"
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
<v-card-title>
|
||||
<span class="custom-title-4">캘린더 미리보기</span>
|
||||
</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"
|
||||
:showTitle="false" />
|
||||
</v-card-actions>
|
||||
@ -470,71 +470,76 @@ const defaultData = {
|
||||
};
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.selectbox:focus {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.calendarOption {
|
||||
box-sizing: border-box;
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
select.selectbox {
|
||||
box-sizing: border-box;
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
/* 높이 초기화 */
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
line-height: normal;
|
||||
/* line-height 초기화 */
|
||||
font-family: inherit;
|
||||
/* 폰트 상속 */
|
||||
border: 0;
|
||||
// opacity: 0; /* 숨기기 */
|
||||
// filter:alpha(opacity=0); /* IE8 숨기기 */
|
||||
// -webkit-appearance: none; /* 네이티브 외형 감추기 */
|
||||
// -moz-appearance: none;
|
||||
// appearance: none;
|
||||
opacity: 1;
|
||||
/* 숨기기 */
|
||||
filter: alpha(opacity=1);
|
||||
/* IE8 숨기기 */
|
||||
-webkit-appearance: auto;
|
||||
/* 네이티브 외형 감추기 */
|
||||
-moz-appearance: auto;
|
||||
appearance: auto;
|
||||
}
|
||||
|
||||
.tui-grid-layer-editing {
|
||||
position: absolute;
|
||||
background: #fff;
|
||||
// background-image: initial;
|
||||
// background-position-x: initial;
|
||||
// background-position-y: initial;
|
||||
// background-size: initial;
|
||||
// background-repeat-x: initial;
|
||||
// background-repeat-y: initial;
|
||||
// background-attachment: initial;
|
||||
// background-origin: initial;
|
||||
// background-clip: initial;
|
||||
// background-color: rgb(255, 255, 255);
|
||||
// z-index: 15;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
/* border-style: solid; */
|
||||
/* border-width: 1px; */
|
||||
white-space: nowrap;
|
||||
border-width: 0px;
|
||||
// box-sizing: border-box;
|
||||
}
|
||||
|
||||
::v-deep {
|
||||
.selectbox:focus {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.calendarOption {
|
||||
box-sizing: border-box;
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
select.selectbox {
|
||||
box-sizing: border-box;
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
/* 높이 초기화 */
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
line-height: normal;
|
||||
/* line-height 초기화 */
|
||||
font-family: inherit;
|
||||
/* 폰트 상속 */
|
||||
border: 0;
|
||||
// opacity: 0; /* 숨기기 */
|
||||
// filter:alpha(opacity=0); /* IE8 숨기기 */
|
||||
// -webkit-appearance: none; /* 네이티브 외형 감추기 */
|
||||
// -moz-appearance: none;
|
||||
// appearance: none;
|
||||
opacity: 1;
|
||||
/* 숨기기 */
|
||||
filter: alpha(opacity=1);
|
||||
/* IE8 숨기기 */
|
||||
-webkit-appearance: auto;
|
||||
/* 네이티브 외형 감추기 */
|
||||
-moz-appearance: auto;
|
||||
appearance: auto;
|
||||
background: #fff;
|
||||
border: 1px solid #d9d9d9;
|
||||
border-radius: 6px;
|
||||
color: rgba(0,0,0,0.87843);
|
||||
}
|
||||
|
||||
.tui-grid-layer-editing {
|
||||
position: absolute;
|
||||
background: #fff;
|
||||
// background-image: initial;
|
||||
// background-position-x: initial;
|
||||
// background-position-y: initial;
|
||||
// background-size: initial;
|
||||
// background-repeat-x: initial;
|
||||
// background-repeat-y: initial;
|
||||
// background-attachment: initial;
|
||||
// background-origin: initial;
|
||||
// background-clip: initial;
|
||||
// background-color: rgb(255, 255, 255);
|
||||
// z-index: 15;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
/* border-style: solid; */
|
||||
/* border-width: 1px; */
|
||||
white-space: nowrap;
|
||||
border-width: 0px;
|
||||
// box-sizing: border-box;
|
||||
}
|
||||
|
||||
|
||||
.custom-vc-calender {
|
||||
.vc-header {
|
||||
display: none;
|
||||
|
||||
@ -66,7 +66,7 @@
|
||||
<v-card-title class="pa-0">설비별 현황 리스트</v-card-title>
|
||||
</div>
|
||||
<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"
|
||||
:parentPrgmId="myPrgmId" :columnClickEventFlag="true" @columnClick="columnClick" />
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user