diff --git a/assets/scss/common/button.scss b/assets/scss/common/button.scss index ea229cd..7528ba3 100644 --- a/assets/scss/common/button.scss +++ b/assets/scss/common/button.scss @@ -92,10 +92,13 @@ background: map-deep-get($config, #{$theme}, "basic-button-background"); } - .search-button { - color: map-deep-get($config, #{$theme}, "search-btn-color"); + .searchFilter{ + .search-button { + height: 40px; + color: map-deep-get($config, #{$theme}, "search-btn-color"); + } } - + .v-dialog { .ant-btn-icon-only { color: map-deep-get( @@ -135,6 +138,15 @@ background: map-deep-get($config, #{$theme}, "ant-btn-danger-bg") !important; } } + + &.expand-btn { + .v-icon { + color: map-deep-get($config, #{$theme}, "basic-button-color"); + svg { + fill: map-deep-get($config, #{$theme}, "basic-button-color"); + } + } + } } } } @@ -161,4 +173,13 @@ height: 16px; background:none; } -} \ No newline at end of file +} +.ant-btn { + &.expand-btn { + .v-icon { + span { + margin-right: 8px; + } + } + } +} diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss index e20897c..2eeabc9 100644 --- a/assets/scss/common/grid.scss +++ b/assets/scss/common/grid.scss @@ -98,6 +98,17 @@ @include theme($theme); .v-application.#{$theme}-mode { + .grid-title { + font-weight: 600; + font-size: 16px; + line-height: 24px; + letter-spacing: 0; + color: map-deep-get($config, + #{$theme}, + "tui-grid-title-color" + ); + } + .tui-grid { &-table { border: 1px solid; diff --git a/assets/scss/var.scss b/assets/scss/var.scss index 7595e02..0619caf 100644 --- a/assets/scss/var.scss +++ b/assets/scss/var.scss @@ -102,6 +102,7 @@ $config: ( v-calendar-day-color: #fff, v-calendar-day-in-not-month-color: rgba(255, 255, 255, 0.05), v-calendar-is-today-background-color: #2d4571, + tui-grid-title-color: #FFFFFFD9, tui-grid-header-backgroundColor: #2a2b2d, tui-grid-header-color: #FFFFFFD9, tui-grid-border-horziontal-color: #212224, @@ -238,6 +239,7 @@ $config: ( v-calendar-day-color: #111, v-calendar-day-in-not-month-color: #f8f8f8, v-calendar-is-today-background-color: #e3eaf3, + tui-grid-title-color: #000000E0, tui-grid-header-backgroundColor: #fafafa, //#e0e0e0, tui-grid-header-color: rgba(0, 0, 0, 0.88), tui-grid-border-horziontal-color: #e0e0e0, diff --git a/components/common/chartoptions/GaugeChart.js b/components/common/chartoptions/GaugeChart.js index d08b9aa..d29225c 100644 --- a/components/common/chartoptions/GaugeChart.js +++ b/components/common/chartoptions/GaugeChart.js @@ -1,5 +1,5 @@ // Gauge chart options -export default function getGaugeChartOption({ title, value, min = 0, max = 160, unit = '%', isDarkMode = false, backgroundRadius = 97 }) { +export default function getGaugeChartOption({ title, min = 0, max = 160, unit = '%', isDarkMode = false, backgroundRadius = 97 }) { const colorRanges = isDarkMode ? [ [0.375, '#49AA19'], // Dark Green diff --git a/components/common/chartoptions/LineChart.js b/components/common/chartoptions/LineChart.js index b514378..7d5ebce 100644 --- a/components/common/chartoptions/LineChart.js +++ b/components/common/chartoptions/LineChart.js @@ -2,7 +2,7 @@ export default function getLineChartOption({ xAxisData = [], seriesData = [], - legendData = [], + // legendData = [], isDarkMode = false, }) { @@ -31,7 +31,7 @@ export default function getLineChartOption({ }, legend: { - data: legendData, + // data: legendData, icon: 'circle', top: '0%', right: '5%', diff --git a/components/common/modal/EgrpPysclQtyPop.vue b/components/common/modal/EgrpPysclQtyPop.vue index 78ccbcc..4e640f6 100644 --- a/components/common/modal/EgrpPysclQtyPop.vue +++ b/components/common/modal/EgrpPysclQtyPop.vue @@ -71,14 +71,12 @@ - - - 확인 - 닫기 - 삭제 + 삭제 + 확인 @@ -298,46 +296,46 @@ export default { }, async setSelectValueList01() { // form으로 popup 사용할 때 인자로 eqpmKindId, eqpmGrpId 보내줘야한다. - // let res = await this.postApiReturn({ - // apiKey: 'selectEqpmGrpCodeList', - // resKey: 'eqpmGrpCodeLists', - // sendParam: { - // eqpmKindId: - // this.item.eqpmKindId != undefined - // ? this.item.eqpmKindId - // : this.searchParam.eqpmKindId, - // }, - // // form을 통해 popup을 사용할 경우 -> this.item.eqpmKindId 사용 - // // 부모 페이지에서 설비종류인 eqpmKindId 값을 꼭 가져와야한다. - // }); - // if (res.length > 0) { - // this.selectValueList01 = await res.map(obj => { - // return { - // text: obj.eqpmGrpNm, - // value: obj.eqpmGrpId, - // }; - // }); - // // form을 통해 popup을 사용할 경우 -> this.item.eqpmGrpId 사용 - // // 부모 페이지에서 설비그룹을 선택한 값이 있다면(eqpmGrpId) 그 값으로 바인딩 아닐 경우 조회한 데이터의 첫번째 값으로 선택 - // // console.log('this.item.eqpmGrpId : ', this.item.eqpmGrpId); - // // console.log('this.searchParam.eqpmGrpId : ', this.searchParam.eqpmGrpId); - // this.selectValue01 = - // this.item.eqpmGrpId != undefined - // ? this.item.eqpmGrpId - // : this.searchParam.eqpmGrpId != undefined - // ? this.searchParam.eqpmGrpId - // : this.selectValueList01[0].value; - // } else { - // this.selectValueList01 = []; - // this.selectValue01 = null; - // } + let res = await this.postApiReturn({ + apiKey: 'selectEqpmGrpCodeList', + resKey: 'eqpmGrpCodeLists', + sendParam: { + eqpmKindId: + this.item.eqpmKindId != undefined + ? this.item.eqpmKindId + : this.searchParam.eqpmKindId, + }, + // form을 통해 popup을 사용할 경우 -> this.item.eqpmKindId 사용 + // 부모 페이지에서 설비종류인 eqpmKindId 값을 꼭 가져와야한다. + }); + if (res.length > 0) { + this.selectValueList01 = await res.map(obj => { + return { + text: obj.eqpmGrpNm, + value: obj.eqpmGrpId, + }; + }); + // form을 통해 popup을 사용할 경우 -> this.item.eqpmGrpId 사용 + // 부모 페이지에서 설비그룹을 선택한 값이 있다면(eqpmGrpId) 그 값으로 바인딩 아닐 경우 조회한 데이터의 첫번째 값으로 선택 + // console.log('this.item.eqpmGrpId : ', this.item.eqpmGrpId); + // console.log('this.searchParam.eqpmGrpId : ', this.searchParam.eqpmGrpId); + this.selectValue01 = + this.item.eqpmGrpId != undefined + ? this.item.eqpmGrpId + : this.searchParam.eqpmGrpId != undefined + ? this.searchParam.eqpmGrpId + : this.selectValueList01[0].value; + } else { + this.selectValueList01 = []; + this.selectValue01 = null; + } - this.selectValueList01 = [ - { label: '냉동기고온', value: '냉동기고온' }, - { label: '냉동기저온', value: '냉동기저온' }, - { label: '공조기', value: '공조기' }, - { label: '보일러', value: '보일러' } - ]; + // this.selectValueList01 = [ + // { label: '냉동기고온', value: '냉동기고온' }, + // { label: '냉동기저온', value: '냉동기저온' }, + // { label: '공조기', value: '공조기' }, + // { label: '보일러', value: '보일러' } + // ]; }, search() { this.getGridData(); @@ -388,44 +386,35 @@ export default { this.loadGrid = false; let res = []; - // res = await this.postApiReturn({ - // apiKey: 'selectEgrpPysclQtyPop', - // resKey: 'egrpPysclQtyData', - // sendParam: { - // searchWord: this.searchWord, - // eqpmGrpId: this.selectValue01, - // openMode: this.item.openMode, - // }, - // }); - // let newRes = []; - // let tempTagList = this.pyscPopVal.split('/*wq2a/'); - // let tagList = tempTagList.filter(item => item != ''); - // if (tagList.length > 0) { - // newRes = res.filter(item => { - // return !tagList.includes(item.pysclQtyId); - // }); - // res = newRes; - // } - - // //이미 선택된 값들 제거(배열) - // if (this.item.dataList) { - // if (this.item.dataList.length > 0) { - // newRes = res.filter(item => { - // return !this.item.dataList.includes(item.pysclQtyId); - // }); - // res = newRes; - // } - // } - - res = [ - { - 'pysclQtyId': 'PYSCL00001', - 'pysclQtyCd': 'AMP_1A', - 'pysclQtyNm': '회로1 전류A', - 'pysclQtyTpNm': 'TAG' + res = await this.postApiReturn({ + apiKey: 'selectEgrpPysclQtyPop', + resKey: 'egrpPysclQtyData', + sendParam: { + searchWord: this.searchWord, + eqpmGrpId: this.selectValue01, + openMode: this.item.openMode, + }, + }); + let newRes = []; + let tempTagList = this.pyscPopVal.split('/*wq2a/'); + let tagList = tempTagList.filter(item => item != ''); + if (tagList.length > 0) { + newRes = res.filter(item => { + return !tagList.includes(item.pysclQtyId); + }); + res = newRes; + } + //이미 선택된 값들 제거(배열) + if (this.item.dataList) { + if (this.item.dataList.length > 0) { + newRes = res.filter(item => { + return !this.item.dataList.includes(item.pysclQtyId); + }); + res = newRes; } - ] + } + this.setModalGridData({ modalKey: this.myModalKey, gridKey: this.grid_01, diff --git a/components/common/modal/EqpmBaseInfoPop.vue b/components/common/modal/EqpmBaseInfoPop.vue index c885c7e..3364341 100644 --- a/components/common/modal/EqpmBaseInfoPop.vue +++ b/components/common/modal/EqpmBaseInfoPop.vue @@ -2,12 +2,8 @@ @@ -30,9 +26,9 @@
-
- 확인 - 닫기 + 닫기 + 확인 + @@ -274,36 +270,30 @@ export default { this.gridInit(); }, async setSelectValueList01() { - // let res = await this.postApiReturn({ - // apiKey: 'selectEqpmGrpCodeList', - // resKey: 'eqpmGrpCodeLists', - // sendParam: { eqpmKindId: this.searchParam.eqpmKindId }, - // // 부모 페이지에서 설비종류인 eqpmKindId 값을 꼭 가져와야한다. - // }); - // if (res.length > 0) { - // this.selectValueList01 = await res.map(obj => { - // return { - // text: obj.eqpmGrpNm, - // value: obj.eqpmGrpId, - // }; - // }); - // // 부모 페이지에서 설비그룹을 선택한 값이 있다면(eqpmGrpId) 그 값으로 바인딩 아닐 경우 조회한 데이터의 첫번째 값으로 선택 - // this.selectValue01 = - // this.searchParam.eqpmGrpId != undefined - // ? this.searchParam.eqpmGrpId - // : this.selectValueList01[0].value; - // // this.selectValue01 = this.selectValueList01[0].value; - // } else { - // this.selectValueList01 = []; - // this.selectValue01 = null; - // } + let res = await this.postApiReturn({ + apiKey: 'selectEqpmGrpCodeList', + resKey: 'eqpmGrpCodeLists', + sendParam: { eqpmKindId: this.searchParam.eqpmKindId }, + // 부모 페이지에서 설비종류인 eqpmKindId 값을 꼭 가져와야한다. + }); + if (res.length > 0) { + this.selectValueList01 = await res.map(obj => { + return { + text: obj.eqpmGrpNm, + value: obj.eqpmGrpId, + }; + }); + // 부모 페이지에서 설비그룹을 선택한 값이 있다면(eqpmGrpId) 그 값으로 바인딩 아닐 경우 조회한 데이터의 첫번째 값으로 선택 + this.selectValue01 = + this.searchParam.eqpmGrpId != undefined + ? this.searchParam.eqpmGrpId + : this.selectValueList01[0].value; + // this.selectValue01 = this.selectValueList01[0].value; + } else { + this.selectValueList01 = []; + this.selectValue01 = null; + } - this.selectValueList01 = [ - { label: '냉동기고온', value: '냉동기고온' }, - { label: '냉동기저온', value: '냉동기저온' }, - { label: '공조기', value: '공조기' }, - { label: '보일러', value: '보일러' } - ]; }, search() { this.getGridData(); @@ -341,34 +331,26 @@ export default { }, async getGridData() { this.loadGrid = false; - // let res = []; - // let res = await this.postApiReturn({ - // apiKey: 'selectEqpmBaseInfoPop', - // resKey: 'epqmBaseInfoData', - // sendParam: { - // eqpmGrpId: this.selectValue01, - // searchWord: this.searchWord, - // // openMode : this.item.openMode == undefined ? this.openMode : this.item.openMode - // }, - // }); - // // grid와 popup eqpmId 값 중복되는 것 제거하는 로직 - 시작 - // let newRes = []; - // if (this.bindingGridEqpmIdList.length > 0) { - // newRes = res.filter(item => { - // return !this.bindingGridEqpmIdList.includes(item.eqpmId); - // }); - // res = newRes; - // } + + let res = await this.postApiReturn({ + apiKey: 'selectEqpmBaseInfoPop', + resKey: 'epqmBaseInfoData', + sendParam: { + eqpmGrpId: this.selectValue01, + searchWord: this.searchWord, + // openMode : this.item.openMode == undefined ? this.openMode : this.item.openMode + }, + }); + // grid와 popup eqpmId 값 중복되는 것 제거하는 로직 - 시작 + let newRes = []; + if (this.bindingGridEqpmIdList.length > 0) { + newRes = res.filter(item => { + return !this.bindingGridEqpmIdList.includes(item.eqpmId); + }); + res = newRes; + } // grid와 popup eqpmId 값 중복되는 것 제거하는 로직 - 끝 - const res = [ - { - 'eqpmId': 'PYSCL00001', - 'eqpmNm': 'AMP_1A', - - } - ] - this.setModalGridData({ modalKey: this.myModalKey, gridKey: this.gridName, @@ -441,9 +423,9 @@ export default { // this.dialog = false; // return; // } - // if (this.myBindingData.length <= 0) { - // return alert('설비상세 리스트를 먼저 선택해주세요.'); - // } + if (this.myBindingData.length <= 0) { + return alert('설비상세 리스트를 먼저 선택해주세요.'); + } this.dialog = !val; }, }, @@ -481,7 +463,7 @@ var eqpmBaseInfoPop = { // .v-dialog { // .v-card { // &__title { - + // @if $theme ==dark { // background-color: #2d3355; diff --git a/components/common/modal/EqpmCalcPop.vue b/components/common/modal/EqpmCalcPop.vue index 80fca18..3029819 100644 --- a/components/common/modal/EqpmCalcPop.vue +++ b/components/common/modal/EqpmCalcPop.vue @@ -36,7 +36,7 @@ 계산설명 - + - + 조회 - 확인 - 닫기 + 닫기 + 확인 @@ -306,38 +304,22 @@ export default { }, async getGridData() { this.loadGrid = false; - // let res = await this.postApiReturn({ - // apiKey: 'selectEqpmCalcPop', - // resKey: 'eqpmCalcPopData', - // sendParam: { - // calcDescLike: this.searchWord, - // openMode: this.item.openMode != undefined ? this.item.openMode : this.openMode - // }, - // }); - // if (this.myBindingData['calcProc'] != '' || this.myBindingData['calcProc'] != null || this.myBindingData['calcProc'] != undefined) { - // let newRes = []; - // newRes = res.filter(item => { - // return item.calcProc != this.myBindingData['calcProc'] - // }); - // res = newRes; - // } - - const res = [ - { - 'calcProc': 'AVG_CNT2', - 'argCnt': '2', - 'calcDesc': '두개 변수에 대한 평균' - + let res = await this.postApiReturn({ + apiKey: 'selectEqpmCalcPop', + resKey: 'eqpmCalcPopData', + sendParam: { + calcDescLike: this.searchWord, + openMode: this.item.openMode != undefined ? this.item.openMode : this.openMode }, - - { 'calcProc': 'PROC001', argCnt: 2, 'calcDesc': '덧셈 연산' }, - { 'calcProc': 'PROC002', argCnt: 1, 'calcDesc': '제곱 연산' }, - { 'calcProc': 'PROC003', argCnt: 2, 'calcDesc': '곱셈 연산' }, - { 'calcProc': 'PROC004', argCnt: 1, 'calcDesc': '루트 연산' }, - { 'calcProc': 'PROC005', argCnt: 3, 'calcDesc': '최대값 계산' }, - { 'calcProc': 'PROC006', argCnt: 3, 'calcDesc': '최소값 계산' }, - - ] + }); + if (this.myBindingData['calcProc'] != '' || this.myBindingData['calcProc'] != null || this.myBindingData['calcProc'] != undefined) { + let newRes = []; + newRes = res.filter(item => { + return item.calcProc != this.myBindingData['calcProc'] + }); + res = newRes; + } + this.setModalGridData({ modalKey: this.myModalKey, gridKey: this.grid_01, diff --git a/components/common/modal/EvtObjPop.vue b/components/common/modal/EvtObjPop.vue index 30919b6..6a3bae7 100644 --- a/components/common/modal/EvtObjPop.vue +++ b/components/common/modal/EvtObjPop.vue @@ -7,12 +7,15 @@ {{ option.labelContent }} - - - + + @@ -21,10 +24,10 @@ {{ option.modalTitle }} mdi-close - + - +