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

Update pagination UI + Fix bugs gauge chart line chart + Fix bugs s14

Browse Source
This commit is contained in:
Michael
2025-08-12 17:07:52 +09:00
parent ffdc56b8f1
commit 84c7e61254
12 changed files with 57 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1196,7 +1196,8 @@ export default {
show: false,
},
left: "22%",
radius: ["50%", "80%"], // Bigger inner and outer radius
bottom: "23",
radius: ["67%", "97%"], // Bigger inner and outer radius
center: ["60%", "50%"], // Shift chart slightly right to make room for legend
itemStyle: {
borderColor: "#fff", // Color of the gap
@ -1272,7 +1273,10 @@ export default {
top: "middle",
type: "scroll",
orient: "vertical",
left: "left",
left: "20",
icon: 'rect',
itemWidth: 15, // Width of the legend icon
itemHeight: 15,
textStyle: {
color: this.isDarkMode ? "#fff" : "#333333",
},

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

@ -63,7 +63,7 @@
<v-tabs-items v-model="tab" style="height: calc(100% - 65px);" class="pt-6 py-2">
<v-tab-item v-for="(item, idx) in items" :key="item.id">
<component v-if="item.id == 'readPlcBaseInfoTab'" :is="'Form'" :parentPrgmId="myPrgmId"
:detailList="detailList" :bindingData="gridName"
:detailList="f" :bindingData="gridName"
@gridEditingFinish="gridEditingFinish" />
<ReadPlcAddInfoTab v-if="item.id == 'readPlcAddInfoTab'" :parentPrgmId="myPrgmId"
:innerTabGridInfo="{ tab, idx }" />

24
pages/ems/base/EnrgResourceCenterMngPage.vue
View File

@ -835,7 +835,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-2 pr-4',
class: 'py-3 pr-4',
required: false,
placeholder: '시스템 자동입력',
},
@ -848,7 +848,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-2 pl-4',
class: 'py-3 pl-4',
required: true,
},
{
@ -860,7 +860,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-2 pr-4',
class: 'py-3 pr-4 mt-2',
list: 'ercKindList',
itemText: 'commCdNm',
itemValue: 'commCd',
@ -875,7 +875,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-2 pl-4',
class: 'py-3 pl-4 mt-2',
list: 'readObjList',
itemText: 'readObjNm',
itemValue: 'readObjId',
@ -890,7 +890,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-2 pr-4',
class: 'py-3 pr-4 mt-2',
list: 'chrgKindList',
itemText: 'commCdNm',
itemValue: 'commCd',
@ -905,7 +905,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-2 pl-4',
class: 'py-3 pl-4 mt-2',
},
{
type: 'InputText',
@ -916,7 +916,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-2 pr-4',
class: 'py-3 pr-4 mt-2',
},
{
@ -928,7 +928,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-2 pl-4',
class: 'py-3 pl-4 mt-2',
list: 'blocMstrList',
itemText: 'blocNm',
itemValue: 'blocId',
@ -944,7 +944,7 @@ const myDetail = [
textCols: 12,
iconShow: true,
// class: 'py-2',
class: 'pb-0 mb-0 pr-4',
class: 'pb-0 mb-0 pr-4 mt-2',
disableContent: true,
},
{
@ -956,7 +956,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
class: 'py-2 pl-4',
class: 'pb-0 mb-0 pl-4 mt-2',
},
{
type: 'InputText',
@ -981,7 +981,7 @@ const myDetail = [
disabled: false,
cols: 6,
iconShow: true,
class: 'py-2 pr-4',
class: 'py-3 pr-4 mt-2',
value: { '1': true, '0': false },
},
{
@ -991,7 +991,7 @@ const myDetail = [
disabled: false,
cols: 6,
iconShow: true,
class: 'py-2 pl-4',
class: 'py-3 pl-4 mt-2',
value: { '1': true, '0': false },
required: true,
},

13
pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
View File

@ -154,14 +154,15 @@
</v-row>
<v-row class="pa-1" style="height: 52%; width: 100%">
<v-card class="pa-1" style="height: 100%; width: 100%; overflow: hidden">
<div style="height: 25%">
<v-card-title class="d-flex align-center justify-space-between pa-5">
<div style="height: 15%">
<v-card-title class="d-flex align-center justify-space-between pl-3">
<span class="tit ft-size_20 ft-weight_600">가이드 알람정보</span>
</v-card-title>
</div>
<div
ref="gridParent01"
style="height: 75%; overflow: hidden; margin-top: 15px"
class="pl-3 mt-5"
style="height: 75%; overflow: hidden;"
>
<component
:ref="gridName01"
@ -177,12 +178,12 @@
<v-row style="height: 100%">
<v-col :cols="5" class="">
<v-card class="pa-1" style="height: 100%; width: 100%">
<div style="height: 25%">
<v-card-title class="d-flex align-center justify-space-between pa-5">
<div style="height: 15%">
<v-card-title class="d-flex align-center justify-space-between pl-3">
<span class="tit ft-size_20 ft-weight_600">설비 상세 정보</span>
</v-card-title>
</div>
<div ref="gridParent02" style="height: 75%">
<div ref="gridParent02" style="height: 75%" class="pl-3 mt-5">
<component
:ref="gridName02"
:is="loadGrid02 ? 'Grid' : null"

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

@ -47,13 +47,14 @@
<v-row ref="contents" style="overflow: auto">
<v-col>
<div v-for="(value, key, index) in contentData" :key="'key1_' + index">
<v-card-title class="d-flex align-center justify-space-between pa-3">
<span class="tit ft-size_20 ft-weight_600">{{ value.eqpmGrpNm }}</span>
</v-card-title>
<v-card style="background: none">
<v-card-title class="d-flex align-center justify-space-between pa-3">
<span class="tit ft-size_20 ft-weight_600">{{ value.eqpmGrpNm }}</span>
</v-card-title>
</v-card>
<v-row>
<v-col :cols="3" v-for="(item, i) in value.chartData" :key="'key2_' + i">
<v-card>
<div
class="v-box"
style="height: 330px; position: relative"
@ -125,8 +126,7 @@
</div>
</v-col>
</div>
</v-card>
</v-card>
</v-col>
</v-row>
</div>

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

@ -105,8 +105,7 @@
:gridName="gridName"
:parentPrgmId="myPrgmId"
/>
<div class="pagination-wrapper">
<div v-if="loadGrid && totalCount > 0" class="pagination-wrapper">
<pagination
id="pagination"
:total-count="totalCount"
@ -201,7 +200,7 @@ export default {
gridName: "grid01",
enrgUseMainIdxDesc: [],
itemsPerPageArray: [10, 20, 30],
itemsPerPageArray: [10, 20, 50],
limit: 10,
page: 1,
totalCount: 0,