Merge pull request 'Update screen 7, 33, 16' (#74) from dev-trungvq7-0729 into dev

Reviewed-on: #74
This commit is contained in:
dev
2025-08-18 17:57:22 +09:00
3 changed files with 155 additions and 5 deletions

View File

@ -60,17 +60,23 @@
</v-col>
</v-row>
<v-row ref="contents" class="pt-3">
<v-col :cols="12" style="height: 100%">
<v-col :cols="12" >
<v-card class="pb-5">
<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" style="height:calc(100% - 76px)">
<div class="px-4" >
<div ref="gridParent" class="w100 h100 enrg-effc">
<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
: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>
</v-card>
</v-col>
</v-row>
@ -92,6 +98,7 @@ import Datepicker from '~/components/common/Datepicker';
import EqpmSelectPop from '~/components/common/modal/EqpmSelectPop';
import EnrgEffcEqpmDetailPop from '~/components/common/modal/EnrgEffcEqpmDetailPop';
import EnrgEffcGdIdxDetPop from '~/components/common/modal/EnrgEffcGdIdxDetPop';
import pagination from '~/components/common/Pagination';
let myTitle;
let myPrgmId;
@ -124,6 +131,7 @@ export default {
EnrgEffcEqpmDetailPop,
EqpmSelectPop,
EnrgEffcGdIdxDetPop,
pagination
},
data() {
return {
@ -149,7 +157,12 @@ export default {
eqpmGrpFlag: false,
eqpmGdIdxFlag: false,
fabFlag: false,
itemsPerPage: 10,
itemsPerPageArray: [10, 20, 30],
limit: 20,
page: 1,
routeData: {},
totalCount: 0,
};
},
computed: {
@ -377,6 +390,7 @@ export default {
resKey: 'eqpmKindCodeLists',
sendParam: {},
});
if (res.length > 0) {
this.selectValueList01 = await res.map(item => {
return {
@ -680,9 +694,29 @@ export default {
fabId: this.selectValue02,
eqpmKindId: this.selectValue01,
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({
gridKey: this.gridName,
value: res,
@ -722,6 +756,12 @@ export default {
});
}
},
changeGrid: async function (pageNum, limit) {
this.page = pageNum;
this.limit = limit;
this.search();
},
},
};