From d4058a04ab4a6d548f5267b53530a88511970f8b Mon Sep 17 00:00:00 2001 From: won503 Date: Tue, 23 May 2023 14:46:59 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A0=80=EC=9E=A5=ED=8C=9D=EC=97=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/sysMgt/views/WorkState.vue | 49 ++++++++++++------- src/main/resources/application.yml | 8 +++ 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/frontend/src/modules/sysMgt/views/WorkState.vue b/frontend/src/modules/sysMgt/views/WorkState.vue index 81455b4..9e28d8b 100644 --- a/frontend/src/modules/sysMgt/views/WorkState.vue +++ b/frontend/src/modules/sysMgt/views/WorkState.vue @@ -59,6 +59,8 @@ :addCls="grid.addCls" > + + @@ -69,6 +71,8 @@ import moment from 'moment'; import VueTimepicker from 'vue2-timepicker'; import 'vue2-timepicker/dist/VueTimepicker.css' import sysMgtApi from '../service/sysMgtApi' +// import CommonModal from '../components/modal/commonModal'; +import CommonModal from '../components/commonModal.vue'; export default { name: 'workState', @@ -114,7 +118,8 @@ export default { customGrid: customGrid, vuejsDatepicker, VueTimepicker, - + CommonModal, + }, created() { }, @@ -143,6 +148,11 @@ export default { methods: { fnSaveTxt(){ + if (this.state == 'NOTUSE') { + this.row.title = '서비스 점검 설정'; + this.row.msg1 = '저장 하시겠습니까?'; + this.$refs.commonModal.confirmModalOpen(this.row); + } let params = { startDate : moment(this.startDate).format('YYYY-MM-DD'), startTimeT : '', @@ -151,25 +161,27 @@ export default { endTimeM : '', state : this.state, } - if (this.startTime) { params.startTimeT = moment(this.startTime, 'HH:mm').format('HH'); params.startTimeM = moment(this.startTime, 'HH:mm').format('mm'); } - if (this.endTime) { params.endTimeT = moment(this.endTime, 'HH:mm').format('HH'); params.endTimeM = moment(this.endTime, 'HH:mm').format('mm'); } - - sysMgtApi.setWorkState(params).then(() => { - // 저장이 완료된 후에 테이블 다시 로드 - this.$nextTick(() => { - this.$refs.table.reloadData(); - }); + sysMgtApi.setWorkState(params).then((respose) => { + var result = respose.data; + if (result != null && result.retCode == "0000"){ + // 저장이 완료된 후에 테이블 다시 로드 + this.toComplete(); + } }); }, + toComplete(){ + this.$refs.table.reloadData(); + // this.confirmCalbackFnc(); + }, search: function (isKeep) { this.$refs.table.search(this.grid.params, isKeep); const getP = this.$refs.table.getPagination(); @@ -208,14 +220,17 @@ export default { } }, beforeRouteLeave(to, from, next) { - const getP = this.$refs.table.getPagination(); - this.$store.commit('searchcondition/updateSearchCondition', { - params: this.grid.params, - }); - // 라우트 하기전 실행 - next(); - }, - + const getP = this.$refs.table.getPagination(); + this.$store.commit('searchcondition/updateSearchCondition', { + params: this.grid.params, + }); + // 라우트 하기전 실행 + next(); + }, + confirmCalbackFnc(props) { + // if (props.result) { + // } + }, } }; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0554d7f..8ca8f46 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -28,6 +28,14 @@ app.props: header: Authorization prefix: "Bearer " +# file +hubeasy_file_info: + send-message-location: /efs/home/sendMessage + rsv-message-location: /efs/home/rsvMessage + caller-id-location: /efs/home/callidDoc + consult-location: /efs/home/consult + work-location: /efs/admin/workState/workStatefile.txt + logging: config: classpath:logback-spring.xml