diff --git a/assets/scss/common.scss b/assets/scss/common.scss index 0fac17b..f3d3a69 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -266,7 +266,7 @@ a { } &>.v-treeview-node__root:hover:before { - opacity: 1 !important; + opacity: 0 !important; } .v-treeview-node__children { @@ -280,13 +280,17 @@ a { .v-treeview-node--click[aria-expanded="true"] { &>.v-treeview-node__root:before { - opacity: 1 !important; + opacity: 0 !important; } } .v-treeview-node[aria-expanded="true"] { - &>.v-treeview-node__root>.v-treeview-node__content>.v-treeview-node__label>button>.v-icon.mdi-chevron-down { - transform: rotate(-180deg); + &>.v-treeview-node__root>.v-treeview-node__content + >.v-treeview-node__label>button { + >.anticon, + >.v-icon.mdi-chevron-down { + transform: rotate(-180deg); + } } } @@ -298,15 +302,17 @@ a { // justify-content: center; } + & .anticon, & .v-icon.mdi-chevron-down { margin-left: auto; + animation-duration: 0.5s; } } } .v-treeview-node--active { &:before { - opacity: 1 !important; + opacity: 0 !important; } } @@ -322,7 +328,8 @@ a { .v-treeview-node__content span:not(.v-icon), .v-treeview-node__root>button, .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; } @@ -474,7 +481,7 @@ a { .header { background-color: map-deep-get($config, #{$theme}, "header-backgroud"); - border-color: #D3D6EA; + border-bottom: 1px solid map-deep-get($config, #{$theme}, "v-header-border"); } .btn-header { @@ -489,6 +496,7 @@ a { .menu-container { height:calc(100vh - 60px); overflow-y: auto; + border-right: 1px solid map-deep-get($config, #{$theme}, "v-sidebar-border") ; } } @@ -614,36 +622,36 @@ a { .v-navigation-drawer__append { >p { - @if $theme ==dark { - color: rgba(255, 255, 255, 0.6); - } + color: map-deep-get($config, #{$theme}, "v-banner-border-color" ) !important; + // @if $theme ==dark { + // color: rgba(255, 255, 255, 0.6); + // } - @else { - color: #999; - } + // @else { + // color: #999; + // } } } - .v-footer { - @if $theme ==light { - background-color: #dfdfe5; - color: #767d83; - } - } + // .v-footer { + // @if $theme ==light { + // background-color: #dfdfe5; + // color: #767d83; + // } + // } - .bd { - @if $theme ==dark { - &-r-1 { - border-right: 1px #373f45 solid; - } - } - - @else { - &-r-1 { - border-right: 1px #efefef solid; - } - } - } + // .bd { + // @if $theme ==dark { + // &-r-1 { + // border-right: 1px #373f45 solid; + // } + // } + // @else { + // &-r-1 { + // border-right: 1px #efefef solid; + // } + // } + // } .border-bottom-1 { border-bottom: 1px solid map-deep-get($config, #{$theme}, "border-color"); @@ -691,256 +699,224 @@ a { } &>.v-treeview-node { - &>.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" - ); - } - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-root-icon-color" - ); - } - } - + .v-treeview-node__root { + border-radius: 8px; &: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" - ); - } - } + background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-border-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" - ); - } - - &>.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__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" - ); + color: map-deep-get($config, #{$theme}, "tui-grid-title-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" + // // ); + // // } + // // } + // // } + // } + // } + } } diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss index b335418..39ee11e 100644 --- a/assets/scss/common/grid.scss +++ b/assets/scss/common/grid.scss @@ -98,6 +98,12 @@ @include theme($theme); .v-application.#{$theme}-mode { + .tui-grid-content-area{ + .tui-grid-header-area{ + height: auto !important; + } + } + .grid-title { font-weight: 600; font-size: 16px; @@ -109,6 +115,15 @@ ); } + .grid-toggle-section{ + .tui-grid-rside-area{ + .tui-grid-body-area { + height: auto !important; + + } + } + } + .tui-grid { &-table { border: 1px solid; @@ -299,13 +314,13 @@ #{$theme}, "tui-grid-cell-borderColor" ); - .tui-grid-cell-content { - border-right: 1px solid ; - border-right-color: map-deep-get($config, - #{$theme}, - "tui-grid-cell-borderColor" - ); - } + // .tui-grid-cell-content { + // border-right: 1px solid ; + // border-right-color: map-deep-get($config, + // #{$theme}, + // "tui-grid-cell-borderColor" + // ); + // } } } diff --git a/assets/scss/var.scss b/assets/scss/var.scss index 11d3973..8357c06 100644 --- a/assets/scss/var.scss +++ b/assets/scss/var.scss @@ -174,6 +174,8 @@ $config: ( btn-header-select-bg: #1F1F1F, btn-header-select-color:#FFFFFFD9, subtitle-tab: #FFFFFFA6, + v-header-border: #424242, + v-sidebar-border: #303030, ), light: (w-g5: $--color-gray_555, g5-w: $--color-white, @@ -312,5 +314,7 @@ $config: ( btn-header-select-color:#1F1F1F, btn-header-select-bg:#FFFFFF, subtitle-tab: #000000A6, + v-header-border: #D9D9D9, + v-sidebar-border: #F0F0F0, ), ); \ No newline at end of file diff --git a/components/common/Grid.vue b/components/common/Grid.vue index 4efae23..1641bd4 100644 --- a/components/common/Grid.vue +++ b/components/common/Grid.vue @@ -4,12 +4,12 @@ :data="chkGridData" :columns="chkGridColumns" :options="chkGridOptions" - @mousedown="onMousedown" @click="startEditing" @editingFinish="editingFinish" @dblclick="dblClick" @mouseover="mouseoverEvent" @mouseout="mouseoutEvent" + @mousedown="onMousedown" @focusChange="focusChangeEvt" /> @@ -251,11 +251,9 @@ export default { this.gridInstance.invoke('check', rowData.rowKey, instance); }, setSelectionRange(rowKey) { - // console.log("------------------DEBUG-------setSelectionRange:", rowKey); const rowDatas = this.gridInstance.invoke('getData'); rowDatas.forEach(item => { if (item.rowKey == rowKey) { - // console.log("------------------DEBUG-------setSelectionRange---item:", item); this.gridInstance.invoke( 'addRowClassName', item.rowKey, @@ -271,11 +269,14 @@ export default { }); }, onMousedown(evt) { - // console.log("------------------DEBUG-------onMousedown:", evt); - this.focusChangeEvt(evt); + this.handleSelectedRow(evt); }, focusChangeEvt(e) { - // console.log("------------------DEBUG-------focusChangeEvt:", e); + if(e.rowKey === 0) { + this.handleSelectedRow(e); + } + }, + handleSelectedRow(e) { // console.log('focusChangeEvt1...') if (this.preventFocusChangeEvent(e)) { // console.log('prevent focusChangeEvt') @@ -283,7 +284,7 @@ export default { } // console.log('focusChangeEvt2...') // cell 선택시 row 선택 method - if (e.rowKey >= 0) { + if (e.rowKey > -1) { this.$emit( 'getRowsData', this.gridInstance.invoke('getRow', e.rowKey), @@ -296,7 +297,6 @@ export default { this.sendSelectedRowData(e.rowKey); }, startEditing(e) { - // console.log("------------------DEBUG-------startEditing:", e); // console.log('startEditing1...') if (this.preventFocusChangeEvent(e)) { // console.log('prevent startEditing') @@ -323,7 +323,6 @@ export default { } }, async editingFinish(e) { - // console.log('------------------DEBUG-------editingFinish:', e); // console.log("Editing END E::", e); // editor 간 이동시 수정되는 문제 수정 // e.rowEditingFg: grid의 한 row를 한번에 수정할 시 각각의 cell 마다 click 이벤트가 발생하지 않아 this.editorStartKey값이 제대로 입력 되지 않는 경우를 대비하여 만든 Fg @@ -685,7 +684,6 @@ export default { ? this.gridInstance.invoke('getFocusedCell').rowKey : eventRowKey; var rowData = this.gridInstance.invoke('getRow', rowKey); - // console.log('------------------DEBUG-------sendSelectedRowData:', {eventRowKey, rowKey}); this.$emit('sendSelectedRowStatInfo', rowData); } }, diff --git a/components/common/PastRsltDatePicker.vue b/components/common/PastRsltDatePicker.vue index 67933f9..13dddae 100644 --- a/components/common/PastRsltDatePicker.vue +++ b/components/common/PastRsltDatePicker.vue @@ -9,7 +9,7 @@ -
+
-
- - +
+ - - - +
@@ -38,8 +25,18 @@ export default { type: Function, 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() { return {}; }, diff --git a/components/common/button/BtnExcelDownload.vue b/components/common/button/BtnExcelDownload.vue index abdcc36..95506f5 100644 --- a/components/common/button/BtnExcelDownload.vue +++ b/components/common/button/BtnExcelDownload.vue @@ -45,7 +45,7 @@ export default { size: { type: String, require: false, - default: "default", // small, middle, large + default: "default", // small, default, large } }, data() { diff --git a/components/common/modal/ChangeUserPswdPopPage.vue b/components/common/modal/ChangeUserPswdPopPage.vue index 7671d38..fc188b7 100644 --- a/components/common/modal/ChangeUserPswdPopPage.vue +++ b/components/common/modal/ChangeUserPswdPopPage.vue @@ -44,8 +44,7 @@ 비밀번호 {{ isPassword }} - - + - - + -
+
삭제 확인 diff --git a/components/common/modal/ElecPowChrgPop.vue b/components/common/modal/ElecPowChrgPop.vue index c2e7770..56efac4 100644 --- a/components/common/modal/ElecPowChrgPop.vue +++ b/components/common/modal/ElecPowChrgPop.vue @@ -58,7 +58,7 @@
- + - + - + -
+ + - + + + 초기화 +
@@ -310,7 +335,11 @@ export default { }, // 공정/설비 트리 그리드 세팅 gridInit() { - const myOptions = {}; + const myOptions = { + header: { + height: 38, + }, + }; this.setModalGridOption({ modalKey: this.myModalKey, gridKey: this.gridName, @@ -606,11 +635,11 @@ const myColumns = [ { header: '전력계약 ID', name: 'eleclContId', hidden: true}, { header: '전력계약 명', name: 'eleclContNm', hidden: true}, { header: '전력계약구분CD', name: 'elecContKind', hidden: true}, - { header: '전력계약구분', name: 'elecContKindNm', align: 'center'}, + { header: '전력계약구분', name: 'elecContKindNm', align: 'left'}, { header: '전압구분CD', name: 'voltKind', hidden: true }, - { header: '전압구분', name: 'voltKindNm', align: 'center' }, + { header: '전압구분', name: 'voltKindNm', align: 'left' }, { header: '옵션CD', name: 'optKind', hidden: true }, - { header: '옵션', name: 'optKindNm', align: 'center' }, + { header: '옵션', name: 'optKindNm', align: 'left' }, { header: '기본요금(원/kW)', name: 'baseChrg', @@ -620,7 +649,7 @@ const myColumns = [ }, }, { header: '시간대CD', name: 'peakKind', hidden: true }, - { header: '시간대', name: 'peakKindNm', align: 'center' }, + { header: '시간대', name: 'peakKindNm', align: 'left' }, { header: '여름철(6~8월)', name: 'unitPrcSum', diff --git a/components/common/modal/EqpmSelectPop.vue b/components/common/modal/EqpmSelectPop.vue index 0fe794e..959de8b 100644 --- a/components/common/modal/EqpmSelectPop.vue +++ b/components/common/modal/EqpmSelectPop.vue @@ -16,54 +16,52 @@ - - + + 설비 선택
- - - - - - - - - - - - - - - - - + - - - 조회 - - - - + + + 조회 + +
-
-
+ + +
-
+ + 닫기 확인 diff --git a/components/common/modal/FtnPlcFormPop.vue b/components/common/modal/FtnPlcFormPop.vue index 7ccbe47..f577a6e 100644 --- a/components/common/modal/FtnPlcFormPop.vue +++ b/components/common/modal/FtnPlcFormPop.vue @@ -280,52 +280,41 @@ export default { modalKey: this.myModalKey, gridKey: this.grid_01, modalDataKey: this.modalDataKey, - value: [{ header: '위치정보', name: 'eccNm' }], + value: [ + { + align: 'center', + width: 30, + minWidth: 60, + formatter: (props) => { + return ``; + } + }, + { header: '위치정보', name: 'eccNm' } + ], }); }, async getGridData() { - // this.loadGrid = false; + this.loadGrid = false; - // const res = await this.postApiReturn({ - // apiKey: 'selectEccBaseInfo', - // resKey: 'eccBaseInfoData', - // sendParam: { - // blocId: this.myBindingData.blocId, - // eqpmYn: '0', - // search: this.searchWord, - // }, - // }); + const res = await this.postApiReturn({ + apiKey: 'selectEccBaseInfo', + resKey: 'eccBaseInfoData', + sendParam: { + blocId: this.myBindingData.blocId, + eqpmYn: '0', + search: this.searchWord, + }, + }); - // const setTreeData = await this.setTree({ - // gridKey: this.gridNameTree, - // treeKey: 'ECC_ID', - // 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 => ({ + const setTreeData = await this.setTree({ + gridKey: this.gridNameTree, + treeKey: 'ECC_ID', + value: res.map(item => ({ ...item, eccNm: item.eccNm, - })) - }; + })), + }); - // console.log(res); - this.setModalGridData({ modalKey: this.myModalKey, gridKey: this.grid_01, diff --git a/components/common/modal/TagTrndTagPop.vue b/components/common/modal/TagTrndTagPop.vue index fa0b2d4..1eccc1d 100644 --- a/components/common/modal/TagTrndTagPop.vue +++ b/components/common/modal/TagTrndTagPop.vue @@ -273,9 +273,9 @@ export default { }); }, async created() { - // await this.setSelectValueList01(); - // await this.setSelectValueList02(); - // await this.setSelectValueList03(); + await this.setSelectValueList01(); + await this.setSelectValueList02(); + await this.setSelectValueList03(); this.init(); // if(this.searchParam.isMulti == true){ // this.setPageData({ @@ -487,40 +487,40 @@ export default { eqpmId: this.selectValue03, searchWord: this.searchWord, }; - let res = [ - { - eqpmGrpNm: "냉각 시스템", - eqpmGrpId: "GRP001", - eqpmId: "EQ001", - eqpmNm: "냉각기 A", - tagId: "TAG001-001", - tagNm: "냉각 온도 센서", - rowStat: "I", - }, - { - eqpmGrpNm: "전력 시스템", - eqpmGrpId: "GRP002", - eqpmId: "EQ002", - eqpmNm: "변압기 B", - tagId: "TAG002-002", - tagNm: "전류 센서", - rowStat: "U", - }, - { - eqpmGrpNm: "공기압 시스템", - eqpmGrpId: "GRP003", - eqpmId: "EQ003", - eqpmNm: "압축기 C", - tagId: "TAG003-003", - tagNm: "압력 센서", - rowStat: "D", - }, - ]; - // res = await this.postApiReturn({ - // apiKey: "selectTagAndEqpmList", - // resKey: "tagTrndDatas", - // sendParam: searchParam, - // }); + // let res = [ + // { + // eqpmGrpNm: "냉각 시스템", + // eqpmGrpId: "GRP001", + // eqpmId: "EQ001", + // eqpmNm: "냉각기 A", + // tagId: "TAG001-001", + // tagNm: "냉각 온도 센서", + // rowStat: "I", + // }, + // { + // eqpmGrpNm: "전력 시스템", + // eqpmGrpId: "GRP002", + // eqpmId: "EQ002", + // eqpmNm: "변압기 B", + // tagId: "TAG002-002", + // tagNm: "전류 센서", + // rowStat: "U", + // }, + // { + // eqpmGrpNm: "공기압 시스템", + // eqpmGrpId: "GRP003", + // eqpmId: "EQ003", + // eqpmNm: "압축기 C", + // tagId: "TAG003-003", + // tagNm: "압력 센서", + // rowStat: "D", + // }, + // ]; + let res = await this.postApiReturn({ + apiKey: "selectTagAndEqpmList", + resKey: "tagTrndDatas", + sendParam: searchParam, + }); let newRes = []; if (this.searchParam["tagList"].length > 0) { newRes = res.filter((item) => { diff --git a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue index d43aa51..94c86db 100644 --- a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue +++ b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue @@ -38,7 +38,7 @@ import { mapState, mapMutations, mapActions } from 'vuex'; import Buttons from '~/components/common/button/Buttons'; import Grid from '~/components/common/Grid'; -import { CustumChecbox } from '~/plugins/gridUtility'; +import { CustomCheckbox } from '~/plugins/gridUtility'; import { CustomNumberEditor } from '~/plugins/gridUtility'; import Form from '~/components/common/form/Form'; import mixinGlobal from '@/mixin/global.js'; diff --git a/components/pages/ems/EqpmInfo/EqpmConstTab.vue b/components/pages/ems/EqpmInfo/EqpmConstTab.vue index 892b426..b68a035 100644 --- a/components/pages/ems/EqpmInfo/EqpmConstTab.vue +++ b/components/pages/ems/EqpmInfo/EqpmConstTab.vue @@ -96,20 +96,20 @@ export default { watch: { selectedEqpmKindId(val) { if (val) { - this.detailList[2].eqpmKindId = val; + this.detailList[1].eqpmKindId = val; } }, selectedEqpmGrpId(val) { // if(!val){ - // this.detailList[2].eqpmGrpId = ''; + // this.detailList[1].eqpmGrpId = ''; // }else{ - // this.detailList[2].eqpmGrpId = val; + // this.detailList[1].eqpmGrpId = val; // } // if(val){ - // this.detailList[2].eqpmGrpId = val; + // this.detailList[1].eqpmGrpId = val; // } // else if(val == null || val == ''){ - // this.detailList[2].eqpmGrpId = ''; + // this.detailList[1].eqpmGrpId = ''; // } }, }, @@ -238,10 +238,10 @@ export default { }, async getRowData(data, gridName) { if (data.rowStat === 'I') { - this.detailList[2].disabled = false; + this.detailList[1].disabled = false; this.detailList[3].disabled = false; } else { - this.detailList[2].disabled = true; + this.detailList[1].disabled = true; this.detailList[3].disabled = true; } @@ -257,12 +257,12 @@ export default { switch (action) { case 'add': this.$refs[this.gridName].addRow(); - this.detailList[2].disabled = false; + this.detailList[1].disabled = false; this.detailList[3].disabled = false; break; case 'remove': - this.detailList[2].disabled = true; + this.detailList[1].disabled = true; this.detailList[3].disabled = true; this.$refs[this.gridName].removeRow(); break; @@ -358,7 +358,6 @@ const myEqpmConstDetail = [ { type: 'SelectBox', label: '대상 유형', - disabled: true, cols: 6, class: 'py-3 pr-4', list: 'emMapDivList2', @@ -371,6 +370,7 @@ const myEqpmConstDetail = [ textCols: 12, iconShow: true, }, + // ================== { type: 'EgrpPysclQtyPop', labelContent: '물리량', @@ -382,7 +382,7 @@ const myEqpmConstDetail = [ pysclQtyNm: 'pysclQtyNm', }, valueNm: 'objId', - disabled: false, + disabled: true, required: true, openMode: 'CONST', cols: 6, @@ -413,6 +413,7 @@ const myEqpmConstDetail = [ textCols: 12, iconShow: true, }, + // ------------ { type: 'InputText', label: '물리량 값', diff --git a/components/pages/ems/EqpmInfo/EqpmIaoTab.vue b/components/pages/ems/EqpmInfo/EqpmIaoTab.vue index 688214a..3945a72 100644 --- a/components/pages/ems/EqpmInfo/EqpmIaoTab.vue +++ b/components/pages/ems/EqpmInfo/EqpmIaoTab.vue @@ -18,7 +18,7 @@ :innerTabGridInfo="innerTabGridInfo" />
-
+
@@ -40,16 +39,16 @@ @@ -805,7 +786,7 @@ export default { // console.log('if isLoading stmt3'); // return; // } - alert("move to", url); + // alert("move to", url); this.$router.push({ path: url + "?prgmId=" + prgmId, }); diff --git a/nuxt.config.js b/nuxt.config.js index 0bd0350..a878b91 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -57,7 +57,7 @@ module.exports = { ], // 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: { scss: ['./assets/scss/*.scss'], }, diff --git a/pages/comm/auth/MenuRoleMngPage.vue b/pages/comm/auth/MenuRoleMngPage.vue index d4f9ca8..d2c1085 100644 --- a/pages/comm/auth/MenuRoleMngPage.vue +++ b/pages/comm/auth/MenuRoleMngPage.vue @@ -342,7 +342,7 @@ export default { //---------------------gridOption 설정 끝---------------------------- //---------------------gridName3의 체크박스 설정 시작---------------------------- - class CustumChecbox { + class CustomCheckbox { constructor(props) { const el = document.createElement('input'); const { grid, rowKey, columnInfo } = props; @@ -398,14 +398,11 @@ export default { const myTreeColumns = [ { - header: '', - name: '', align: 'center', width: 30, + minWidth: 60, formatter: (props) => { - return ` - - `; + return ``; } }, { @@ -421,14 +418,11 @@ export default { ]; const myTreeColumns2 = [ { - header: '', - name: '', align: 'center', width: 30, + minWidth: 60, formatter: (props) => { - return ` - - `; + return ``; } }, { header: '역할ID', name: 'roleId', hidden: true }, @@ -439,7 +433,7 @@ export default { name: 'useFg', align: 'center', renderer: { - type: CustumChecbox, + type: CustomCheckbox, }, }, { @@ -447,7 +441,7 @@ export default { name: 'authCd1', align: 'center', renderer: { - type: CustumChecbox, + type: CustomCheckbox, }, }, { @@ -455,7 +449,7 @@ export default { name: 'authCd2', align: 'center', renderer: { - type: CustumChecbox, + type: CustomCheckbox, }, }, { @@ -463,7 +457,7 @@ export default { name: 'authCd3', align: 'center', renderer: { - type: CustumChecbox, + type: CustomCheckbox, }, }, { @@ -471,7 +465,7 @@ export default { name: 'authCd4', align: 'center', renderer: { - type: CustumChecbox, + type: CustomCheckbox, }, }, { @@ -479,7 +473,7 @@ export default { name: 'authCd5', align: 'center', renderer: { - type: CustumChecbox, + type: CustomCheckbox, }, }, { @@ -487,7 +481,7 @@ export default { name: 'authCd6', align: 'center', renderer: { - type: CustumChecbox, + type: CustomCheckbox, }, }, ]; @@ -674,8 +668,6 @@ export default { }, getUnAsgnRowData(data) { - console.log("------------------DEBUG-------getUnAsgnRowData:", data); - const getRowData = data; this.leftSelectRowData = Object.assign({}, getRowData); }, diff --git a/pages/comm/auth/UserRoleMngPage.vue b/pages/comm/auth/UserRoleMngPage.vue index cabbed3..dd8bc6c 100644 --- a/pages/comm/auth/UserRoleMngPage.vue +++ b/pages/comm/auth/UserRoleMngPage.vue @@ -127,13 +127,13 @@