Update screen 7, 33, 16 #74

Merged
dev merged 2 commits from dev-trungvq7-0729 into dev 2025-08-18 17:57:24 +09:00
3 changed files with 155 additions and 5 deletions

View File

@ -89,9 +89,57 @@
} }
.tui-grid-cell { .tui-grid-cell {
&:last-child { input[type=checkbox] {
input[type=checkbox] { margin-top: 8px;
margin-top: 8px; appearance: none;
-webkit-appearance: none;
width: 16px;
height: 16px;
border: 1px solid;
border-radius: 2px;
cursor: pointer;
position: relative;
&:checked {
&::after {
content: "";
position: absolute;
left: 5px;
top: 1px;
width: 5px;
height: 9px;
border: solid;
border-width: 0 2px 2px 0;
transform: rotate(45deg);
}
}
}
}
}
.tui-grid-layer-editing {
input[type=checkbox] {
margin-top: 8px;
appearance: none;
-webkit-appearance: none;
width: 16px;
height: 16px;
border: 1px solid;
border-radius: 2px;
cursor: pointer;
position: relative;
&:checked {
&::after {
content: "";
position: absolute;
left: 5px;
top: 1px;
width: 5px;
height: 9px;
border: solid;
border-width: 0 2px 2px 0;
transform: rotate(45deg);
} }
} }
} }
@ -199,6 +247,35 @@
#{$theme}, #{$theme},
"tui-grid-cell-borderStyle-darkmode" "tui-grid-cell-borderStyle-darkmode"
); );
input[type=checkbox] {
border-color: map-deep-get($config,
#{$theme},
"ant-checkbox-border"
);
background: map-deep-get($config,
#{$theme},
"ant-checkbox-bg"
);
&:checked {
background-color: map-deep-get($config,
#{$theme},
"ant-btn-primary-bg"
);
border-color: map-deep-get($config,
#{$theme},
"ant-btn-primary-bg"
);
&::after {
border-color: map-deep-get($config,
#{$theme},
"ant-checkbox-bg"
);
}
}
}
} }
} }
@ -649,6 +726,37 @@
&-frozen-border { &-frozen-border {
background-color: transparent; background-color: transparent;
} }
&-layer-editing {
input[type=checkbox] {
border-color: map-deep-get($config,
#{$theme},
"ant-checkbox-border"
);
background: map-deep-get($config,
#{$theme},
"ant-checkbox-bg"
);
&:checked {
background-color: map-deep-get($config,
#{$theme},
"ant-btn-primary-bg"
);
border-color: map-deep-get($config,
#{$theme},
"ant-btn-primary-bg"
);
&::after {
border-color: map-deep-get($config,
#{$theme},
"ant-checkbox-bg"
);
}
}
}
}
} }
[class*="tui-grid-tree-wrapper"] { [class*="tui-grid-tree-wrapper"] {

View File

@ -60,17 +60,23 @@
</v-col> </v-col>
</v-row> </v-row>
<v-row ref="contents" class="pt-3"> <v-row ref="contents" class="pt-3">
<v-col :cols="12" style="height: 100%"> <v-col :cols="12" >
<v-card class="pb-5"> <v-card class="pb-5">
<div class="d-flex align-center justify-space-between pa-4"> <div class="d-flex align-center justify-space-between pa-4">
<v-card-title class="pa-0">설비별 현황 리스트</v-card-title> <v-card-title class="pa-0">설비별 현황 리스트</v-card-title>
</div> </div>
<div class="px-4" style="height:calc(100% - 76px)"> <div class="px-4" >
<div ref="gridParent" class="w100 h100 enrg-effc"> <div ref="gridParent" class="w100 h100 enrg-effc">
<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" <component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
:parentPrgmId="myPrgmId" :columnClickEventFlag="true" @columnClick="columnClick" /> :parentPrgmId="myPrgmId" :columnClickEventFlag="true" @columnClick="columnClick" />
<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>
</div> </div>
</v-card> </v-card>
</v-col> </v-col>
</v-row> </v-row>
@ -92,6 +98,7 @@ import Datepicker from '~/components/common/Datepicker';
import EqpmSelectPop from '~/components/common/modal/EqpmSelectPop'; import EqpmSelectPop from '~/components/common/modal/EqpmSelectPop';
import EnrgEffcEqpmDetailPop from '~/components/common/modal/EnrgEffcEqpmDetailPop'; import EnrgEffcEqpmDetailPop from '~/components/common/modal/EnrgEffcEqpmDetailPop';
import EnrgEffcGdIdxDetPop from '~/components/common/modal/EnrgEffcGdIdxDetPop'; import EnrgEffcGdIdxDetPop from '~/components/common/modal/EnrgEffcGdIdxDetPop';
import pagination from '~/components/common/Pagination';
let myTitle; let myTitle;
let myPrgmId; let myPrgmId;
@ -124,6 +131,7 @@ export default {
EnrgEffcEqpmDetailPop, EnrgEffcEqpmDetailPop,
EqpmSelectPop, EqpmSelectPop,
EnrgEffcGdIdxDetPop, EnrgEffcGdIdxDetPop,
pagination
}, },
data() { data() {
return { return {
@ -149,7 +157,12 @@ export default {
eqpmGrpFlag: false, eqpmGrpFlag: false,
eqpmGdIdxFlag: false, eqpmGdIdxFlag: false,
fabFlag: false, fabFlag: false,
itemsPerPage: 10,
itemsPerPageArray: [10, 20, 30],
limit: 20,
page: 1,
routeData: {}, routeData: {},
totalCount: 0,
}; };
}, },
computed: { computed: {
@ -377,6 +390,7 @@ export default {
resKey: 'eqpmKindCodeLists', resKey: 'eqpmKindCodeLists',
sendParam: {}, sendParam: {},
}); });
if (res.length > 0) { if (res.length > 0) {
this.selectValueList01 = await res.map(item => { this.selectValueList01 = await res.map(item => {
return { return {
@ -680,9 +694,29 @@ export default {
fabId: this.selectValue02, fabId: this.selectValue02,
eqpmKindId: this.selectValue01, eqpmKindId: this.selectValue01,
okFg: this.selectValue06, okFg: this.selectValue06,
limit: this.limit,
page: this.page,
offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
}, },
}); });
const res2 = await this.postApiReturn({
apiKey: 'selectEnrgEffcEqpmDetlMntrPageTotal',
resKey: 'eqpmDetlDataPageTotal',
sendParam: {
eqpmId: this.selectValue04.eqpmId,
eqpmGrpId: this.selectValue03,
fromDt: this.pageData.fromDt,
toDt: this.pageData.toDt,
gdIdxId: this.selectValue05,
fabId: this.selectValue02,
eqpmKindId: this.selectValue01,
okFg: this.selectValue06,
},
});
this.totalCount = res2[0]?.totalcount;
this.setGridData({ this.setGridData({
gridKey: this.gridName, gridKey: this.gridName,
value: res, value: res,
@ -722,6 +756,12 @@ export default {
}); });
} }
}, },
changeGrid: async function (pageNum, limit) {
this.page = pageNum;
this.limit = limit;
this.search();
},
}, },
}; };

