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

Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv44-0804

Browse Source
This commit is contained in:
Tran Van Dung/(Tran Van Dung)/현장대리인/SK
2025-08-04 15:03:03 +07:00
parent 7bca077859 195c48ff25
commit a7968774c3
9 changed files with 903 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
components/common/modal/ElecPowChrgPop.vue
View File

@ -58,7 +58,7 @@
<div class="pa-5">
<!-- <v-text-field label="위치정보 선택"></v-text-field> -->
<v-row align="center" no-gutters>
<v-col :cols="label ? 3 : ''">
<v-col :cols="label ? 3 : ''" class="pr-3" >
<component
:is="'selectCodeList'"
:parentPrgmId="parentPrgmId"
@ -66,41 +66,66 @@
dataKey="searchElecContKind"
:sendParam="{ commGrpCd: 'EM_CONT', useFg: '1' }"
:addAll="true"
:customClass="'select-large'"
/>
</v-col>
<v-col :cols="label ? 3 : ''">
<v-col :cols="label ? 3 : ''" class="pr-3" >
<component
:is="'selectCodeList'"
:parentPrgmId="parentPrgmId"
:label="'전압구분'"
dataKey="searchVoltKind"
:sendParam="{ commGrpCd: 'EM_VOLT_KIND', useFg: '1' }"
:customClass="'select-large'"
:addAll="true"
/>
</v-col>
<v-col :cols="label ? 3 : ''">
<v-col :cols="label ? 3 : ''" class="pr-3" >
<component
:is="'selectCodeList'"
:parentPrgmId="parentPrgmId"
:label="'전압구분'"
dataKey="searchOptKind"
:sendParam="{ commGrpCd: 'EM_VOLT_OPT', useFg: '1' }"
:customClass="'select-large'"
:addAll="true"
/>
</v-col>
<v-col cols="3" class="text-right">
<v-btn
<div style="height: 25px"></div>
<!-- <v-btn
v-if="!searchParam.isMulti"
:ripple="false"
@click="search()"
>검색</v-btn
> -->
<a-button
v-if="!searchParam.isMulti"
type="primary"
class="mr-1"
icon="search"
:ripple="false"
@click="search"
style="height: 40px"
>
<v-btn
검색
</a-button>
<!-- <v-btn
v-if="!searchParam.isMulti"
:ripple="false"
@click="initVal()"
>초기화</v-btn
> -->
<a-button
v-if="!searchParam.isMulti"
type="primary"
class="mr-1"
:ripple="false"
@click="initVal"
style="height: 40px"
>
초기화
</a-button>
</v-col>
</v-row>
</div>
@ -310,7 +335,11 @@ export default {
},
// 공정/설비 트리 그리드 세팅
gridInit() {
const myOptions = {};
const myOptions = {
header: {
height: 38,
},
};
this.setModalGridOption({
modalKey: this.myModalKey,
gridKey: this.gridName,
@ -606,11 +635,11 @@ const myColumns = [
{ header: '전력계약 ID', name: 'eleclContId', hidden: true},
{ header: '전력계약 명', name: 'eleclContNm', hidden: true},
{ header: '전력계약구분CD', name: 'elecContKind', hidden: true},
{ header: '전력계약구분', name: 'elecContKindNm', align: 'center'},
{ header: '전력계약구분', name: 'elecContKindNm', align: 'left'},
{ header: '전압구분CD', name: 'voltKind', hidden: true },
{ header: '전압구분', name: 'voltKindNm', align: 'center' },
{ header: '전압구분', name: 'voltKindNm', align: 'left' },
{ header: '옵션CD', name: 'optKind', hidden: true },
{ header: '옵션', name: 'optKindNm', align: 'center' },
{ header: '옵션', name: 'optKindNm', align: 'left' },
{
header: '기본요금(원/kW)',
name: 'baseChrg',
@ -620,7 +649,7 @@ const myColumns = [
},
},
{ header: '시간대CD', name: 'peakKind', hidden: true },
{ header: '시간대', name: 'peakKindNm', align: 'center' },
{ header: '시간대', name: 'peakKindNm', align: 'left' },
{
header: '여름철(6~8월)',
name: 'unitPrcSum',

74
components/common/modal/TagTrndTagPop.vue
View File

@ -273,9 +273,9 @@ export default {
});
},
async created() {
// await this.setSelectValueList01();
// await this.setSelectValueList02();
// await this.setSelectValueList03();
await this.setSelectValueList01();
await this.setSelectValueList02();
await this.setSelectValueList03();
this.init();
// if(this.searchParam.isMulti == true){
// this.setPageData({
@ -487,40 +487,40 @@ export default {
eqpmId: this.selectValue03,
searchWord: this.searchWord,
};
let res = [
{
eqpmGrpNm: "냉각 시스템",
eqpmGrpId: "GRP001",
eqpmId: "EQ001",
eqpmNm: "냉각기 A",
tagId: "TAG001-001",
tagNm: "냉각 온도 센서",
rowStat: "I",
},
{
eqpmGrpNm: "전력 시스템",
eqpmGrpId: "GRP002",
eqpmId: "EQ002",
eqpmNm: "변압기 B",
tagId: "TAG002-002",
tagNm: "전류 센서",
rowStat: "U",
},
{
eqpmGrpNm: "공기압 시스템",
eqpmGrpId: "GRP003",
eqpmId: "EQ003",
eqpmNm: "압축기 C",
tagId: "TAG003-003",
tagNm: "압력 센서",
rowStat: "D",
},
];
// res = await this.postApiReturn({
// apiKey: "selectTagAndEqpmList",
// resKey: "tagTrndDatas",
// sendParam: searchParam,
// });
// let res = [
// {
// eqpmGrpNm: "냉각 시스템",
// eqpmGrpId: "GRP001",
// eqpmId: "EQ001",
// eqpmNm: "냉각기 A",
// tagId: "TAG001-001",
// tagNm: "냉각 온도 센서",
// rowStat: "I",
// },
// {
// eqpmGrpNm: "전력 시스템",
// eqpmGrpId: "GRP002",
// eqpmId: "EQ002",
// eqpmNm: "변압기 B",
// tagId: "TAG002-002",
// tagNm: "전류 센서",
// rowStat: "U",
// },
// {
// eqpmGrpNm: "공기압 시스템",
// eqpmGrpId: "GRP003",
// eqpmId: "EQ003",
// eqpmNm: "압축기 C",
// tagId: "TAG003-003",
// tagNm: "압력 센서",
// rowStat: "D",
// },
// ];
let res = await this.postApiReturn({
apiKey: "selectTagAndEqpmList",
resKey: "tagTrndDatas",
sendParam: searchParam,
});
let newRes = [];
if (this.searchParam["tagList"].length > 0) {
newRes = res.filter((item) => {

4
layouts/default.vue
View File

@ -61,10 +61,10 @@
</v-list-item>
</v-list>
</v-menu>
<a-button id="refresh" class="btn-header" @click="removeBookMark" v-if="bookmarkBtn == 1">
<a-button id="removeBm" class="btn-header" @click="removeBookMark" v-if="bookmarkBtn == 1">
<span class="material-icons" style="font-size: 17px">star</span>
</a-button>
<a-button id="refresh" class="btn-header" :style="{
<a-button id="addBm" class="btn-header" :style="{
display: 'flex',
alignItems: 'center'}" @click="addBookMark" v-if="bookmarkBtn == 0">
<span class="material-icons" style="font-size: 17px">star_border</span>

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

@ -49,7 +49,7 @@
<v-col :cols="3">
<!-- 대상일 -->
<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="12"
:textCols="12" :customClass="'input-large'" />
:textCols="12" :customClass="'datepicker-large'" />
</v-col>
<v-col :cols="3" class="text-right">
<!-- 조회버튼 -->

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

@ -1,5 +1,6 @@
<template>
<div class="l-layout">
<CommonPageTitle />
<v-row ref="searchFilter">
<v-col :cols="12">
<v-card class="searchFilter">
@ -25,7 +26,7 @@
<component
:is="'Datepicker'"
:parentPrgmId="myPrgmId"
:customClass="'select-large'"
:customClass="'datepicker-large'"
:label="'대상일'"
:labelCols="3"
/>
@ -99,7 +100,6 @@ export default {
async asyncData(context) {
const myState = context.store.state;
myPrgmId = context.route.query.prgmId;
console.log("active menu:", myState.menuData);
await context.store.commit("setActiveMenuInfo", myState.menuData[myPrgmId]);
myTitle = await myState.activeMenuInfo.menuNm;
},
@ -319,8 +319,7 @@ export default {
},
};
console.log("data : ", data);
data.map((item) => {
data.map((item) => {
xAxisData.push(item.fabNm);
});
@ -374,8 +373,6 @@ export default {
];
}
// console.log("xAxisData : ", xAxisData);
console.log("seriesData : ", seriesData);
var chartOption = {
legend: {
top: xAxisData.length > 7 ? "top" : "bottom",

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

@ -97,7 +97,7 @@
</v-row>
<v-row ref="contents" style="height: calc(100vh - 230px)">
<v-col :cols="12" style="height: 100%">
<v-row class="pa-1" style="height: 37%; width: 100%">
<v-row class="pa-1" style="height: 50%; width: 100%">
<div style="width: 100%; height: 100%; overflow: hidden">
<div style="height: 15%">
<v-card-title
@ -117,7 +117,7 @@
v-for="(value, key, index) in contentData01"
:key="'key1' + index"
>
<v-card>
<v-card style="position: relative; overflow: hidden;" >
<!-- Card header -->
<div
style="
@ -133,23 +133,9 @@
<v-card-title style="padding-left: 10px">{{
value["gdIdxNm"]
}}</v-card-title>
<div class="v-box" style="height: 80%; padding: 3px; margin: 2px">
<v-col :cols="12" style="height: 100%">
<!-- <div style="height: 20%">
<div
style="
position: absolute;
left: 0;
top: 10px;
width: 4px;
height: 50px;
background-color: #91caff;
border-radius: 2px;
"
></div>
<v-card-title>{{ value["gdIdxNm"] }}</v-card-title>
</div> -->
<div style="height: 95%">
<div class="v-box" style="height: 80%; padding: 3px; margin: 10px;">
<v-col :cols="12" style="height: 100%;">
<div style="height: 85%;">
<component
class="w100 h100"
:is="loadChart ? 'Chart' : null"
@ -166,7 +152,7 @@
</div>
</div>
</v-row>
<v-row class="pa-1" style="height: 33%; width: 100%">
<v-row class="pa-1" style="height: 40%; 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">
@ -746,10 +732,12 @@ export default {
{
type: "line",
data: seriesData,
symbol: "none",
itemStyle: {
color: "#D32029",
},
// symbol: "circle",
showSymbol: true,
connectNulls: true,
},
// {
// type: "line",

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

@ -24,6 +24,7 @@
:is="'DatePicker'"
:label="'대상연월'"
:parentPrgmId="myPrgmId"
:customClass="'datepicker-large'"
/>
</v-col>
<v-col :cols="3"> </v-col>
@ -429,9 +430,6 @@ export default {
var chartKey = null;
var chartOption = null;
console.log("data key:", dataKeyList);
console.log("data test:", data);
for (var i = 0; i < dataKeyList.length; i++) {
for (var j = 0; j < data[dataKeyList[i]].chartData.length; j++) {
currentChartData = data[dataKeyList[i]].chartData[j];

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

@ -71,6 +71,7 @@
:label="'대상년월'"
:parentPrgmId="myPrgmId"
:isRangeOption="false"
:customClass="'datepicker-large'"
/>
</v-col>
<v-col :cols="6"> </v-col>

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

File diff suppressed because it is too large Load Diff