Compare commits

..

4 Commits

Author SHA1 Message Date
25d30d7926 update 2025-08-28 11:14:38 +09:00
dev
094d8a03f3 Merge pull request 'Update 2708' (#100) from dev-trungvq7-0729 into dev
Reviewed-on: #100
2025-08-27 17:58:46 +09:00
dev
df64326d0d Merge pull request 'update code' (#99) from dev-luannv24-fixbug into dev
Reviewed-on: #99
2025-08-27 17:55:16 +09:00
dev
6dcaf56eee Update 2708 2025-08-27 17:53:09 +09:00
2 changed files with 9 additions and 16 deletions

View File

@ -23,7 +23,7 @@
<span class="custom-title-4">{{ option.modalTitle }}</span>
<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
</v-card-title>
<div class="pa-6 pt-0">
<div class="pa-6 pt-0 pb-3">
<v-row align="center">
<v-col :cols="5">
<component :is="'SelectBox'" ref="SelectBox1" :labelCols="12" :textCols="12"
@ -43,7 +43,7 @@
물리량명
</label>
</v-col>
<v-col :cols="9"> <v-text-field append-icon="" class="v-input__custom" outlined
<v-col :cols="10" class="pr-2"> <v-text-field append-icon="" class="v-input__custom" outlined
:hide-details="true" v-model="searchWord" @keyup.enter="search"><template
v-slot:append>
<!-- Custom SVG icon -->
@ -51,8 +51,7 @@
</template></v-text-field></v-col>
<v-spacer></v-spacer>
<v-col cols="3" class="text-right">
<v-col cols="2" class="text-right">
<a-button icon="search" type="primary" @click="search()"
class="search-button">조회</a-button>
@ -63,9 +62,9 @@
</div>
<!-- <div :style="'height: calc(50vh)'"> -->
<div :style="'height: 429px;'">
<div :style="{ height: 'calc(100% - 60px)' }">
<!-- <div :style="{ height: 'calc(100% - 213px)' }"> -->
<div ref="modalGridParent" class="h100 px-6 py-4">
<div ref="modalGridParent" class="px-6 py-4">
<component :is="loadGrid && dialog ? 'Grid' : null" :gridName="gridName"
:dataPath="searchParam.modalDataEqpmBaseInfoPop.eqpmBaseInfoPop"
:parentPrgmId="parentPrgmId" @getRowsData="getRowData" @dblClick="setUpdate($event)" />

View File

@ -102,7 +102,7 @@ export default {
this.gridInit();
},
gridInit() {
const gridHeight = this.$refs.gridParent.offsetHeight;
const gridHeight = this.$refs.gridParent.offsetHeight - 37;
const myOptions = {
columnOptions: {
@ -113,8 +113,8 @@ export default {
header: {
height: 28,
},
rowHeight: 38,
minRowHeight: 38,
rowHeight: 37,
minRowHeight: 37,
selectionUnit: 'row',
editingEvent: 'click',
};
@ -441,14 +441,8 @@ export default {
</script>
<style lang="scss" scoped >
::v-deep {
.tui-grid-layer-state {
top: 40px !important;
}
.tui-grid-cell-content-editor {
position: relative;
height: 39px !important;
top: 39px !important;
height: 37px !important;
}
}