gitadmin/sk_fems_ui
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'fixbug' (#52) from dev-luannv24-fixbug1 into dev

Browse Source 
Reviewed-on: #52
This commit is contained in:
dev
2025-08-11 11:25:42 +09:00
parent 1ece377457 ecfbeb3afa
commit d22b09cc47
10 changed files with 77 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/scss/common/button.scss
View File

@ -140,6 +140,7 @@
&.ant-btn-popup-default {
background:map-deep-get($config, #{$theme}, "ant-btn-popup-bg");
color:map-deep-get($config, #{$theme}, "ant-btn-popup-color");
border: 1px solid map-deep-get($config, #{$theme}, "ant-btn-popup-border");
}
&.ant-btn-danger {

2
assets/scss/var.scss
View File

@ -181,6 +181,7 @@ $config: (
ant-checkbox-border: #424242,
ant-btn-popup-bg: #212224,
ant-btn-popup-color: #FFFFFFD9,
ant-btn-popup-border: #424242,
),
light: (w-g5: $--color-gray_555,
g5-w: $--color-white,
@ -325,5 +326,6 @@ $config: (
ant-checkbox-border: #D9D9D9,
ant-btn-popup-bg: #FFFFFF,
ant-btn-popup-color: #000000E0,
ant-btn-popup-border: #D9D9D9,
),
);

8
components/common/CheckBox.vue
View File

@ -1,14 +1,12 @@
<template>
<v-row class="search-box" align="center" no-gutters>
<v-col v-if="label" :cols="labelCols">
<v-col v-if="label" :cols="labelCols" >
<label for="" class="search-box-label">
<v-icon v-if="iconShow" small :class="['mr-1', required ? 'icon-orange' : 'icon-blue']">$icoBulletPoint</v-icon>
{{ label }}
</label>
</v-col>
<v-col :cols="label ? textCols : ''">
<a-checkbox v-model="chkValue" :disabled="disabledFlag" :readonly="readonly || false"
:required="required || false" @change="modifyValue">
</a-checkbox>
@ -63,6 +61,10 @@ export default {
require: false,
default: true
},
labelClass: {
type: String,
require: false,
},
},
data() {
return {

2
components/common/modal/ChangeUserPswdPopPage.vue
View File

@ -75,7 +75,7 @@
<v-card-actions class="pb-4">
<v-spacer></v-spacer>
<!-- <v-btn color="primary" dark @click="setUpdate()">확인</v-btn> -->
<div class="pr-3">
<div class="d-flex" style="gap: 8px">
<a-button @click="close()" class="ant-btn-popup-default">닫기</a-button>
<a-button type="primary" @click="setUpdate()" class="v-btn-add-text">
확인

11
components/pages/ems/EccInfo/EccIaoTab.vue
View File

@ -11,7 +11,7 @@
:btnActionsFnc="btnActions"
/>
</div>
<div ref="gridParent" >
<div ref="gridParent" style="height: calc(100vh - 700px);">
<component
:ref="gridName"
:is="loadGrid ? 'Grid' : null"
@ -21,7 +21,7 @@
:innerTabGridInfo="innerTabGridInfo"
/>
</div>
<div>
<div style="height: 60vh;" class="mt-5">
<component
:is="'Form'"
:bindingData="gridName"
@ -503,3 +503,10 @@ const myDetail = [
},
];
</script>
<style lang="scss" scoped>
::v-deep{
.tui-grid-layer-state{
top: 40px !important;
}
}
</style>

20
components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<div
class="d-flex justify-space-between"
class="d-flex justify-space-between mb-3 pr-4"
style="height: 45px;"
>
<span class="txt custom-subtitle-tab">검침 대상 추가 정보</span>
@ -102,7 +102,7 @@ export default {
this.gridInit();
},
gridInit() {
const gridHeight = this.$refs.gridParent.offsetHeight - 30;
const gridHeight = this.$refs.gridParent.offsetHeight - 31;
const myOptions = {
columnOptions: {
@ -113,8 +113,8 @@ export default {
header: {
height: 28,
},
rowHeight: 29,
minRowHeight: 29,
rowHeight: 36,
minRowHeight: 36,
selectionUnit: 'row',
editingEvent: 'click',
};
@ -440,3 +440,15 @@ export default {
},
};
</script>
<style lang="scss" scoped >
::v-deep {
.tui-grid-layer-state {
top: 40px !important;
}
.tui-grid-cell-content-editor {
height: 36px !important;
}
}
</style>

12
pages/comm/auth/RoleMngPage.vue
View File

@ -432,7 +432,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-2 pr-4',
class: 'py-2 pr-4 mt-2',
value: { '1': true, '0': false },
required: true,
},
@ -445,7 +445,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-2 pl-4',
class: 'py-2 pl-4 mt-2',
},
// {
// type: "InputText",
@ -464,7 +464,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-2 pr-4',
class: 'py-2 pr-4 mt-2',
placeholder: '시스템 자동입력',
},
{
@ -476,7 +476,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-2 pl-4',
class: 'py-2 pl-4 mt-2',
placeholder: '시스템 자동입력',
},
{
@ -488,7 +488,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-2 pr-4',
class: 'py-2 pr-4 mt-2',
placeholder: '시스템 자동입력',
},
{
@ -500,7 +500,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-2 pl-4',
class: 'py-2 pl-4 mt-2',
placeholder: '시스템 자동입력',
},
];

5
pages/ems/base/AddInfoMngPage.vue
View File

@ -1,5 +1,6 @@
<template>
<div ref="mainDiv" class="l-layout">
<CommonPageTitle/>
<v-row ref="searchFilter">
<v-col :cols="12">
<v-card class="searchFilter">
@ -287,7 +288,7 @@ export default {
header: 'Data 형식',
name: 'addInfoDataKind',
minWidth: 85,
align: 'center',
align: 'left',
formatter({ value }) {
let retVal = '';
const newValue = _this.pageData.addInfoDataKindList.filter(
@ -304,7 +305,7 @@ export default {
header: '사용여부',
name: 'useFg',
minWidth: 85,
align: 'center',
align: 'left',
formatter({ value }) {
let retVal = '';
value = value === true ? '1' : '0';

28
pages/ems/base/EnrgCostCenterMngPage.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="l-layout">
<CommonPageTitle/>
<v-row ref="searchFilter">
<v-col :cols="12">
<v-card class="searchFilter">
@ -12,6 +13,7 @@
dataKey="searchLocKind"
:sendParam="{ commGrpCd: 'EM_LOC_KIND', useFg: '1' }"
:addAll="true"
customClass="select-large"
/>
</v-col>
<v-col :cols="2.5">
@ -22,6 +24,7 @@
dataKey="searchEccKind"
:sendParam="{ commGrpCd: 'EM_ECC_KIND', useFg: '1' }"
:addAll="true"
customClass="select-large"
/>
</v-col>
<!-- 사업장 -->
@ -42,6 +45,7 @@
dataKey="useFg"
:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
:addAll="true"
customClass="select-large"
/>
</v-col>
<v-col :cols="2.5">
@ -52,6 +56,7 @@
:labelCols="12"
:textCols="12"
:searchOption="true"
customClass="input-large"
/>
</v-col>
<v-col class="text-right">
@ -64,6 +69,7 @@
:is="'SelectBlocMstr'"
ref="SelectBlocMstr"
:parentPrgmId="myPrgmId"
customClass="select-large"
/>
</div>
</v-row>
@ -99,7 +105,7 @@
</v-col>
<v-col :cols="7" style="min-height:75vh;">
<v-card class="pb-5">
<v-card-title class="custom-title-4" style="min-height:76px;"
<v-card-title class="custom-title-4" style="min-height:65px;"
>공정 상세
</v-card-title>
<div class="px-5" style="height:calc(100% - 76px)">
@ -471,7 +477,7 @@ export default {
header: '사용 여부',
name: 'useFg',
width: gridWidth * 0.18,
align: 'center',
align: 'left',
formatter({ value }) {
value = value === true ? '1' : '0';
const newValue = _this.pageData.useFgList.filter(
@ -921,7 +927,7 @@ const myDetail = [
cols: 6,
labelCols: 12,
textCols: 12,
class: 'pb-0 mb-0 pr-4',
class: 'pb-0 mb-0 pr-4 mt-2',
disableContent: true,
},
{
@ -932,7 +938,7 @@ const myDetail = [
cols: 6,
labelCols: 12,
textCols: 12,
class: 'py-2 mb-0 pb-0 pl-4',
class: 'py-2 mb-0 pb-0 pl-4 mt-2',
list: 'locKindList',
itemText: 'commCdNm',
itemValue: 'commCd',
@ -944,13 +950,13 @@ const myDetail = [
valueNm: 'upEccNm',
readonly: true,
cols: 6,
class: 'py-2 pr-4',
class: 'py-2 pr-4 mt-2',
},
{
// 공백 처리
type: 'Label',
cols: 6,
class: 'py-2 pl-4',
class: 'py-2 pl-4 mt-2',
disabled: false,
labelCols: 12,
textCols: 12,
@ -964,7 +970,7 @@ const myDetail = [
cols: 6,
labelCols: 12,
textCols: 12,
class: 'py-2 pr-4',
class: 'py-2 pr-4 mt-2',
list: 'eccKindList',
itemText: 'commCdNm',
itemValue: 'commCd',
@ -979,7 +985,7 @@ const myDetail = [
cols: 6,
labelCols: 12,
textCols: 12,
class: 'py-2 pl-4',
class: 'py-2 pl-4 mt-2',
inputType: 'number',
iconShow: true
// onkeydown : "if(this.value > 100) this.value = 100;if(this.value < 0) this.value = 0;if(this.value == '') this.value = 0;"
@ -992,7 +998,7 @@ const myDetail = [
cols: 6,
labelCols: 12,
textCols: 12,
class: 'py-2 pr-4',
class: 'py-2 pr-4 mt-2',
list: 'blocIdList',
itemText: 'blocNm',
itemValue: 'blocId',
@ -1006,7 +1012,7 @@ const myDetail = [
cols: 6,
labelCols: 12,
textCols: 12,
class: 'py-2 pl-4',
class: 'py-2 pl-4 mt-2',
value: { '1': true, '0': false },
iconShow: true,
required: true,
@ -1017,7 +1023,7 @@ const myDetail = [
valueNm: 'eccFg',
disabled: false,
cols: 6,
class: 'py-2 pr-4',
class: 'py-2 pr-4 mt-2',
iconShow: true,
value: { '1': true, '0': false },
},

23
pages/ems/base/ReadObjectMngPage.vue
View File

@ -50,7 +50,7 @@
<v-col :cols="5" class="h100">
<v-card class="pb-5">
<div class="d-flex align-center justify-space-between pa-5">
<v-card-title class="pa-0 custom-title-4-new"
<v-card-title class="pa-0 custom-title-4"
>검침 대상 정보</v-card-title
>
<Buttons
@ -75,7 +75,7 @@
</v-col>
<v-col :cols="7" class="h100">
<v-card class="pb-5">
<v-card-title class="custom-title-4-new" style="min-height:76px;"
<v-card-title class="custom-title-4-new" style="min-height:65px;"
>검침대상 상세
</v-card-title>
<div class="px-5" style="height:calc(100% - 76px)">
@ -315,7 +315,7 @@ export default {
header: '검침 대상 ID',
name: 'readObjId',
width: 130,
align: 'center',
align: 'left',
},
{
header: '검침 대상 명',
@ -385,7 +385,7 @@ export default {
{
header: '사용여부',
name: 'useFg',
align: 'center',
align: 'left',
width: 100,
formatter({ value }) {
value = value === true ? '1' : '0';
@ -854,6 +854,17 @@ const myDetail = [
},
];
</script>
<style lang="scss">
<style lang="scss" scoped>
@import '@/assets/scss/common.scss';
</style>
::v-deep {
.tui-grid-layer-state {
top: 40px !important;
}
.tui-grid-layer-selection,
.tui-grid-cell-content-editor{
height: 36px !important;
}
}
</style>