Compare commits

...

16 Commits

Author SHA1 Message Date
5735777bb1 fixbug 2025-08-04 18:53:30 +09:00
dev
f180f22324 Merge pull request 'fix bug screen 8, 10, menu' (#32) from dev-dungtv44-0804 into dev
Reviewed-on: #32
2025-08-04 18:06:52 +09:00
a7968774c3 Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv44-0804 2025-08-04 15:03:03 +07:00
dev
195c48ff25 Merge pull request 'Update s1 s29 - Remove mock data s5 s11' (#31) from dev-nghiantt-s1s29 into dev
Reviewed-on: #31
2025-08-04 17:02:41 +09:00
7bca077859 fix bug screen 8, 10, menu 2025-08-04 15:00:22 +07:00
6dfda50ebd Change style to built in class + Add missing titlte 2025-08-04 11:21:29 +09:00
df678daedf Fix duplicate id not reload page date 2025-08-01 16:03:54 +09:00
06308055ef Remove mock data popup s11 2025-08-01 12:08:43 +09:00
1284d5b14f Update s1 s29 - Remove mock data s5 s11 2025-08-01 11:41:32 +09:00
dev
cd7a6362a5 Merge pull request 'dev-luannv24-s32s17s2' (#30) from dev-luannv24-s32s17 into dev
Reviewed-on: #30
2025-07-31 18:49:01 +09:00
dev
39cb5d2883 Merge pull request 'dev-dungtv-0731' (#28) from dev-dungtv-0731 into dev
Reviewed-on: #28
2025-07-31 18:22:10 +09:00
dcdcf772ce fixbug screen 20.4 2025-07-31 16:18:44 +07:00
40addfe639 fixbug active menu item 2025-07-31 15:05:33 +07:00
238fdb5fc5 remove console 2025-07-31 14:18:29 +07:00
bfe206a2bf Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-0731 2025-07-31 13:52:37 +07:00
a6e8e6cf86 fixbug screen 20 2025-07-31 13:52:28 +07:00
33 changed files with 1396 additions and 1465 deletions

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,13 +280,17 @@ 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
transform: rotate(-180deg); >.v-treeview-node__label>button {
>.anticon,
>.v-icon.mdi-chevron-down {
transform: rotate(-180deg);
}
} }
} }
@ -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,256 +699,224 @@ a {
} }
&>.v-treeview-node { &>.v-treeview-node {
&>.v-treeview-node__root { .v-treeview-node__root {
&:before { border-radius: 8px;
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"
);
}
.v-icon {
color: map-deep-get($config,
#{$theme},
"v-treeview-node-root-icon-color"
);
}
}
&:hover { &:hover {
&>.v-treeview-node__content { background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color" );
.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__content {
&>.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"
);
}
&>.v-treeview-node--active {
&: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-active-color"
);
}
.v-icon {
color: map-deep-get($config,
#{$theme},
"v-treeview-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--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;
&:before {
opacity: 0 !important;
}
&>.v-treeview-node__content {
.v-treeview-node__label {
color: map-deep-get($config,
#{$theme},
"v-treeview-node-label-active-color"
);
}
.v-icon {
color: map-deep-get($config,
#{$theme},
"v-treeview-node-label-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-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 { .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"
);
} }
} }
} }
&[aria-expanded="true"]{
// Level 1
&>.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 {
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-active-border");
}
.v-icon:first-child,
.v-icon:first-child::before {
color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
}
}
}
&>.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 {
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 {
color: map-deep-get($config, #{$theme}, "tui-grid-title-color");
}
}
}
&.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 {
color: map-deep-get($config, #{$theme}, "tui-grid-title-color");
}
.v-icon,
.v-icon::before,
.anticon {
color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
}
}
}
}
}
}
}
}
// &>.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"
// // );
// // }
// // }
// // }
// }
// }
} }
} }

View File

@ -98,6 +98,12 @@
@include theme($theme); @include theme($theme);
.v-application.#{$theme}-mode { .v-application.#{$theme}-mode {
.tui-grid-content-area{
.tui-grid-header-area{
height: auto !important;
}
}
.grid-title { .grid-title {
font-weight: 600; font-weight: 600;
font-size: 16px; font-size: 16px;
@ -308,13 +314,13 @@
#{$theme}, #{$theme},
"tui-grid-cell-borderColor" "tui-grid-cell-borderColor"
); );
.tui-grid-cell-content { // .tui-grid-cell-content {
border-right: 1px solid ; // border-right: 1px solid ;
border-right-color: map-deep-get($config, // border-right-color: map-deep-get($config,
#{$theme}, // #{$theme},
"tui-grid-cell-borderColor" // "tui-grid-cell-borderColor"
); // );
} // }
} }
} }

View File

