From 97ac9535f97ac6781e91352cff1de44008cc1dbd Mon Sep 17 00:00:00 2001 From: chiayin Date: Thu, 13 Jul 2023 09:42:58 +0800 Subject: [PATCH] Conformance: StatusSidebar Have activity Clear button done. --- .../Conformance/ConformanceSidebar.vue | 17 ++++++++++++++ .../ConformanceSidebar/ActList.vue | 14 ++++++++++-- .../ConformanceSelectResult.vue | 10 ++++++++- .../ConformanceSidebar/ConformanceShowBar.vue | 12 +++------- src/main.js | 2 +- src/stores/conformance.js | 22 +++++++++++++++++++ 6 files changed, 64 insertions(+), 13 deletions(-) diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue index 8dcfcd4..42c8813 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar.vue @@ -23,6 +23,7 @@ + {{ selectConformanceTask }}
@@ -53,6 +54,7 @@ export default { return { isShowBar: false, visibleLeft: false, + selectConformanceTask: null, } }, components: { @@ -61,8 +63,23 @@ export default { ConformanceTimeRange, ConformanceSelectResult, }, + methods: { + /** + * @param {boolean} massage true | false 清空選項 + */ + reset(massage) { + // Have activity + this.selectConformanceTask = null; + this.$emitter.emit('reset', null); + // 成功訊息 + massage ? this.$toast.success('Reset Success.') : null; + }, + }, created() { this.isShowBar = true; + this.$emitter.on('actListData', (data) => { + this.selectConformanceTask = data; + }) }, } diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ActList.vue b/src/components/Discover/Conformance/ConformanceSidebar/ActList.vue index e052e30..e3f5dab 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar/ActList.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar/ActList.vue @@ -5,7 +5,7 @@

Sort

- +
@@ -19,6 +19,16 @@ export default { return { actList: null, } - } + }, + methods: { + actListData() { + this.$emitter.emit('actListData', this.actList); + } + }, + created() { + this.$emitter.on('reset', (data) => { + this.actList = data; + }); + }, } diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue index 718db6d..6adfad8 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue @@ -41,7 +41,7 @@ export default { }, data() { return { - data: ['到院', '到院到院到院到院到院到院到院', '到院到院到到院院到院到院到院', '到院到院到院到院到院到院'], + data: null, timeResultData: [ { id: 1, @@ -66,6 +66,14 @@ export default { ], } }, + created() { + this.$emitter.on('actListData', (data) => { + this.data = data; + }); + this.$emitter.on('reset', (data) => { + this.data = data; + }); + }, } diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue index cc72bc9..f77cc36 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue @@ -1,11 +1,5 @@