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

Merge pull request 'Update screen 7, 13' (#79) from dev-trungvq7-0729 into dev

Browse Source 
Reviewed-on: #79
This commit is contained in:
dev
2025-08-20 11:03:51 +09:00
parent b82589978d f0c47a132b
commit b7f83002c1
6 changed files with 198 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
assets/scss/common/grid.scss
View File

@ -145,6 +145,44 @@
}
}
.tui-grid-editor-select-box-layer {
min-width: 116px !important;
.tui-select-box-input {
border-radius: 6px;
}
.tui-select-box-dropdown {
margin-top: 1px;
border-radius: 4px;
padding: 4px;
box-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.2), 0px 0px 0px 0px rgba(0, 0, 0, 0.14), 0px 0px 0px 0px rgba(0, 0, 0, 0.12);
.tui-select-box-item {
margin-bottom: 4px;
position: relative;
&:before {
bottom: 0;
content: '';
left: 0;
opacity: 0;
pointer-events: none;
position: absolute;
right: 0;
top: 0
}
&:hover {
&::before {
opacity: 0.04
}
}
}
}
}
.treeGrid {
.tui-grid {
&-header-area {
@ -756,6 +794,142 @@
}
}
}
select {
&.selectbox {
background: map-deep-get($config,
#{$theme},
"tui-grid-cell-backgroundColor"
);
border-color:map-deep-get($config,
#{$theme},
"v-input-fieldset-color"
);
color: map-deep-get($config,
#{$theme},
"tui-grid-cell-color"
);
.calendarOption {
background: map-deep-get($config,
#{$theme},
"tui-grid-cell-backgroundColor"
);
border-color:map-deep-get($config,
#{$theme},
"v-input-fieldset-color"
);
color: map-deep-get($config,
#{$theme},
"tui-grid-cell-color"
);
&:hover {
background: #d9d9d9;
color: map-deep-get($config,
#{$theme},
"tui-grid-cell-color"
);
}
&:checked {
background: #E6F4FF;
color: map-deep-get($config,
#{$theme},
"tui-grid-cell-color"
);
}
}
}
}
}
}
.tui-grid-editor-select-box-layer {
.tui-select-box-input {
background: map-deep-get($config,
#{$theme},
"tui-grid-cell-backgroundColor"
);
border-color:map-deep-get($config,
#{$theme},
"v-input-fieldset-color"
);
color: map-deep-get($config,
#{$theme},
"tui-grid-cell-color"
);
}
.tui-select-box-dropdown {
background-color: map-deep-get($config,
#{$theme},
"tui-datepicker-backgroundColor"
);
border: 1px solid map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
color: map-deep-get($config, #{$theme}, "tui-datepicker-calendar-color");
.tui-select-box-item {
color: map-deep-get($config, #{$theme}, "tui-datepicker-calendar-color");
&:before {
opacity: map-deep-get($config,
#{$theme},
"selected-bg-opacity"
);
}
}
.tui-select-box-highlight {
background:none !important;
&:before {
background: map-deep-get($config,
#{$theme},
"tui-grid-cell-color"
);
opacity: map-deep-get($config,
#{$theme},
"highlighted-bg-opacity"
);
}
}
.tui-select-box-selected {
background: map-deep-get($config,
#{$theme},
"v-treeview-node-label-active-bg"
);
color: map-deep-get($config,
#{$theme},
"tui-grid-cell-color"
);
&:before {
// opacity: map-deep-get($config,
// #{$theme},
// "selected-bg-opacity"
// );
background: map-deep-get($config,
#{$theme},
"ant-btn-primary-bg"
) !important;
opacity: map-deep-get($config,
#{$theme},
"selected-bg-opacity"
) !important;
}
}
}
}

4
assets/scss/var.scss
View File

@ -186,6 +186,8 @@ $config: (
paging-text: #FFFFFFD9,
paging-disable: #FFFFFF40,
icon-datepicker-color: #FFFFFF73,
selected-bg-opacity: 0.32,
highlighted-bg-opacity: 0.08,
ant-checkbox-disabled-bg: #FFFFFF14,
ant-checkbox-disabled-border: #424242,
),
@ -337,6 +339,8 @@ $config: (
paging-text: #000000E0,
paging-disable: #00000040,
icon-datepicker-color: #00000073,
selected-bg-opacity: 0.16,
highlighted-bg-opacity: 0.04,
ant-checkbox-disabled-bg: #0000000A,
ant-checkbox-disabled-border: #D9D9D9,
),

26
pages/comm/base/CalendarMngPage.vue
View File

@ -261,18 +261,18 @@ export default {
formatter({ value }) {
return value == 1 ? '휴일' : '평일';
},
editor: {
type: CustomSelectBoxEditor,
},
// editor: {
// type: 'select',
// options: {
// listItems: [
// { text: '휴일', value: '1' },
// { text: '평일', value: '0' },
// ],
// },
// type: CustomSelectBoxEditor,
// },
editor: {
type: 'select',
options: {
listItems: [
{ text: '휴일', value: '1' },
{ text: '평일', value: '0' },
],
},
},
},
{ header: '휴일명', name: 'hldyNm', editor: 'text' },
];
@ -482,6 +482,8 @@ const defaultData = {
height: 100%;
padding: 0;
margin: 0;
border: 1px solid;
border-radius: 6px;
}
select.selectbox {
@ -510,10 +512,8 @@ const defaultData = {
/* 네이티브 외형 감추기 */
-moz-appearance: auto;
appearance: auto;
background: #fff;
border: 1px solid #d9d9d9;
border: 1px solid;
border-radius: 6px;
color: rgba(0,0,0,0.87843);
}
.tui-grid-layer-editing {

2
pages/ems/base/GdIdxMngPage.vue
View File

@ -41,7 +41,7 @@
<div class="h100 px-4" style="height:calc(100% - 70px)">
<div ref="gridParent" style="height: 26%">
<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
:parentPrgmId="myPrgmId" @getRowsData="getRowData" :dataPath="dataPathExample" />
:parentPrgmId="myPrgmId" @getRowsData="getRowData" />
</div>
<div class="d-flex py-4 mt-4">
<component :is="'Form'" :parentPrgmId="myPrgmId" :detailList="detailList"

56
pages/ems/base/GdStndMngPage.vue
View File

@ -210,62 +210,6 @@ export default {
selectValueList02: [],
selectValue03: null,
selectValueList03: [],
// dataPathExample: {
// "rowGrid": {
// data: [
// {
// eqpmId: 'EQ001',
// originEqpmId: 'ORIG001',
// eqpmNm: '냉각기 A',
// careStndVal: 75,
// warnStndVal: 90,
// },
// {
// eqpmId: 'EQ002',
// originEqpmId: 'ORIG002',
// eqpmNm: '펌프 B',
// careStndVal: 60,
// warnStndVal: 80,
// },
// {
// eqpmId: 'EQ003',
// originEqpmId: 'ORIG003',
// eqpmNm: '모터 C',
// careStndVal: 50,
// warnStndVal: 70,
// },
// {
// eqpmId: 'EQ004',
// originEqpmId: 'ORIG004',
// eqpmNm: '밸브 D',
// careStndVal: 65,
// warnStndVal: 85,
// },
// {
// eqpmId: 'EQ005',
// originEqpmId: 'ORIG005',
// eqpmNm: '컨트롤러 E',
// careStndVal: 55,
// warnStndVal: 75,
// },
// ],
// column: [
// { header: '설비', name: 'eqpmId', align: 'left' },
// {
// header: 'origin설비',
// name: 'originEqpmId',
// align: 'center',
// hidden: true,
// },
// { header: '설비명', name: 'eqpmNm', align: 'left' },
// { header: '주의기준', name: 'careStndVal', align: 'right' },
// { header: '심각기준', name: 'warnStndVal', align: 'right' },
// ]
// }
// }
};
},
computed: {

9
pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue
View File

@ -60,20 +60,21 @@
</v-col>
</v-row>
<v-row ref="contents" class="pt-3">
<v-col :cols="12" >
<v-card class="pb-5">
<v-col :cols="12" style="height: 100%">
<v-card class="pb-3">
<div class="d-flex align-center justify-space-between pa-4">
<v-card-title class="pa-0">설비별 현황 리스트</v-card-title>
</div>
<div class="px-4" >
<div class="px-4" style="height:calc(100% - 120px)">
<div ref="gridParent" class="w100 h100 enrg-effc">
<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
:parentPrgmId="myPrgmId" :columnClickEventFlag="true" @columnClick="columnClick" />
</div>
<div class="d-flex align-center justify-center pa-5 pb-0" v-if="loadGrid && totalCount > 0">
<pagination id="pagination" :total-count="totalCount" :page-num="page" :limit="limit"
@loadData="changeGrid" />
</div>
</div>
</div>