@ -4,12 +4,12 @@
:data="chkGridData" :data="chkGridData"
:columns="chkGridColumns" :columns="chkGridColumns"
:options="chkGridOptions" :options="chkGridOptions"
@mousedown="onMousedown"
@click="startEditing" @click="startEditing"
@editingFinish="editingFinish" @editingFinish="editingFinish"
@dblclick="dblClick" @dblclick="dblClick"
@mouseover="mouseoverEvent" @mouseover="mouseoverEvent"
@mouseout="mouseoutEvent" @mouseout="mouseoutEvent"
@mousedown="onMousedown"
@focusChange="focusChangeEvt" @focusChange="focusChangeEvt"
/> />
</template> </template>
@ -251,11 +251,9 @@ export default {
this.gridInstance.invoke('check', rowData.rowKey, instance); this.gridInstance.invoke('check', rowData.rowKey, instance);
}, },
setSelectionRange(rowKey) { setSelectionRange(rowKey) {
// console.log("------------------DEBUG-------setSelectionRange:", rowKey);
const rowDatas = this.gridInstance.invoke('getData'); const rowDatas = this.gridInstance.invoke('getData');
rowDatas.forEach(item => { rowDatas.forEach(item => {
if (item.rowKey == rowKey) { if (item.rowKey == rowKey) {
// console.log("------------------DEBUG-------setSelectionRange---item:", item);
this.gridInstance.invoke( this.gridInstance.invoke(
'addRowClassName', 'addRowClassName',
item.rowKey, item.rowKey,
@ -271,11 +269,14 @@ export default {
}); });
}, },
onMousedown(evt) { onMousedown(evt) {
// console.log("------------------DEBUG-------onMousedown:", evt); this.handleSelectedRow(evt);
this.focusChangeEvt(evt);
}, },
focusChangeEvt(e) { focusChangeEvt(e) {
// console.log("------------------DEBUG-------focusChangeEvt:", e); if(e.rowKey === 0) {
this.handleSelectedRow(e);
}
},
handleSelectedRow(e) {
// console.log('focusChangeEvt1...') // console.log('focusChangeEvt1...')
if (this.preventFocusChangeEvent(e)) { if (this.preventFocusChangeEvent(e)) {
// console.log('prevent focusChangeEvt') // console.log('prevent focusChangeEvt')
@ -283,7 +284,7 @@ export default {
} }
// console.log('focusChangeEvt2...') // console.log('focusChangeEvt2...')
// cell 선택시 row 선택 method // cell 선택시 row 선택 method
if (e.rowKey >= 0) { if (e.rowKey > -1) {
this.$emit( this.$emit(
'getRowsData', 'getRowsData',
this.gridInstance.invoke('getRow', e.rowKey), this.gridInstance.invoke('getRow', e.rowKey),
@ -296,7 +297,6 @@ export default {
this.sendSelectedRowData(e.rowKey); this.sendSelectedRowData(e.rowKey);
}, },
startEditing(e) { startEditing(e) {
// console.log("------------------DEBUG-------startEditing:", e);
// console.log('startEditing1...') // console.log('startEditing1...')
if (this.preventFocusChangeEvent(e)) { if (this.preventFocusChangeEvent(e)) {
// console.log('prevent startEditing') // console.log('prevent startEditing')
@ -323,7 +323,6 @@ export default {
} }
}, },
async editingFinish(e) { async editingFinish(e) {
// console.log('------------------DEBUG-------editingFinish:', e);
// console.log("Editing END E::", e); // console.log("Editing END E::", e);
// editor 간 이동시 수정되는 문제 수정 // editor 간 이동시 수정되는 문제 수정
// e.rowEditingFg: grid의 한 row를 한번에 수정할 시 각각의 cell 마다 click 이벤트가 발생하지 않아 this.editorStartKey값이 제대로 입력 되지 않는 경우를 대비하여 만든 Fg // e.rowEditingFg: grid의 한 row를 한번에 수정할 시 각각의 cell 마다 click 이벤트가 발생하지 않아 this.editorStartKey값이 제대로 입력 되지 않는 경우를 대비하여 만든 Fg
@ -685,7 +684,6 @@ export default {
? this.gridInstance.invoke('getFocusedCell').rowKey ? this.gridInstance.invoke('getFocusedCell').rowKey
: eventRowKey; : eventRowKey;
var rowData = this.gridInstance.invoke('getRow', rowKey); var rowData = this.gridInstance.invoke('getRow', rowKey);
// console.log('------------------DEBUG-------sendSelectedRowData:', {eventRowKey, rowKey});
this.$emit('sendSelectedRowStatInfo', rowData); this.$emit('sendSelectedRowStatInfo', rowData);
} }
}, },

View File

@ -1,21 +1,8 @@
<template> <template>
<div class="d-flex flex-row justify-center align-center" style="gap: 12px"> <div class="d-flex flex-row justify-center align-center" style="gap: 12px">
<!--<v-btn icon tile :ripple="false" @click="btnActionsFnc('addLeftToRight')"> <a-button @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost :icon="icons.remove" >
<v-icon>mdi-chevron-right</v-icon>
</v-btn> -->
<a-button @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost icon="up" >
</a-button> </a-button>
<a-button @click="btnActionsFnc('addLeftToRight')" type="primary" ghost :icon="icons.add">
<!--<v-btn
icon
tile
:ripple="false"
class="mt-2"
@click="btnActionsFnc('removeRightToLeft')"
>
<v-icon>mdi-chevron-left</v-icon>
</v-btn> -->
<a-button @click="btnActionsFnc('addLeftToRight')" type="primary" ghost icon="down">
</a-button> </a-button>
</div> </div>
</template> </template>
@ -38,8 +25,18 @@ export default {
type: Function, type: Function,
required: true, required: true,
}, },
directionBtn: {
type: String,
default: "horizontally" //horizontally, vertically.
}
},
computed: {
icons() {
return this.directionBtn === "vertically"
? { remove: "up", add: "down" }
: { remove: "left", add: "right" };
},
}, },
computed: {},
data() { data() {
return {}; return {};
}, },

View File

@ -45,7 +45,7 @@ export default {
size: { size: {
type: String, type: String,
require: false, require: false,
default: "default", // small, middle, large default: "default", // small, default, large
} }
}, },
data() { data() {

View File

@ -44,8 +44,7 @@
<v-card-title> <v-card-title>
<span class="custom-title-4">비밀번호 {{ isPassword }}</span> <span class="custom-title-4">비밀번호 {{ isPassword }}</span>
</v-card-title> </v-card-title>
<v-divider></v-divider> <v-card-text class="pb-4">
<v-card-text>
<v-col> <v-col>
<label for="" class="search-box-label"> <label for="" class="search-box-label">
{{ isPassword }} 비밀번호를 입력하세요 {{ isPassword }} 비밀번호를 입력하세요
@ -73,11 +72,10 @@
></v-text-field> ></v-text-field>
</v-col> </v-col>
</v-card-text> </v-card-text>
<v-divider></v-divider> <v-card-actions class="pb-4">
<v-card-actions>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<!-- <v-btn color="primary" dark @click="setUpdate()">확인</v-btn> --> <!-- <v-btn color="primary" dark @click="setUpdate()">확인</v-btn> -->
<div> <div class="pr-3">
<a-button @click="close()" class="btn-default">삭제</a-button> <a-button @click="close()" class="btn-default">삭제</a-button>
<a-button type="primary" @click="setUpdate()" class="v-btn-add-text"> <a-button type="primary" @click="setUpdate()" class="v-btn-add-text">
확인 확인

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',

View File

@ -16,54 +16,52 @@
</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-col :cols="3.5"> <v-row align="end" class="searchFilter">
<!-- 설비그룹 --> <v-col :cols="3.5">
<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01" <!-- 설비그룹 -->
:label="'설비그룹'" :disabled="eqpmGrpDisabled" <component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01"
@update:propsValue="selectValue01 = $event" :labelCols="12" :textCols="12" :label="'설비그룹'" :disabled="eqpmGrpDisabled"
:iconShow="true" /> @update:propsValue="selectValue01 = $event" :labelCols="12" :textCols="12"
</v-col> :iconShow="true" />
<v-col :cols="3.5"> </v-col>
<!-- FAB --> <v-col :cols="3.5">
<component :is="'SelectBoxMulti'" :propsValue="selectValue02" <!-- FAB -->
:itemList="selectValueList02" :label="'FAB'" :labelCols="12" :multiple="true" <component :is="'SelectBoxMulti'" :propsValue="selectValue02"
:disabled="fabDisabled" @update:propsValue="selectValue02 = $event" :textCols="12" :itemList="selectValueList02" :label="'FAB'" :labelCols="12" :multiple="true"
:iconShow="true" /> :disabled="fabDisabled" @update:propsValue="selectValue02 = $event" :textCols="12"
</v-col> :iconShow="true" />
<v-col :cols="3.5"> </v-col>
<v-row> <v-col :cols="3.5">
<v-col :cols="12" class="py-0"> <v-row>
<label for="" class="search-box-label"> <v-col :cols="12" class="py-0">
<v-icon small :class="['mr-1', 'icon-blue']">$icoBulletPoint</v-icon> <label for="" class="search-box-label">
설비명 <v-icon small :class="['mr-1', 'icon-blue']">$icoBulletPoint</v-icon>
</label> 설비명
</v-col> </label>
<v-col :cols="12" class="pt-0"> </v-col>
<v-text-field append-icon="" class="v-input__custom" outlined <v-col :cols="12" class="pt-0">
:hide-details="true" v-model="searchWord" @keyup.enter="search"><template <v-text-field append-icon="" class="v-input__custom" outlined
v-slot:append> :hide-details="true" v-model="searchWord" @keyup.enter="search"><template
<!-- Custom SVG icon --> v-slot:append>
<v-icon>$icoSearch</v-icon> <!-- Custom SVG icon -->
<v-icon>$icoSearch</v-icon>
</template></v-text-field> </template></v-text-field>
</v-col> </v-col>
</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>

View File

@ -280,51 +280,40 @@ export default {
modalKey: this.myModalKey, modalKey: this.myModalKey,
gridKey: this.grid_01, gridKey: this.grid_01,
modalDataKey: this.modalDataKey, modalDataKey: this.modalDataKey,
value: [{ header: '위치정보', name: 'eccNm' }], value: [
{
align: 'center',
width: 30,
minWidth: 60,
formatter: (props) => {
return `<span class="custom-radio"><span class="radio-mark"></span></span>`;
}
},
{ header: '위치정보', name: 'eccNm' }
],
}); });
}, },
async getGridData() { async getGridData() {
// this.loadGrid = false; this.loadGrid = false;
// const res = await this.postApiReturn({ const res = await this.postApiReturn({
// apiKey: 'selectEccBaseInfo', apiKey: 'selectEccBaseInfo',
// resKey: 'eccBaseInfoData', resKey: 'eccBaseInfoData',
// sendParam: { sendParam: {
// blocId: this.myBindingData.blocId, blocId: this.myBindingData.blocId,
// eqpmYn: '0', eqpmYn: '0',
// search: this.searchWord, search: this.searchWord,
// }, },
// }); });
// const setTreeData = await this.setTree({ const setTreeData = await this.setTree({
// gridKey: this.gridNameTree, gridKey: this.gridNameTree,
// treeKey: 'ECC_ID', treeKey: 'ECC_ID',
// value: res.map(item => ({ value: res.map(item => ({
// ...item,
// eccNm: item.eccNm,
// })),
// });
//mockdata eccNm
let res = [
{ ECC_ID: 'ECC001', eccNm: '서울 본사', iconShow: false, align: 'center' },
{ ECC_ID: 'ECC002', eccNm: '부산 지사', useIcon: false, align: 'center' },
{ ECC_ID: 'ECC003', eccNm: '대구 센터', useIcon: false, align: 'center' },
{ ECC_ID: 'ECC004', eccNm: '광주 사무소' , useIcon: false, align: 'center'},
{ ECC_ID: 'ECC005', eccNm: '인천 물류창고' , useIcon: false, align: 'center'},
];
const setTreeData = {
ROOT: res.map(item => ({
...item, ...item,
eccNm: item.eccNm, eccNm: item.eccNm,
})) })),
}; });
// console.log(res);
this.setModalGridData({ this.setModalGridData({
modalKey: this.myModalKey, modalKey: this.myModalKey,

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) => {

View File

@ -38,7 +38,7 @@
import { mapState, mapMutations, mapActions } from 'vuex'; import { mapState, mapMutations, mapActions } from 'vuex';
import Buttons from '~/components/common/button/Buttons'; import Buttons from '~/components/common/button/Buttons';
import Grid from '~/components/common/Grid'; import Grid from '~/components/common/Grid';
import { CustumChecbox } from '~/plugins/gridUtility'; import { CustomCheckbox } from '~/plugins/gridUtility';
import { CustomNumberEditor } from '~/plugins/gridUtility'; import { CustomNumberEditor } from '~/plugins/gridUtility';
import Form from '~/components/common/form/Form'; import Form from '~/components/common/form/Form';
import mixinGlobal from '@/mixin/global.js'; import mixinGlobal from '@/mixin/global.js';

View File

@ -96,20 +96,20 @@ export default {
watch: { watch: {
selectedEqpmKindId(val) { selectedEqpmKindId(val) {
if (val) { if (val) {
this.detailList[2].eqpmKindId = val; this.detailList[1].eqpmKindId = val;
} }
}, },
selectedEqpmGrpId(val) { selectedEqpmGrpId(val) {
// if(!val){ // if(!val){
// this.detailList[2].eqpmGrpId = ''; // this.detailList[1].eqpmGrpId = '';
// }else{ // }else{
// this.detailList[2].eqpmGrpId = val; // this.detailList[1].eqpmGrpId = val;
// } // }
// if(val){ // if(val){
// this.detailList[2].eqpmGrpId = val; // this.detailList[1].eqpmGrpId = val;
// } // }
// else if(val == null || val == ''){ // else if(val == null || val == ''){
// this.detailList[2].eqpmGrpId = ''; // this.detailList[1].eqpmGrpId = '';
// } // }
}, },
}, },
@ -238,10 +238,10 @@ export default {
}, },
async getRowData(data, gridName) { async getRowData(data, gridName) {
if (data.rowStat === 'I') { if (data.rowStat === 'I') {
this.detailList[2].disabled = false; this.detailList[1].disabled = false;
this.detailList[3].disabled = false; this.detailList[3].disabled = false;
} else { } else {
this.detailList[2].disabled = true; this.detailList[1].disabled = true;
this.detailList[3].disabled = true; this.detailList[3].disabled = true;
} }
@ -257,12 +257,12 @@ export default {
switch (action) { switch (action) {
case 'add': case 'add':
this.$refs[this.gridName].addRow(); this.$refs[this.gridName].addRow();
this.detailList[2].disabled = false; this.detailList[1].disabled = false;
this.detailList[3].disabled = false; this.detailList[3].disabled = false;
break; break;
case 'remove': case 'remove':
this.detailList[2].disabled = true; this.detailList[1].disabled = true;
this.detailList[3].disabled = true; this.detailList[3].disabled = true;
this.$refs[this.gridName].removeRow(); this.$refs[this.gridName].removeRow();
break; break;
@ -358,7 +358,6 @@ const myEqpmConstDetail = [
{ {
type: 'SelectBox', type: 'SelectBox',
label: '대상 유형', label: '대상 유형',
disabled: true,
cols: 6, cols: 6,
class: 'py-3 pr-4', class: 'py-3 pr-4',
list: 'emMapDivList2', list: 'emMapDivList2',
@ -371,6 +370,7 @@ const myEqpmConstDetail = [
textCols: 12, textCols: 12,
iconShow: true, iconShow: true,
}, },
// ==================
{ {
type: 'EgrpPysclQtyPop', type: 'EgrpPysclQtyPop',
labelContent: '물리량', labelContent: '물리량',
@ -382,7 +382,7 @@ const myEqpmConstDetail = [
pysclQtyNm: 'pysclQtyNm', pysclQtyNm: 'pysclQtyNm',
}, },
valueNm: 'objId', valueNm: 'objId',
disabled: false, disabled: true,
required: true, required: true,
openMode: 'CONST', openMode: 'CONST',
cols: 6, cols: 6,
@ -413,6 +413,7 @@ const myEqpmConstDetail = [
textCols: 12, textCols: 12,
iconShow: true, iconShow: true,
}, },
// ------------
{ {
type: 'InputText', type: 'InputText',
label: '물리량 값', label: '물리량 값',

View File

@ -18,7 +18,7 @@
:innerTabGridInfo="innerTabGridInfo" :innerTabGridInfo="innerTabGridInfo"
/> />
</div> </div>
<div style="min-height: calc(100vh - 900px);"> <div style="min-height: calc(100vh - 900px);" class="mt-4">
<component <component
:is="'Form'" :is="'Form'"
:parentPrgmId="parentPrgmId" :parentPrgmId="parentPrgmId"
@ -108,18 +108,24 @@ export default {
}, },
watch: { watch: {
selectedObjId(val) { selectedObjId(val) {
// console.log('selectedObjId : ', val);
if (val === 'TAG') { if (val === 'TAG') {
// this.detailList[1].class = 'py-3 pl-4 pb-0';
this.detailList[1].class = 'py-3 d-none';
this.detailList[2].class = 'py-3 d-none'; this.detailList[2].class = 'py-3 d-none';
this.detailList[3].class = 'py-3 pl-4 pt-1 d-none'; this.detailList[3].class = 'py-3 pl-4 pt-1 d-none';
this.detailList[4].class = 'py-3'; this.detailList[4].class = 'py-3';
this.detailList[5].class = 'py-3'; this.detailList[5].class = 'py-3 pl-4';
this.detailList[6].class = 'py-3 pl-4 pt-0';
} else { } else {
// }else if(val==="READ_PLC"){ // }else if(val==="READ_PLC"){
this.detailList[5].class = 'py-3 d-none'; this.detailList[1].class = 'py-3 pl-4';
this.detailList[4].class = 'py-3 d-none';
this.detailList[3].class = 'py-3 pl-4 pt-1';
this.detailList[2].class = 'py-3'; this.detailList[2].class = 'py-3';
this.detailList[3].class = 'py-3 pl-4 pt-0';
this.detailList[4].class = 'py-3 d-none';
this.detailList[5].class = 'py-3 d-none';
this.detailList[6].class = 'py-3 d-none';
} }
}, },
selectedCalcFg(val) { selectedCalcFg(val) {
@ -282,13 +288,13 @@ export default {
async getRowData(data, gridName) { async getRowData(data, gridName) {
if (data.rowStat === 'I') { if (data.rowStat === 'I') {
this.detailList[0].disabled = false; this.detailList[0].disabled = false;
this.detailList[2].disabled = false; this.detailList[1].disabled = false;
this.detailList[3].disabled = false; this.detailList[3].disabled = false;
this.detailList[4].disabled = false; this.detailList[4].disabled = false;
this.detailList[5].disabled = false; this.detailList[5].disabled = false;
} else { } else {
this.detailList[0].disabled = true; this.detailList[0].disabled = true;
this.detailList[2].disabled = true; this.detailList[1].disabled = true;
this.detailList[3].disabled = true; this.detailList[3].disabled = true;
this.detailList[4].disabled = true; this.detailList[4].disabled = true;
this.detailList[5].disabled = true; this.detailList[5].disabled = true;
@ -306,7 +312,7 @@ export default {
case 'add': case 'add':
this.$refs[this.gridName].addRow(); this.$refs[this.gridName].addRow();
this.detailList[0].disabled = false; this.detailList[0].disabled = false;
this.detailList[2].disabled = false; this.detailList[1].disabled = false;
this.detailList[3].disabled = false; this.detailList[3].disabled = false;
this.detailList[4].disabled = false; this.detailList[4].disabled = false;
this.detailList[5].disabled = false; this.detailList[5].disabled = false;
@ -315,7 +321,7 @@ export default {
case 'remove': case 'remove':
this.$refs[this.gridName].removeRow(); this.$refs[this.gridName].removeRow();
this.detailList[0].disabled = true; this.detailList[0].disabled = true;
this.detailList[2].disabled = true; this.detailList[1].disabled = true;
this.detailList[3].disabled = true; this.detailList[3].disabled = true;
this.detailList[4].disabled = true; this.detailList[4].disabled = true;
this.detailList[5].disabled = true; this.detailList[5].disabled = true;
@ -436,10 +442,10 @@ const myEqpmIaoDetail = [
type: 'ReadPlcPop', type: 'ReadPlcPop',
label: '대상 항목', label: '대상 항목',
valueNm: 'objId', valueNm: 'objId',
disabled: true,
cols: 6, cols: 6,
class: 'py-3 pl-4', class: 'py-3 pl-4 pb-0',
required: true, required: true,
disabled: true,
bindNm: 'objNm', bindNm: 'objNm',
textCols: 12, textCols: 12,
labelCols: 12, labelCols: 12,
@ -460,11 +466,12 @@ const myEqpmIaoDetail = [
readonly: true, readonly: true,
disabled: true, disabled: true,
cols: 6, cols: 6,
class: 'py-3 pl-4 pt-1', class: 'py-3 pl-4 pt-0',
textCols: 12, textCols: 12,
labelCols: 12, labelCols: 12,
iconShow: true iconShow: true
}, },
// ============
{ {
type: 'EvtObjPop', type: 'EvtObjPop',
labelContent: '대상 항목', labelContent: '대상 항목',
@ -474,16 +481,24 @@ const myEqpmIaoDetail = [
disabled: true, disabled: true,
required: true, required: true,
cols: 6, cols: 6,
class: 'py-3 d-none', class: 'py-3 pl-4 d-none',
disableContent: true, disableContent: true,
textCols: 12, textCols: 12,
labelCols: 12, labelCols: 12,
iconShow: true iconShow: true
}, },
{ {
type: 'InputText', type: 'Label',
cols: 6, cols: 6,
class: 'py-3 d-none', class: 'py-3 d-none',
disabled: true,
textCols: 12,
labelCols: 12,
},
{
type: 'InputText',
cols: 6,
class: 'py-3 pl-4 d-none',
valueNm: 'objNm', valueNm: 'objNm',
readonly: true, readonly: true,
disabled: true, disabled: true,
@ -491,6 +506,7 @@ const myEqpmIaoDetail = [
labelCols: 12, labelCols: 12,
iconShow: true iconShow: true
}, },
// --------------------------------------------
{ {
type: 'SelectBox', type: 'SelectBox',
label: '에너지원', label: '에너지원',

View File

@ -30,7 +30,7 @@
import { mapState, mapMutations, mapActions } from 'vuex'; import { mapState, mapMutations, mapActions } from 'vuex';
import Buttons from '~/components/common/button/Buttons'; import Buttons from '~/components/common/button/Buttons';
import Grid from '~/components/common/Grid'; import Grid from '~/components/common/Grid';
import { CustumChecbox } from '~/plugins/gridUtility'; import { CustomCheckbox } from '~/plugins/gridUtility';
import { CustomNumberEditor } from '~/plugins/gridUtility'; import { CustomNumberEditor } from '~/plugins/gridUtility';
import Form from '~/components/common/form/Form'; import Form from '~/components/common/form/Form';
import mixinGlobal from '@/mixin/global.js'; import mixinGlobal from '@/mixin/global.js';
@ -185,7 +185,7 @@ export default {
align: 'center', align: 'center',
width: 100, width: 100,
// renderer: { // renderer: {
// type: CustumChecbox, // type: CustomCheckbox,
// options: { // options: {
// onlyone: true, // onlyone: true,
// // disabled: true // // disabled: true

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>
@ -40,16 +39,16 @@
<v-menu offset-y> <v-menu offset-y>
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, attrs }">
<a-button <a-button
:ripple="false" :ripple="false"
tile tile
class="btn-header" class="btn-header"
v-bind="attrs" v-bind="attrs"
v-on="on" v-on="on"
style="width: 100px" style="width: 100px"
> >
<span class="body-2">즐겨찾기</span> <span class="body-2">즐겨찾기</span>
<v-icon size="20">mdi-chevron-down</v-icon> <v-icon size="20">mdi-chevron-down</v-icon>
</a-button> </a-button>
<!-- <a-button style="width: 100px; height: 36px" class="btn-header"> <!-- <a-button style="width: 100px; height: 36px" class="btn-header">
<span class="body-2">즐겨찾기</span> <span class="body-2">즐겨찾기</span>
<v-icon size="20">mdi-chevron-down</v-icon></a-button> --> <v-icon size="20">mdi-chevron-down</v-icon></a-button> -->
@ -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,
}); });

View File

@ -57,7 +57,7 @@ module.exports = {
], ],
// Modules: https://go.nuxtjs.dev/config-modules // Modules: https://go.nuxtjs.dev/config-modules
modules: ['@nuxtjs/axios', '@nuxtjs/dayjs', '@nuxtjs/style-resources','@nuxtjs/google-fonts'], modules: ['@nuxtjs/axios', '@nuxtjs/dayjs', '@nuxtjs/style-resources' ],
styleResources: { styleResources: {
scss: ['./assets/scss/*.scss'], scss: ['./assets/scss/*.scss'],
}, },

View File

@ -342,7 +342,7 @@ export default {
//---------------------gridOption 설정 끝---------------------------- //---------------------gridOption 설정 끝----------------------------
//---------------------gridName3의 체크박스 설정 시작---------------------------- //---------------------gridName3의 체크박스 설정 시작----------------------------
class CustumChecbox { class CustomCheckbox {
constructor(props) { constructor(props) {
const el = document.createElement('input'); const el = document.createElement('input');
const { grid, rowKey, columnInfo } = props; const { grid, rowKey, columnInfo } = props;
@ -398,14 +398,11 @@ export default {
const myTreeColumns = [ const myTreeColumns = [
{ {
header: '',
name: '',
align: 'center', align: 'center',
width: 30, width: 30,
minWidth: 60,
formatter: (props) => { formatter: (props) => {
return `<span class="custom-radio"> return `<span class="custom-radio"><span class="radio-mark"></span></span>`;
<span class="radio-mark"></span>
</span>`;
} }
}, },
{ {
@ -421,14 +418,11 @@ export default {
]; ];
const myTreeColumns2 = [ const myTreeColumns2 = [
{ {
header: '',
name: '',
align: 'center', align: 'center',
width: 30, width: 30,
minWidth: 60,
formatter: (props) => { formatter: (props) => {
return `<span class="custom-radio"> return `<span class="custom-radio"><span class="radio-mark"></span></span>`;
<span class="radio-mark"></span>
</span>`;
} }
}, },
{ header: '역할ID', name: 'roleId', hidden: true }, { header: '역할ID', name: 'roleId', hidden: true },
@ -439,7 +433,7 @@ export default {
name: 'useFg', name: 'useFg',
align: 'center', align: 'center',
renderer: { renderer: {
type: CustumChecbox, type: CustomCheckbox,
}, },
}, },
{ {
@ -447,7 +441,7 @@ export default {
name: 'authCd1', name: 'authCd1',
align: 'center', align: 'center',
renderer: { renderer: {
type: CustumChecbox, type: CustomCheckbox,
}, },
}, },
{ {
@ -455,7 +449,7 @@ export default {
name: 'authCd2', name: 'authCd2',
align: 'center', align: 'center',
renderer: { renderer: {
type: CustumChecbox, type: CustomCheckbox,
}, },
}, },
{ {
@ -463,7 +457,7 @@ export default {
name: 'authCd3', name: 'authCd3',
align: 'center', align: 'center',
renderer: { renderer: {
type: CustumChecbox, type: CustomCheckbox,
}, },
}, },
{ {
@ -471,7 +465,7 @@ export default {
name: 'authCd4', name: 'authCd4',
align: 'center', align: 'center',
renderer: { renderer: {
type: CustumChecbox, type: CustomCheckbox,
}, },
}, },
{ {
@ -479,7 +473,7 @@ export default {
name: 'authCd5', name: 'authCd5',
align: 'center', align: 'center',
renderer: { renderer: {
type: CustumChecbox, type: CustomCheckbox,
}, },
}, },
{ {
@ -487,7 +481,7 @@ export default {
name: 'authCd6', name: 'authCd6',
align: 'center', align: 'center',
renderer: { renderer: {
type: CustumChecbox, type: CustomCheckbox,
}, },
}, },
]; ];
@ -674,8 +668,6 @@ export default {
}, },
getUnAsgnRowData(data) { getUnAsgnRowData(data) {
console.log("------------------DEBUG-------getUnAsgnRowData:", data);
const getRowData = data; const getRowData = data;
this.leftSelectRowData = Object.assign({}, getRowData); this.leftSelectRowData = Object.assign({}, getRowData);
}, },

View File

@ -151,6 +151,7 @@
:leftGridName="gridName2" :leftGridName="gridName2"
:rightGridName="gridName3" :rightGridName="gridName3"
:btnActionsFnc="dualGridBtnActions" :btnActionsFnc="dualGridBtnActions"
directionBtn="vertically"
/> />
</v-col> </v-col>
<v-col :cols="12" class="h100"> <v-col :cols="12" class="h100">
@ -981,7 +982,7 @@ const myDetail = blocCdList => {
cols: 6, cols: 6,
labelCols: 12, labelCols: 12,
textCols: 12, textCols: 12,
class: 'py-2 pr-4', class: 'py-2 pl-4',
iconShow: true, iconShow: true,
required: true, required: true,
}, },
@ -1005,7 +1006,7 @@ const myDetail = blocCdList => {
cols: 6, cols: 6,
labelCols: 12, labelCols: 12,
textCols: 12, textCols: 12,
class: 'py-2 pr-4', class: 'py-2 pl-4',
iconShow: true, iconShow: true,
required: true, required: true,
}, },
@ -1031,7 +1032,7 @@ const myDetail = blocCdList => {
cols: 6, cols: 6,
labelCols: 12, labelCols: 12,
textCols: 12, textCols: 12,
class: 'py-2 pr-4', class: 'py-2 pl-4',
iconShow: true, iconShow: true,
}, },
{ {
@ -1054,7 +1055,7 @@ const myDetail = blocCdList => {
cols: 6, cols: 6,
labelCols: 12, labelCols: 12,
textCols: 12, textCols: 12,
class: 'py-2 pr-4', class: 'py-2 pl-4',
iconShow: true, iconShow: true,
placeholder: '시스템 자동입력', placeholder: '시스템 자동입력',
}, },
@ -1078,7 +1079,7 @@ const myDetail = blocCdList => {
cols: 6, cols: 6,
labelCols: 12, labelCols: 12,
textCols: 12, textCols: 12,
class: 'py-2 pr-4', class: 'py-2 pl-4',
iconShow: true, iconShow: true,
placeholder: '시스템 자동입력', placeholder: '시스템 자동입력',
}, },

View File

@ -10,7 +10,7 @@
<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')" :ripple="false" <a-button type="primary" @click="listPageButtonGroupClickEvent('write')" :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>

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">
@ -314,7 +315,6 @@ export default {
}); });
}, },
async getRowData(data, gridName) { async getRowData(data, gridName) {
// console.log("-----------------------DEBUG--getRowData--------------", {
// gridKey: gridName, // gridKey: gridName,
// gridSelect: true, // gridSelect: true,
// rowGridSelectKey: data.rowKey, // rowGridSelectKey: data.rowKey,

View File

@ -4,7 +4,7 @@
<v-col :cols="12"> <v-col :cols="12">
<v-card class="searchFilter"> <v-card class="searchFilter">
<v-row align="center" no-gutters> <v-row align="center" no-gutters>
<v-col :cols="3"> <v-col :cols="2.5">
<component <component
:is="'selectCodeList'" :is="'selectCodeList'"
:parentPrgmId="myPrgmId" :parentPrgmId="myPrgmId"
@ -14,7 +14,7 @@
:addAll="true" :addAll="true"
/> />
</v-col> </v-col>
<v-col :cols="3"> <v-col :cols="2.5">
<component <component
:is="'selectCodeList'" :is="'selectCodeList'"
:parentPrgmId="myPrgmId" :parentPrgmId="myPrgmId"
@ -24,8 +24,8 @@
:addAll="true" :addAll="true"
/> />
</v-col> </v-col>
<v-col :cols="3"> <!-- 사업장 -->
<!-- 사업장 --> <!-- <v-col :cols="3">
<div style="visibility:hidden"> <div style="visibility:hidden">
<component <component
:is="'SelectBlocMstr'" :is="'SelectBlocMstr'"
@ -33,13 +33,8 @@
:parentPrgmId="myPrgmId" :parentPrgmId="myPrgmId"
/> />
</div> </div>
</v-col> </v-col> -->
<v-col :cols="3" class="text-right"> <v-col :cols="2.5">
<BtnSearch @click="search" />
</v-col>
</v-row>
<v-row align="center" no-gutters>
<v-col :cols="3">
<component <component
:is="'selectCodeList'" :is="'selectCodeList'"
:parentPrgmId="myPrgmId" :parentPrgmId="myPrgmId"
@ -49,7 +44,7 @@
:addAll="true" :addAll="true"
/> />
</v-col> </v-col>
<v-col :cols="6"> <v-col :cols="2.5">
<InputText <InputText
:parentPrgmId="myPrgmId" :parentPrgmId="myPrgmId"
label="공정명" label="공정명"
@ -59,6 +54,12 @@
:searchOption="true" :searchOption="true"
/> />
</v-col> </v-col>
<v-col class="text-right">
<BtnSearch @click="search" />
</v-col>
</v-row>
<v-row align="center" no-gutters>
</v-row> </v-row>
</v-card> </v-card>
</v-col> </v-col>

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">
@ -969,7 +969,7 @@ const myDetail = [
labelCols: 12, labelCols: 12,
textCols: 12, textCols: 12,
iconShow: true, iconShow: true,
class: 'py-3 pr-4', class: 'py-3 pr-4 pb-2',
}, },
{ {
type: 'CheckBox', type: 'CheckBox',

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">
@ -282,7 +283,6 @@ export default {
mgnf: item.mgnf || 0, mgnf: item.mgnf || 0,
})), })),
}); });
// console.log('--------------DEBUG-----res-------', res);
} }
this.setPageData({ isFind: false }); this.setPageData({ isFind: false });
this.$nextTick(() => { this.$nextTick(() => {

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">
<!-- 조회버튼 --> <!-- 조회버튼 -->

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,8 +319,7 @@ 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",

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" />
@ -245,7 +245,6 @@ export default {
this.setChartOption({ chartKey: this.chartName, value: chartOption }); this.setChartOption({ chartKey: this.chartName, value: chartOption });
// console.log("----DEBUG chart-options-------", { chartOption });
this.$nextTick(() => { this.$nextTick(() => {
this.loadChart = true; this.loadChart = true;
}); });

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;
@ -264,9 +266,6 @@ export default {
}, },
created() { }, created() { },
async mounted() { async mounted() {
// console.log('----DEBUG---');
// await this.initTest();
// End Debug Test---
await this.init(); await this.init();
this.initedFlag = true; this.initedFlag = true;
}, },
@ -287,7 +286,7 @@ export default {
}), }),
async initTest() { async initTest() {
// debug test // debug test
console.log('----DEBUG init pages----'); // console.log('----DEBUG init pages----');
const seriesName1 = ['B01. 냉동기전력량', ' B01.COP']; const seriesName1 = ['B01. 냉동기전력량', ' B01.COP'];
const seriesName2 = [ const seriesName2 = [
'UT_HT_CH101:냉동기전혁당', 'UT_HT_CH102:냉동기전력량', 'UT_HT_CH201:냉동기전력당', 'UT_HT_CH101:냉동기전혁당', 'UT_HT_CH102:냉동기전력량', 'UT_HT_CH201:냉동기전력당',
@ -767,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 });
@ -867,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});

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",

View File

@ -10,15 +10,15 @@
</v-col> </v-col>
<v-col :cols="2.5"> <v-col :cols="2.5">
<component :is="'SelectBox'" ref="SelectBox1" :propsValue="selectValue01" :itemList="selectValueList01" <component :is="'SelectBox'" ref="SelectBox1" :propsValue="selectValue01" :itemList="selectValueList01"
:label="'FAB'" @update:propsValue="selectValue01 = $event" :iconShow="false" customClass="select-large" /> :label="'FAB'" @update:propsValue="selectValue01 = $event" :iconShow="true" customClass="select-large" />
</v-col> </v-col>
<v-col :cols="2.5"> <v-col :cols="2.5">
<component :is="'SelectBox'" ref="SelectBox2" :propsValue="selectValue02" :itemList="selectValueList02" <component :is="'SelectBox'" ref="SelectBox2" :propsValue="selectValue02" :itemList="selectValueList02"
:label="'설비종류'" @update:propsValue="selectValue02 = $event" :iconShow="false" customClass="select-large"/> :label="'설비종류'" @update:propsValue="selectValue02 = $event" :iconShow="true" customClass="select-large"/>
</v-col> </v-col>
<v-col :cols="2.5"> <v-col :cols="2.5">
<component :is="'SelectBox'" ref="SelectBox3" :propsValue="selectValue03" :itemList="selectValueList03" <component :is="'SelectBox'" ref="SelectBox3" :propsValue="selectValue03" :itemList="selectValueList03"
:label="'설비그룹'" @update:propsValue="selectValue03 = $event" :iconShow="false" customClass="select-large" /> :label="'설비그룹'" @update:propsValue="selectValue03 = $event" :iconShow="true" customClass="select-large" />
</v-col> </v-col>
<BtnSearch size="large" @click="search" /> <BtnSearch size="large" @click="search" />
@ -33,7 +33,7 @@
<v-row ref="contents"> <v-row ref="contents">
<v-col :cols="12" > <v-col :cols="12" >
<v-card class="pb-5"> <v-card class="pb-5">
<div class="d-flex align-center justify-space-between pa-4"> <div class="d-flex align-center justify-space-between py-4 px-4">
<v-card-title class="pa-0 custom-title-4">설비별 에너지 계획 리스트</v-card-title> <v-card-title class="pa-0 custom-title-4">설비별 에너지 계획 리스트</v-card-title>
<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" /> <Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
</div> </div>
@ -291,7 +291,7 @@ export default {
}, },
}; };
class CustumButton { class CustomButton {
constructor(props) { constructor(props) {
const { grid, rowKey, columnInfo } = props; const { grid, rowKey, columnInfo } = props;
@ -304,7 +304,7 @@ export default {
$(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between'); $(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between');
const el2 = document.createElement('button'); const el2 = document.createElement('button');
$(el2).addClass('edit-btn blue--text'); $(el2).addClass('edit-btn blue--text');
el2.innerText = 'Edit'; el2.innerText = '편집하다';
elDiv.appendChild(el2); elDiv.appendChild(el2);
this.el = elDiv; this.el = elDiv;
@ -352,7 +352,7 @@ export default {
header: 'NO', header: 'NO',
name: 'rowNum', name: 'rowNum',
width: 40, width: 40,
align: 'center', align: 'right',
// hidden: true, // hidden: true,
}, },
{ {
@ -389,7 +389,7 @@ export default {
// `; // `;
// } // }
renderer: { renderer: {
type: CustumButton, type: CustomButton,
options: { options: {
value: '계획수정', value: '계획수정',
}, },
@ -402,7 +402,7 @@ export default {
align: 'center', align: 'center',
hidden: true, hidden: true,
renderer: { renderer: {
type: CustumButton, type: CustomButton,
options: { options: {
value: '계획수정', value: '계획수정',
}, },

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];

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>

File diff suppressed because it is too large Load Diff

View File

@ -115,7 +115,7 @@ export class CustomCalcNumberEditor {
} }
} }
export class CustumChecbox { export class CustomCheckbox {
constructor(props) { constructor(props) {
const el = document.createElement('input'); const el = document.createElement('input');
const { grid, rowKey, columnInfo } = props; const { grid, rowKey, columnInfo } = props;
@ -169,7 +169,7 @@ export class CustumChecbox {
} }
} }
export class CustumButton { export class CustomButton {
constructor(props) { constructor(props) {
const el = document.createElement('button'); const el = document.createElement('button');
const { grid, rowKey, columnInfo } = props; const { grid, rowKey, columnInfo } = props;