dev-dungtv-0807 #49

Merged
dev merged 2 commits from dev-dungtv-0807 into dev 2025-08-07 18:43:08 +09:00
8 changed files with 28 additions and 28 deletions

View File

@ -19,6 +19,13 @@
border-color: currentColor; border-color: currentColor;
// border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color"); // border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
&:hover {
border-color: map-deep-get($config, #{$theme}, "v-input-fieldset-hover-color" ) !important;
}
&:has(.v-input--is-focused){
border-width: 2px;
}
&.datepicker-large { &.datepicker-large {
height: 40px; height: 40px;
} }

View File

@ -111,10 +111,10 @@ $config: (
tui-grid-border-vertical-color: #FFFFFF0F, tui-grid-border-vertical-color: #FFFFFF0F,
tui-grid-cell-backgroundColor: #212224, tui-grid-cell-backgroundColor: #212224,
tui-grid-cell-color: #FFFFFFD9, tui-grid-cell-color: #FFFFFFD9,
tui-grid-cell-insert-color: #13636c, tui-grid-cell-insert-color: #2B2111,
tui-grid-cell-selected-color: #0A224F, tui-grid-cell-selected-color: #0A224F,
tui-grid-cell-modify-color: #13636c, tui-grid-cell-modify-color: #13636c,
tui-grid-cell-removed-color: #f6637b, tui-grid-cell-removed-color: #2A1215,
tui-grid-cell-disabled-color: rgb(170, 170, 170), tui-grid-cell-disabled-color: rgb(170, 170, 170),
tui-grid-cell-hover-backgroundColor: #2d4571, tui-grid-cell-hover-backgroundColor: #2d4571,
v-tabs-items-border-color: #FFFFFF0F, v-tabs-items-border-color: #FFFFFF0F,

View File

@ -426,7 +426,7 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/datepicker.scss"; // @import "@/assets/scss/datepicker.scss";
::v-deep { ::v-deep {
.tui-timepicker-row { .tui-timepicker-row {

View File

@ -9,7 +9,6 @@
@dblclick="dblClick" @dblclick="dblClick"
@mouseover="mouseoverEvent" @mouseover="mouseoverEvent"
@mouseout="mouseoutEvent" @mouseout="mouseoutEvent"
@mousedown="onMousedown"
@focusChange="focusChangeEvt" @focusChange="focusChangeEvt"
/> />
</template> </template>
@ -268,13 +267,7 @@ export default {
} }
}); });
}, },
onMousedown(evt) {
this.handleSelectedRow(evt);
},
focusChangeEvt(e) { focusChangeEvt(e) {
this.handleSelectedRow(e);
},
handleSelectedRow(e) {
// console.log('focusChangeEvt1...') // console.log('focusChangeEvt1...')
if (this.preventFocusChangeEvent(e)) { if (this.preventFocusChangeEvent(e)) {
// console.log('prevent focusChangeEvt') // console.log('prevent focusChangeEvt')

View File

@ -190,7 +190,7 @@ export default {
// } // }
// } // }
}, },
{ header: '비고', name: 'rmrk', align: 'center' }, { header: '비고', name: 'rmrk', align: 'left' },
]; ];
this.setGridColumn({ this.setGridColumn({

View File

@ -270,7 +270,7 @@ export default {
{ {
header: 'Data 구분', header: 'Data 구분',
name: 'addInfoDataKind', name: 'addInfoDataKind',
align: 'center', align: 'left',
formatter({ value }) { formatter({ value }) {
let retVal = ''; let retVal = '';
const newValue = addInfoDataKindList.filter( const newValue = addInfoDataKindList.filter(

View File

@ -62,20 +62,20 @@
<v-card-title class="pa-0">설비별 효율지표 Trend</v-card-title> <v-card-title class="pa-0">설비별 효율지표 Trend</v-card-title>
</v-col> </v-col>
<v-col :cols="4" class="d-flex justify-space-end" > <v-col :cols="4" class="d-flex justify-space-end" >
<component <component
class="text-right mr-2" class="text-right mr-2"
ref="EqpmSelectPop" ref="EqpmSelectPop"
label="" label=""
placeholder="설비..." placeholder="설비..."
is="EqpmSelectPop" is="EqpmSelectPop"
valueNm="eqpmId" valueNm="eqpmId"
:textCols="12" :textCols="12"
:parentPrgmId="myPrgmId" :parentPrgmId="myPrgmId"
:eqpmGrpDisabled="true" :eqpmGrpDisabled="true"
:fabDisabled="true" :fabDisabled="true"
:iconShow="false" :iconShow="false"
:isMulti="true" :isMulti="true"
/> />
<a-button @click="getEqpmData()" type="primary" >조회</a-button> <a-button @click="getEqpmData()" type="primary" >조회</a-button>
</v-col> </v-col>
</v-row> </v-row>

View File

@ -289,8 +289,8 @@ const Utility = () => {
header: { header: {
height: 28, height: 28,
}, },
rowHeight: 29, rowHeight: 37,
minRowHeight: 29, minRowHeight: 37,
columnOptions: { columnOptions: {
resizable: true, resizable: true,
minWidth: 100, minWidth: 100,