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

Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729

Browse Source
This commit is contained in:
dev
2025-08-20 10:18:13 +09:00
parent 7baa87df12 b82589978d
commit f0c47a132b
12 changed files with 80 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pages/comm/base/BatchLogMngPage.vue
View File

@ -441,4 +441,11 @@ const myDetail = [
rows: 3
},
];
</script>
</script>
<style lang="scss" scoped>
::v-deep{
.tui-grid-layer-state{
top: 40px !important;
}
}
</style>

21
pages/ems/base/DashboardPage.vue
View File

@ -635,15 +635,15 @@ export default {
this.setChart04Data(chart04Dat);
let chartOption2 = getLineChartOption({
xAxisData: this.$store.state.pageData[myPrgmId][this.chart_02].xAxisData,
seriesData: this.$store.state.pageData[myPrgmId][this.chart_02].seriesData,
xAxisData: this.$store.state.pageData[myPrgmId][this.chart_02].xAxis.data,
seriesData: this.$store.state.pageData[myPrgmId][this.chart_02].series,
isDarkMode: this.isDarkMode,
});
this.$store.state.pageData[myPrgmId][this.chart_02] = chartOption2
let chartOption5 = getLineChartOption({
xAxisData: this.$store.state.pageData[myPrgmId][this.chart_05].xAxisData,
seriesData: this.$store.state.pageData[myPrgmId][this.chart_05].seriesData,
xAxisData: this.$store.state.pageData[myPrgmId][this.chart_05].xAxis.data,
seriesData: this.$store.state.pageData[myPrgmId][this.chart_05].series,
isDarkMode: this.isDarkMode,
});
this.$store.state.pageData[myPrgmId][this.chart_05] = chartOption5
@ -754,7 +754,7 @@ export default {
changeGrid: async function (pageNum, limit) {
this.page = pageNum;
this.limit = limit;
await this.getGridData();
await this.getGridData(true);
},
async search() {
await new Promise((resolve) => setTimeout(resolve, 1500));
@ -766,7 +766,7 @@ export default {
await this.getTodayEfficiencyStatus();
await this.getTodayNgTopTen();
await this.getCompareEqpmTGdChart();
await this.getGridData();
await this.getGridData(false);
}
},
async gridInit() {
@ -944,8 +944,13 @@ export default {
this.loadGrid = true;
// this.getGridData();
},
async getGridData() {
this.loadGrid = false;
async getGridData(isPaging) {
// Do not hide grid when trigger paging function
if (!isPaging) {
this.loadGrid = false;
}
// Get total records of grid
const totalRes = await this.postApiReturn({
apiKey: "selectIssueGdIdxDataPageTotal",

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

@ -1028,4 +1028,4 @@ const myDetail = [
value: { '1': true, '0': false },
},
];
</script>
</script>

12
pages/ems/effc/EqpmIndMntrPage.vue
View File

@ -282,13 +282,13 @@ export default {
changeGrid: async function (pageNum, limit) {
this.page = pageNum;
this.limit = limit;
this.search();
this.getGridData(true);
},
async init() {
await this.getSelectValueList();
await this.setQueryParams();
this.gridInit();
await this.getGridData();
await this.getGridData(false);
this.initedFlag = true;
},
@ -588,8 +588,10 @@ export default {
value: columnList,
});
},
async getGridData() {
this.loadGrid = false;
async getGridData(isPaging) {
if(!isPaging) {
this.loadGrid = false;
}
this.enrgUseMainIdxDesc = [];
var apiKey = null;
var apiKey2 = null;
@ -651,7 +653,7 @@ export default {
this.makeTooltip();
},
async search() {
await this.getGridData();
await this.getGridData(false);
},
async makeTooltip() {
var gdIdxList = [

2
pages/ems/effc/TagTrndPage.vue
View File

@ -153,7 +153,7 @@
<v-card class="pb-5 px-2">
<div class="d-flex align-center justify-space-between">
<v-card-title class="d-flex align-center justify-space-between pa-5">{{
"ICHEON.HVAC.EQP_HT_CH004.UT_HT_CH201.CHI_AMP_1A_PV"
'TAG를 선택해주세요'
}}</v-card-title>
</div>
<div :ref="'chartParent' + 0" style="height: 100%; overflow: visible">