View File

@ -943,6 +943,8 @@ const INIT_URL_STATE = {
//prgmId : PRG0084 설비별 운전가이드 //prgmId : PRG0084 설비별 운전가이드
selectEqpmCodeList: 'ems/effc/EnrgEffcEqpmDetlMntrCtr/selectEqpmCodeList', selectEqpmCodeList: 'ems/effc/EnrgEffcEqpmDetlMntrCtr/selectEqpmCodeList',
selectEnrgEffcEqpmDetlMntr:'ems/effc/EnrgEffcEqpmDetlMntrCtr/selectEnrgEffcEqpmDetlMntr', selectEnrgEffcEqpmDetlMntr:'ems/effc/EnrgEffcEqpmDetlMntrCtr/selectEnrgEffcEqpmDetlMntr',
selectEnrgEffcEqpmDetlMntrPageTotal:
'ems/effc/EnrgEffcEqpmDetlMntrCtr/selectEnrgEffcEqpmDetlMntrPageTotal', // 일일검침정보
selectEqpmDetailPop: 'ems/effc/EnrgEffcEqpmDetlMntrCtr/selectEqpmDetailPop', selectEqpmDetailPop: 'ems/effc/EnrgEffcEqpmDetlMntrCtr/selectEqpmDetailPop',
selectEnrgEffcGdIdxDetPop : 'ems/effc/EnrgEffcEqpmDetlMntrCtr/selectEnrgEffcGdIdxDetPop', selectEnrgEffcGdIdxDetPop : 'ems/effc/EnrgEffcEqpmDetlMntrCtr/selectEnrgEffcGdIdxDetPop',