From d976bc529d6eab98dfbd9f327f807b20cebeeee5 Mon Sep 17 00:00:00 2001 From: chiayin Date: Thu, 29 Jun 2023 15:45:34 +0800 Subject: [PATCH] Conformance: Have activity Layout done. --- src/assets/components.css | 1 + .../Conformance/ConformanceResults.vue | 273 ++++++++++++++++++ .../Conformance/ConformanceSidebar.vue | 53 ++++ .../ConformanceSidebar/ActList.vue | 23 ++ .../ConformanceRadioGroup.vue | 94 ++++++ .../ConformanceSelectResult.vue | 23 ++ .../ConformanceSidebar/ConformanceShowBar.vue | 31 ++ .../Discover/Conformance/StatusBar.vue | 12 +- .../Conformance/conformanceResults.vue | 21 -- src/components/Discover/Map/SidebarFilter.vue | 2 +- src/components/icons/IconNA.vue | 22 ++ src/main.js | 4 + src/stores/conformance.js | 17 ++ src/views/Discover/Conformance/index.vue | 15 +- src/views/MainContainer.vue | 6 +- tailwind.config.js | 4 +- 16 files changed, 565 insertions(+), 36 deletions(-) create mode 100644 src/components/Discover/Conformance/ConformanceResults.vue create mode 100644 src/components/Discover/Conformance/ConformanceSidebar.vue create mode 100644 src/components/Discover/Conformance/ConformanceSidebar/ActList.vue create mode 100644 src/components/Discover/Conformance/ConformanceSidebar/ConformanceRadioGroup.vue create mode 100644 src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue create mode 100644 src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue delete mode 100644 src/components/Discover/Conformance/conformanceResults.vue create mode 100644 src/components/icons/IconNA.vue create mode 100644 src/stores/conformance.js diff --git a/src/assets/components.css b/src/assets/components.css index a58be75..b27d650 100644 --- a/src/assets/components.css +++ b/src/assets/components.css @@ -43,6 +43,7 @@ } .scrollbar::-webkit-scrollbar-thumb { + /* @apply rounded-full */ @apply bg-primary rounded-full } diff --git a/src/components/Discover/Conformance/ConformanceResults.vue b/src/components/Discover/Conformance/ConformanceResults.vue new file mode 100644 index 0000000..9dec08d --- /dev/null +++ b/src/components/Discover/Conformance/ConformanceResults.vue @@ -0,0 +1,273 @@ + + + diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue new file mode 100644 index 0000000..c0db16b --- /dev/null +++ b/src/components/Discover/Conformance/ConformanceSidebar.vue @@ -0,0 +1,53 @@ + + + diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ActList.vue b/src/components/Discover/Conformance/ConformanceSidebar/ActList.vue new file mode 100644 index 0000000..4e2f0a1 --- /dev/null +++ b/src/components/Discover/Conformance/ConformanceSidebar/ActList.vue @@ -0,0 +1,23 @@ + + diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceRadioGroup.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceRadioGroup.vue new file mode 100644 index 0000000..59aff86 --- /dev/null +++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceRadioGroup.vue @@ -0,0 +1,94 @@ + + diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue new file mode 100644 index 0000000..a3b095a --- /dev/null +++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceSelectResult.vue @@ -0,0 +1,23 @@ + + diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue new file mode 100644 index 0000000..516ac75 --- /dev/null +++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue @@ -0,0 +1,31 @@ + + diff --git a/src/components/Discover/Conformance/StatusBar.vue b/src/components/Discover/Conformance/StatusBar.vue index 8c29426..92662c1 100644 --- a/src/components/Discover/Conformance/StatusBar.vue +++ b/src/components/Discover/Conformance/StatusBar.vue @@ -1,8 +1,8 @@ diff --git a/src/components/Discover/Conformance/conformanceResults.vue b/src/components/Discover/Conformance/conformanceResults.vue deleted file mode 100644 index 949df35..0000000 --- a/src/components/Discover/Conformance/conformanceResults.vue +++ /dev/null @@ -1,21 +0,0 @@ - - diff --git a/src/components/Discover/Map/SidebarFilter.vue b/src/components/Discover/Map/SidebarFilter.vue index e1a3cfe..3bfec02 100644 --- a/src/components/Discover/Map/SidebarFilter.vue +++ b/src/components/Discover/Map/SidebarFilter.vue @@ -7,7 +7,7 @@ -
+
diff --git a/src/components/icons/IconNA.vue b/src/components/icons/IconNA.vue new file mode 100644 index 0000000..f4b5f4a --- /dev/null +++ b/src/components/icons/IconNA.vue @@ -0,0 +1,22 @@ + diff --git a/src/main.js b/src/main.js index bc19a15..1229f99 100644 --- a/src/main.js +++ b/src/main.js @@ -42,6 +42,8 @@ import InputSwitch from 'primevue/inputswitch'; import Chart from 'primevue/chart'; import Slider from 'primevue/slider'; import Calendar from 'primevue/calendar'; +import Tooltip from 'primevue/tooltip'; +import Checkbox from 'primevue/checkbox'; const emitter = mitt(); const app = createApp(App); @@ -90,6 +92,8 @@ app.component('InputSwitch', InputSwitch); app.component('Chart', Chart); app.component('Slider', Slider); app.component('Calendar', Calendar); +app.component('Checkbox', Checkbox); app.component('Draggable', draggable); // 拖曳 +app.directive('tooltip', Tooltip); app.mount("#app"); diff --git a/src/stores/conformance.js b/src/stores/conformance.js new file mode 100644 index 0000000..ae579e1 --- /dev/null +++ b/src/stores/conformance.js @@ -0,0 +1,17 @@ +import { defineStore } from "pinia"; +import loadingStore from "./loading"; +import pinia from '@/stores/main.js'; + +const loading = loadingStore(pinia); + +export default defineStore('conformanceStore', { + state: () => ({ + selectedRuleType: 'Have activity', + selectedActivitySequence: 'Start & End', + selectedMode: 'Directly follows', + selectedProcessScope: 'End to end', + selectedActSeqMore: 'All', + }), + getters: {}, + actions: {}, +}) diff --git a/src/views/Discover/Conformance/index.vue b/src/views/Discover/Conformance/index.vue index fd39843..506d990 100644 --- a/src/views/Discover/Conformance/index.vue +++ b/src/views/Discover/Conformance/index.vue @@ -1,15 +1,19 @@