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

conflic

Browse Source
This commit is contained in:
Hoang Xuan Mai/(Hoang Xuan Mai)/현장대리인/SK
2025-08-04 16:41:29 +07:00
parent 41095098e2 f180f22324
commit 2253ddef0a
16 changed files with 1242 additions and 1232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

384
assets/scss/common.scss
View File

@ -266,7 +266,7 @@ a {
} }
&>.v-treeview-node__root:hover:before { &>.v-treeview-node__root:hover:before {
opacity: 1 !important; opacity: 0 !important;
} }
.v-treeview-node__children { .v-treeview-node__children {
@ -280,15 +280,19 @@ a {
.v-treeview-node--click[aria-expanded="true"] { .v-treeview-node--click[aria-expanded="true"] {
&>.v-treeview-node__root:before { &>.v-treeview-node__root:before {
opacity: 1 !important; opacity: 0 !important;
} }
} }
.v-treeview-node[aria-expanded="true"] { .v-treeview-node[aria-expanded="true"] {
&>.v-treeview-node__root>.v-treeview-node__content>.v-treeview-node__label>button>.v-icon.mdi-chevron-down { &>.v-treeview-node__root>.v-treeview-node__content
>.v-treeview-node__label>button {
>.anticon,
>.v-icon.mdi-chevron-down {
transform: rotate(-180deg); transform: rotate(-180deg);
} }
} }
}
.v-treeview-node__label { .v-treeview-node__label {
&>button { &>button {
@ -298,15 +302,17 @@ a {
// justify-content: center; // justify-content: center;
} }
& .anticon,
& .v-icon.mdi-chevron-down { & .v-icon.mdi-chevron-down {
margin-left: auto; margin-left: auto;
animation-duration: 0.5s;
} }
} }
} }
.v-treeview-node--active { .v-treeview-node--active {
&:before { &:before {
opacity: 1 !important; opacity: 0 !important;
} }
} }
@ -322,7 +328,8 @@ a {
.v-treeview-node__content span:not(.v-icon), .v-treeview-node__content span:not(.v-icon),
.v-treeview-node__root>button, .v-treeview-node__root>button,
.v-treeview-node__level, .v-treeview-node__level,
.v-treeview-node__content .v-icon.mdi-chevron-down { .v-treeview-node__content .v-icon.mdi-chevron-down,
.v-treeview-node__content .anticon {
display: none; display: none;
} }
@ -615,36 +622,36 @@ a {
.v-navigation-drawer__append { .v-navigation-drawer__append {
>p { >p {
@if $theme ==dark { color: map-deep-get($config, #{$theme}, "v-banner-border-color" ) !important;
color: rgba(255, 255, 255, 0.6); // @if $theme ==dark {
} // color: rgba(255, 255, 255, 0.6);
// }
@else { // @else {
color: #999; // color: #999;
} // }
} }
} }
.v-footer { // .v-footer {
@if $theme ==light { // @if $theme ==light {
background-color: #dfdfe5; // background-color: #dfdfe5;
color: #767d83; // color: #767d83;
} // }
} // }
.bd { // .bd {
@if $theme ==dark { // @if $theme ==dark {
&-r-1 { // &-r-1 {
border-right: 1px #373f45 solid; // border-right: 1px #373f45 solid;
} // }
} // }
// @else {
@else { // &-r-1 {
&-r-1 { // border-right: 1px #efefef solid;
border-right: 1px #efefef solid; // }
} // }
} // }
}
.border-bottom-1 { .border-bottom-1 {
border-bottom: 1px solid map-deep-get($config, #{$theme}, "border-color"); border-bottom: 1px solid map-deep-get($config, #{$theme}, "border-color");
@ -692,183 +699,224 @@ a {
} }
&>.v-treeview-node { &>.v-treeview-node {
.v-treeview-node__root {
.v-treeview-node--active {
background-color: map-deep-get($config,
#{$theme},
"v-treeview-node-label-active-bg"
);
border: 1px solid map-deep-get($config,
#{$theme},
"v-treeview-node-label-active-border"
);
border-radius: 8px; border-radius: 8px;
&:hover {
&:before { background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color" );
background-color: map-deep-get($config,
#{$theme},
"v-treeview-node-subroot-backgroundColor"
);
} }
.v-treeview-node__content {
&>.v-treeview-node__content {
.v-treeview-node__label { .v-treeview-node__label {
color: map-deep-get($config, color: map-deep-get($config, #{$theme}, "tui-grid-title-color");
#{$theme},
"v-treeview-node-label-active-color"
);
}
.v-icon {
color: map-deep-get($config,
#{$theme},
"v-treeview-icon-active-color"
);
} }
} }
} }
&[aria-expanded="true"]{
// Level 1
&>.v-treeview-node__root { &>.v-treeview-node__root {
background-color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-bg" );
border: 1px solid map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border");
&:before { &:before {
background-color: map-deep-get($config, background-color: map-deep-get($config, #{$theme}, "v-treeview-node-subroot-backgroundColor");
#{$theme},
"v-treeview-node-root-backgroundColor"
);
} }
&>.v-treeview-node__content { .v-treeview-node__content {
.v-treeview-node__label { .v-treeview-node__label {
color: map-deep-get($config, color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border");
#{$theme},
"v-treeview-node-root-label-color"
);
} }
.v-icon { .v-icon:first-child,
color: map-deep-get($config, .v-icon:first-child::before {
#{$theme}, color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
"v-treeview-node-root-icon-color"
);
} }
} }
}
&>.v-treeview-node__children {
// Level 2
.v-treeview-node__root {
color: map-deep-get($config, #{$theme}, "v-treeview-node-root-label-color");
&:hover {
background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-backgroundColor");
}
}
&>[aria-expanded="true"] >.v-treeview-node__root,
.v-treeview-node__root.v-treeview-node--active {
background-color: map-deep-get($config, #{$theme}, "v-calendar-day-in-not-month-color" );
.v-treeview-node__content {
.v-treeview-node__label {
color: map-deep-get($config, #{$theme}, "card-title-color");
}
.v-icon,
.v-icon::before,
.anticon {
color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
}
}
}
// Level 3
.v-treeview-node__children {
.v-treeview-node {
>.v-treeview-node__root {
.v-treeview-node__content {
.v-treeview-node__label {
color: map-deep-get($config, #{$theme}, "card-default-color");
}
}
*:hover,
:hover {
border-width: 0;
}
&:hover { &:hover {
&>.v-treeview-node__content { border: 1px solid map-deep-get($config, #{$theme}, "v-input-textarea-border");
border-radius: 8px;
background-color: rgba(0, 0, 0, 0);
.v-treeview-node__content {
.v-treeview-node__label { .v-treeview-node__label {
color: map-deep-get($config, color: map-deep-get($config, #{$theme}, "tui-grid-title-color");
#{$theme},
"v-treeview-node-root-label-active-color"
);
}
.v-icon {
color: map-deep-get($config,
#{$theme},
"v-treeview-node-root-icon-active-color"
);
}
}
} }
} }
&>.v-treeview-node__children {
&>.v-treeview-node {
&>.v-treeview-node__root {
&:before {
background-color: map-deep-get($config,
#{$theme},
"v-treeview-node-subroot-backgroundColor"
);
} }
&>.v-treeview-node__content { &.v-treeview-node--active {
// color: map-deep-get($config, #{$theme}, "card-title-color");
background-color: rgba(0, 0, 0, 0);
.v-treeview-node__content {
.v-treeview-node__label { .v-treeview-node__label {
color: map-deep-get($config, color: map-deep-get($config, #{$theme}, "tui-grid-title-color");
#{$theme},
"v-treeview-node-label-color"
);
} }
.v-icon { .v-icon,
color: map-deep-get($config, .v-icon::before,
#{$theme}, .anticon {
"v-treeview-icon-color" color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
);
}
}
&:not(.v-treeview-node--active):hover {
&:before {
background-color: map-deep-get($config,
#{$theme},
"v-treeview-leaf-active-backgroundColor"
);
}
&>.v-treeview-node__content {
.v-treeview-node__label {
color: map-deep-get($config,
#{$theme},
"v-treeview-leaf-active-color"
);
}
.v-icon {
color: map-deep-get($config,
#{$theme},
"v-treeview-leaf-active-color"
);
}
} }
} }
} }
&>.v-treeview-node__children {
background-color: map-deep-get($config,
#{$theme},
"v-treeview-leaf-subchildren-backgroundColor"
);
}
&[aria-expanded="true"] {
& .v-treeview-node__root>.v-treeview-node__content {
.v-treeview-node__label {
color: map-deep-get($config,
#{$theme},
"v-treeview-node-label-children-color"
);
}
.v-icon {
color: map-deep-get($config,
#{$theme},
"v-treeview-icon-active-color"
);
}
}
}
} }
} }
&[aria-expanded="true"] {
& .v-treeview-node__root>.v-treeview-node__content {
.v-treeview-node__label {
color: map-deep-get($config,
#{$theme},
"v-treeview-node-root-label-active-color"
);
} }
.v-icon {
color: map-deep-get($config,
#{$theme},
"v-treeview-node-root-icon-active-color"
);
}
} }
} }
// &>.v-treeview-node__root {
// &:before {
// background-color: map-deep-get($config, #{$theme}, "v-treeview-node-root-backgroundColor" );
// }
// &>.v-treeview-node__content {
// .v-treeview-node__label {
// color: map-deep-get($config, #{$theme}, "v-treeview-node-root-label-color");
// }
// }
// &:hover {
// &>.v-treeview-node__content {
// .v-treeview-node__label {
// color: map-deep-get($config,
// #{$theme},
// "v-treeview-node-root-label-active-color"
// );
// }
// .v-icon {
// color: map-deep-get($config,
// #{$theme},
// "v-treeview-node-root-icon-active-color"
// );
// }
// }
// }
// }
// &>.v-treeview-node__children {
// &>.v-treeview-node {
// &>.v-treeview-node__root {
// &:before {
// background-color: map-deep-get($config,
// #{$theme},
// "v-treeview-node-subroot-backgroundColor"
// );
// }
// &>.v-treeview-node__content {
// .v-treeview-node__label {
// color: map-deep-get($config, #{$theme}, "v-treeview-node-label-color" );
// }
// .v-icon {
// color: map-deep-get($config, #{$theme}, "v-treeview-icon-color" );
// }
// }
// &:not(.v-treeview-node--active):hover {
// &:before {
// background-color: map-deep-get($config,
// #{$theme},
// "v-treeview-leaf-active-backgroundColor"
// );
// }
// &>.v-treeview-node__content {
// .v-treeview-node__label {
// color: map-deep-get($config,
// #{$theme},
// "v-treeview-leaf-active-color"
// );
// }
// .v-icon {
// color: map-deep-get($config,
// #{$theme},
// "v-treeview-leaf-active-color"
// );
// }
// }
// }
// }
// &>.v-treeview-node__children {
// // background-color: map-deep-get($config,
// // #{$theme},
// // "v-treeview-leaf-subchildren-backgroundColor"
// // );
// }
// // &[aria-expanded="true"] {
// // & .v-treeview-node__root>.v-treeview-node__content {
// // .v-treeview-node__label {
// // color: map-deep-get($config,
// // #{$theme},
// // "v-treeview-node-label-children-color"
// // );
// // }
// // .v-icon {
// // color: map-deep-get($config,
// // #{$theme},
// // "v-treeview-icon-active-color"
// // );
// // }
// // }
// // }
// }
// }
} }
} }

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

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

24
components/common/modal/EqpmSelectPop.vue
View File

@ -16,15 +16,16 @@
</template></v-text-field> </template></v-text-field>
</v-col> </v-col>
<v-dialog ref="popModal" v-model="dialog" width="800" overlay-color="#000" overlay-opacity="0.8" scrollable> <v-dialog ref="popModal" v-model="dialog" width="800" scrollable>
<v-card style="height: 100%"> <v-card style="height: 90vh;">
<v-card-title class="px-5 py-4 d-flex align-center justify-space-between"> <v-card-title class="px-5 py-4 d-flex align-center justify-space-between">
<span class="custom-title-4">설비 선택</span> <span class="custom-title-4">설비 선택</span>
<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button> <a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
</v-card-title> </v-card-title>
<div class="pa-2 pt-0"> <div class="pa-2 pt-0">
<v-card class="searchFilter"> <!-- <v-card class="searchFilter">
<v-row align="end"> </v-card> -->
<v-row align="end" class="searchFilter">
<v-col :cols="3.5"> <v-col :cols="3.5">
<!-- 설비그룹 --> <!-- 설비그룹 -->
<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01" <component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01"
@ -60,10 +61,7 @@
</v-row> </v-row>
</v-col> </v-col>
<a-button icon="search" type="primary" @click="search()" class="search-button">조회</a-button> <a-button icon="search" type="primary" @click="search()" class="search-button">조회</a-button>
</v-row> </v-row>
</v-card>
<!-- <v-row align="center" no-gutters style="margin-top: 14px;"> <!-- <v-row align="center" no-gutters style="margin-top: 14px;">
<v-col :cols="1"> <v-col :cols="1">
@ -77,14 +75,20 @@
:hide-details="true" v-model="searchWord" @keyup.enter="search"></v-text-field> :hide-details="true" v-model="searchWord" @keyup.enter="search"></v-text-field>
</v-col> </v-col>
</v-row> --> </v-row> -->
<!-- <v-row>
<v-col :col="12">
</v-col>
</v-row> -->
</div> </div>
<div class="px-5" style="height:429px;">
<div ref="modalGridParent" class="w100 h100"> <v-card-text class="px-2 w100">
<div ref="modalGridParent" style="height: 450px;" class="h100 w100">
<component :ref="gridName" :is="loadGrid ? 'Grid' : null" <component :ref="gridName" :is="loadGrid ? 'Grid' : null"
:dataPath="searchParam.eqpmSelectPopData.eqpmSelectPop" :gridName="gridName" :dataPath="searchParam.eqpmSelectPopData.eqpmSelectPop" :gridName="gridName"
:parentPrgmId="parentPrgmId" @getRowsData="getRowData" /> :parentPrgmId="parentPrgmId" @getRowsData="getRowData" />
</div> </div>
</div> </v-card-text>
<v-card-actions class="px-6 py-4 d-flex align-center justify-end"> <v-card-actions class="px-6 py-4 d-flex align-center justify-end">
<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)" class="mr-2">닫기</a-button> <a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)" class="mr-2">닫기</a-button>
<a-button :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button> <a-button :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button>

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

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

35
layouts/default.vue
View File

@ -9,7 +9,6 @@
<div class="lnb-logo"> <div class="lnb-logo">
<img v-if="isDarkMode" src="@/assets/images/logo_dm.png" /> <img v-if="isDarkMode" src="@/assets/images/logo_dm.png" />
<img v-else src="@/assets/images/logo_lm.png" /> <img v-else src="@/assets/images/logo_lm.png" />
<!-- <img v-else src="@/assets/images/logo_lm.png" /> -->
</div> </div>
<!-- <div class="lnb-logo">FEMS</div>--> <!-- <div class="lnb-logo">FEMS</div>-->
</router-link> </router-link>
@ -62,10 +61,10 @@
</v-list-item> </v-list-item>
</v-list> </v-list>
</v-menu> </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> <span class="material-icons" style="font-size: 17px">star</span>
</a-button> </a-button>
<a-button id="refresh" class="btn-header" :style="{ <a-button id="addBm" class="btn-header" :style="{
display: 'flex', display: 'flex',
alignItems: 'center'}" @click="addBookMark" v-if="bookmarkBtn == 0"> alignItems: 'center'}" @click="addBookMark" v-if="bookmarkBtn == 0">
<span class="material-icons" style="font-size: 17px">star_border</span> <span class="material-icons" style="font-size: 17px">star_border</span>
@ -88,32 +87,12 @@
</v-row> </v-row>
</div> </div>
<v-main> <v-main>
<v-container fluid> <v-container fluid>
<v-row class="flex-nowrap"> <v-row class="flex-nowrap">
<div class="menu-container"> <div class="menu-container">
<v-navigation-drawer ref="navigationdrawer" :value="drawer" :mini-variant="miniVariant" :clipped="clipped" <v-navigation-drawer ref="navigationdrawer" :value="drawer" :mini-variant="miniVariant" :clipped="clipped"
:absolute="false" mini-variant-width="60"> :absolute="false" mini-variant-width="60">
<div class="d-flex align-center justify-space-between py-4 px-3" v-if="false">
<router-link class="home" :to="myHome.root">
<div class="lnb-logo">
<img v-if="isDarkMode" src="@/assets/images/logo_dm.png" />
<img v-else src="@/assets/images/logo_lm.png" />
</div>
<!-- <div class="lnb-logo">FEMS</div>-->
</router-link>
<ThemeSwitch style="margin-right: 20px" />
<v-app-bar-nav-icon ref="appbarnavicon" id="appbarnavicon" @click.stop="miniVariant = !miniVariant"
@click="updateTreeview" :style="{
backgroundColor: 'transparent',
color: isDarkMode ? '#fff' : '#111',
}" />
<!-- <router-view :key="$route.fullPath"/> -->
</div>
<AdminMenu :miniVariant="miniVariant" :userNm="this.userInfo.userNm" :comId="this.userInfo.comId" v-if="false" />
<component ref="changePswdPop" :is="'ChangePswdPop'" v-show="false" :comId="this.userInfo.comId" /> <component ref="changePswdPop" :is="'ChangePswdPop'" v-show="false" :comId="this.userInfo.comId" />
<v-treeview ref="treeview" :active.sync="activeTree" active-class="v-treeview-node--active" <v-treeview ref="treeview" :active.sync="activeTree" active-class="v-treeview-node--active"
:items="treevieItems" activatable hoverable color="#3896ff" open-on-click @update:open="openNode"> :items="treevieItems" activatable hoverable color="#3896ff" open-on-click @update:open="openNode">
@ -130,14 +109,16 @@
:class="miniVariant === false ? 'mr-2' : ''" size="9"> :class="miniVariant === false ? 'mr-2' : ''" size="9">
$depth3rdBulletDark $depth3rdBulletDark
</v-icon> </v-icon>
<span v-if="item.url">{{ item.menuNm }} <span v-if="item.url">
{{ item.menuNm }}
<!-- <span v-if="item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star</span> <!-- <span v-if="item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star</span>
<span v-else-if="!item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star_border</span> --> <span v-else-if="!item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star_border</span> -->
</span> </span>
<span v-else-if="!item.url">{{ item.menuNm }}</span> <span v-else-if="!item.url">{{ item.menuNm }}</span>
<v-icon v-if="item.lvl >= 1 && item.childeVo && item.childeVo.length > 0 && !item.url"> <!-- <v-icon v-if="item.lvl >= 1 && item.childeVo && item.childeVo.length > 0 && !item.url">
mdi-chevron-down mdi-chevron-down
</v-icon> </v-icon> -->
<a-icon type="down" v-if="item.lvl >= 1 && item.childeVo && item.childeVo.length > 0 && !item.url" />
</button> </button>
</template> </template>
</v-treeview> </v-treeview>
@ -805,7 +786,7 @@ export default {
// console.log('if isLoading stmt3'); // console.log('if isLoading stmt3');
// return; // return;
// } // }
alert("move to", url); // alert("move to", url);
this.$router.push({ this.$router.push({
path: url + "?prgmId=" + prgmId, path: url + "?prgmId=" + prgmId,
}); });

4
pages/comm/base/NoticeMngPage.vue
View File

@ -10,8 +10,8 @@
<v-card-title class="pa-0 custom-title-4">공지사항</v-card-title> <v-card-title class="pa-0 custom-title-4">공지사항</v-card-title>
<div class="d-flex align-center"> <div class="d-flex align-center">
<!-- <v-btn @click="listPageButtonGroupClickEvent('view')" :ripple="false" class="mr-1">상세보기</v-btn> --> <!-- <v-btn @click="listPageButtonGroupClickEvent('view')" :ripple="false" class="mr-1">상세보기</v-btn> -->
<a-button type="primary" size="large" @click="listPageButtonGroupClickEvent('write')" <a-button type="primary" @click="listPageButtonGroupClickEvent('write')" :ripple="false"
:ripple="false" icon="edit" class="mr-1">작성</a-button> icon="edit" class="mr-1">작성</a-button>
<!-- <v-btn @click="listPageButtonGroupClickEvent('delete')" :ripple="false">삭제</v-btn> --> <!-- <v-btn @click="listPageButtonGroupClickEvent('delete')" :ripple="false">삭제</v-btn> -->
</div> </div>
</v-col> </v-col>

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

@ -53,7 +53,7 @@
</v-col> </v-col>
<v-col :cols="7" > <v-col :cols="7" >
<v-card class="pb-5"> <v-card class="pb-5">
<v-card-title class="custom-title-4" style="min-height:76px;">설비 상세</v-card-title> <v-card-title class="custom-title-4 pb-1" >설비 상세</v-card-title>
<div class="px-5" style="min-height:calc(100% - 76px)"> <div class="px-5" style="min-height:calc(100% - 76px)">
<v-tabs v-model="tab"> <v-tabs v-model="tab">
<v-tab v-for="item in items" :key="item.id" :disabled="item.disabledFlag"> <v-tab v-for="item in items" :key="item.id" :disabled="item.disabledFlag">

1
pages/ems/base/ReadResultCloseMngPage.vue
View File

@ -43,6 +43,7 @@
:is="'Datepicker'" :is="'Datepicker'"
:parentPrgmId="myPrgmId" :parentPrgmId="myPrgmId"
:label="'조회기간'" :label="'조회기간'"
customClass="datepicker-large"
/> />
</v-col> </v-col>
<div class="d-flex"> <div class="d-flex">

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

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

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

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

6
pages/ems/effc/EnrgMapPage.vue
View File

@ -5,14 +5,14 @@
<v-col :cols="12"> <v-col :cols="12">
<v-card class="searchFilter"> <v-card class="searchFilter">
<v-row align="end" no-gutters> <v-row align="end" no-gutters>
<v-col :cols="4"> <v-col :cols="3">
<!-- 차트목록 --> <!-- 차트목록 -->
<component :is="'SelectBox'" ref="SelectBox" :propsValue="selectValue01" :itemList="selectValueList01" <component :is="'SelectBox'" ref="SelectBox" :propsValue="selectValue01" :itemList="selectValueList01"
:label="'차트'" @update:propsValue="selectValue01 = $event" :textCols="12" customClass="select-large" /> :label="'차트'" @update:propsValue="selectValue01 = $event" :textCols="12" customClass="select-large" />
</v-col> </v-col>
<v-col :cols="4"> <v-col :cols="3">
<!-- 대상일 --> <!-- 대상일 -->
<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="3" /> <component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="3" customClass="datepicker-large" />
</v-col> </v-col>
<v-col :cols="4" class="text-right"> <v-col :cols="4" class="text-right">
<BtnSearch @click="search" size="large" /> <BtnSearch @click="search" size="large" />

47
pages/ems/effc/EnrgReptMngPage.vue
View File

@ -32,7 +32,7 @@
</v-col> </v-col>
<v-col :cols="3"> <v-col :cols="3">
<!-- 대상일 --> <!-- 대상일 -->
<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="3" /> <component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="3" customClass="datepicker-large" />
</v-col> </v-col>
<v-col :cols="6" class="text-right d-flex align-end justify-end align-self-end"> <v-col :cols="6" class="text-right d-flex align-end justify-end align-self-end">
<!-- 조회버튼 --> <!-- 조회버튼 -->
@ -99,6 +99,8 @@ import EqpmSelectPop from '~/components/common/modal/EqpmSelectPop';
import DateUtility from '~/plugins/dateUtility'; import DateUtility from '~/plugins/dateUtility';
import XLSX from 'xlsx'; import XLSX from 'xlsx';
import getLineChartOption from "~/components/common/chartoptions/LineChart";
let myTitle; let myTitle;
let myPrgmId; let myPrgmId;
@ -764,22 +766,14 @@ export default {
]; ];
} }
var chartOption = { const chartOption = getLineChartOption({
legend: { xAxisData: xAxisData,
top: 'top', seriesData: seriesData,
},
grid: {
top: '10%',
bottom: '20%',
},
yAxis: {},
xAxis: {
data: xAxisData,
},
series: seriesData,
tooltip: {},
dataZoom: dataZoom, dataZoom: dataZoom,
}; // legendData: legendData,
// isDarkMode: this.isDarkMode,
});
this.setChartOption({ chartKey: this.chartName01, value: chartOption }); this.setChartOption({ chartKey: this.chartName01, value: chartOption });
// this.setChartYAxisData({ chartKey: this.chartName01, value: yAxisData }); // this.setChartYAxisData({ chartKey: this.chartName01, value: yAxisData });
// this.setChartXAxisData({ chartKey: this.chartName01, value: xAxisData }); // this.setChartXAxisData({ chartKey: this.chartName01, value: xAxisData });
@ -864,22 +858,13 @@ export default {
]; ];
} }
var chartOption = { const chartOption = getLineChartOption({
legend: { xAxisData: xAxisData,
top: 'top', seriesData: seriesData,
},
grid: {
top: '10%',
bottom: '20%',
},
yAxis: {},
xAxis: {
data: xAxisData,
},
series: seriesData,
tooltip: {},
dataZoom: dataZoom, dataZoom: dataZoom,
}; // legendData: legendData,
// isDarkMode: this.isDarkMode,
});
this.setChartOption({ chartKey: this.chartName02, value: chartOption }); this.setChartOption({ chartKey: this.chartName02, value: chartOption });
// this.setChartDataZoom({chartKey : this.chartName02,value: dataZoom}); // this.setChartDataZoom({chartKey : this.chartName02,value: dataZoom});

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

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

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

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

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

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

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

@ -1,6 +1,6 @@
<template> <template>
<div ref="mainDiv" class="l-layout"> <div ref="mainDiv" class="l-layout">
<PageTitle text="데이터 TREND" /> <CommonPageTitle />
<v-row ref="searchFilter"> <v-row ref="searchFilter">
<v-col :cols="12"> <v-col :cols="12">
<v-card class="searchFilter"> <v-card class="searchFilter">
@ -188,7 +188,6 @@ import Grid from "~/components/common/Grid";
import TagTrndTagPop from "~/components/common/modal/TagTrndTagPop"; import TagTrndTagPop from "~/components/common/modal/TagTrndTagPop";
import Chart from "~/components/common/Chart"; import Chart from "~/components/common/Chart";
import XLSX from "xlsx"; import XLSX from "xlsx";
import PageTitle from "~/components/common/PageTitle";
let myTitle; let myTitle;
let myPrgmId; let myPrgmId;
@ -217,7 +216,6 @@ export default {
Grid, Grid,
TagTrndTagPop, TagTrndTagPop,
Chart, Chart,
PageTitle,
}, },
data() { data() {
return { return {
@ -486,26 +484,6 @@ export default {
{ header: "rowStat", name: "rowStat", align: "center", hidden: true }, { header: "rowStat", name: "rowStat", align: "center", hidden: true },
]; ];
const newRes = [
{
eqpmGrpNm: "냉동기고온",
eqpmGrpId: "UT_HT_CH201",
eqpmId: "UT_HT_CH201",
eqpmNm: "UT_HT_CH201",
tagId: "ICHEON.HVAC.EQP_HT_CH004.UT_HT_CH201.CHI_AMP_1A_PV",
tagNm: "ICHEON 고온 냉동기 201호기 - 회로1 전류A",
// rowStat: "I",
},
{
eqpmGrpNm: "냉동기고온",
eqpmGrpId: "UT_HT_CH201",
eqpmId: "UT_HT_CH201",
eqpmNm: "UT_HT_CH201",
tagId: "ICHEON.HVAC.EQP_HT_CH004.UT_HT_CH201.CHI_AMP_1A_PV",
tagNm: "ICHEON 고온 냉동기 201호기 - 회로1 전류A",
// rowStat: "I",
},
];
this.setGridColumn({ this.setGridColumn({
gridKey: this.gridName, gridKey: this.gridName,
value: myColumns, value: myColumns,