-
-
+
+
check_circle
-
{{ act }}
+
{{ act }}
+
+
+
+
+ arrow_circle_down
+
+
{{ act }}
+
+
+
+
+ -
+ fiber_manual_record
+ {{ act.scope }}
+ {{ act.activity }}
+
+
+
diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue
index 516ac75..cc72bc9 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue
@@ -1,11 +1,57 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -14,18 +60,25 @@ import { storeToRefs } from 'pinia';
import LoadingStore from '@/stores/loading.js';
import ConformanceStore from '@/stores/conformance.js';
import ActList from './ActList.vue';
+import ActRadio from './ActRadio.vue';
+import ActSeqDrag from './ActSeqDrag.vue';
export default {
setup() {
const loadingStore = LoadingStore();
const conformanceStore = ConformanceStore();
const { isLoading } = storeToRefs(loadingStore);
- const { selectedRuleType, selectedActivitySequence, selectedMode, selectedProcessScope, selectedActSeqMore } = storeToRefs(conformanceStore);
+ const { selectedRuleType, selectedActivitySequence, selectedMode, selectedProcessScope, selectedActSeqMore, selectedActSeqFromTo, conformanceTask } = storeToRefs(conformanceStore);
- return { isLoading, selectedRuleType, selectedActivitySequence, selectedMode, selectedProcessScope, selectedActSeqMore }
+ return { isLoading, selectedRuleType, selectedActivitySequence, selectedMode, selectedProcessScope, selectedActSeqMore, selectedActSeqFromTo, conformanceTask }
},
components: {
- ActList,
+ ActList, ActRadio, ActSeqDrag
+ },
+ data() {
+ return {
+ data:['到到到到到到到到到到到到到到到到到到到到到到院', '住住住住住住住住住住住住住住住住住住住住住住住住住住住住住住住住住院', '開開開開開開開開開開開開開開開開開開開開開開刀', '第第第第第第第第第第一次醫囑', 'aaaaaaaaaaaaaaaa', 'bb ccc ddddd eeee', '第二次醫囑', '照會', '繳費', '領藥', '出院', '到院 到院 到院 到院', '住院', '開刀', '第一次醫囑', '第二次醫囑', '照會', '繳費', '領藥', '出院', '到院', '住院', '開刀', '第一次醫囑囑囑囑囑囑囑囑囑囑囑囑囑囑囑囑囑囑囑囑囑', '第二次醫囑', '照會', '繳費', '領藥', '出院', '到院', '住院', '開刀', '第一次醫囑', '第二次醫囑', '照會', '繳費', '領藥', '出院院院院院院院院院院院院院院院院院院院院院院院院院院院', '到院', '住院', '開刀', '第一次醫囑', '第二次醫囑', '照會', '繳費', '領藥', '出院', '到院', '住院', '開刀', '第一次醫囑', '第二次醫囑', '照會', '繳費', '領藥', '出院']
+ }
}
}
diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceTimeRange.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceTimeRange.vue
new file mode 100644
index 0000000..d0ae97e
--- /dev/null
+++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceTimeRange.vue
@@ -0,0 +1,49 @@
+
+
+
+
+
diff --git a/src/components/Discover/Conformance/MoreModal.vue b/src/components/Discover/Conformance/MoreModal.vue
index e2f6252..921482c 100644
--- a/src/components/Discover/Conformance/MoreModal.vue
+++ b/src/components/Discover/Conformance/MoreModal.vue
@@ -1,13 +1,116 @@
-
diff --git a/src/components/Discover/Conformance/StatusBar.vue b/src/components/Discover/Conformance/StatusBar.vue
index 92662c1..e92e010 100644
--- a/src/components/Discover/Conformance/StatusBar.vue
+++ b/src/components/Discover/Conformance/StatusBar.vue
@@ -1,8 +1,7 @@
-
-
+
-
+
-
Cases
@@ -76,12 +75,10 @@
-
-
-
+
@@ -92,6 +89,9 @@ export default {
isPanel: false,
}
},
+ created() {
+ this.isPanel = true;
+ }
}
diff --git a/src/module/sortNumEngZhtw.js b/src/module/sortNumEngZhtw.js
new file mode 100644
index 0000000..829f10a
--- /dev/null
+++ b/src/module/sortNumEngZhtw.js
@@ -0,0 +1,22 @@
+/**
+ * 數字、英文、中文，排序
+ * @param {array} data
+ * @returns
+ */
+export default function sortNumEngZhtw(data) {
+ return data.sort((a, b) => {
+ // 檢查兩個值是否都是數字
+ var isANumber = !isNaN(parseFloat(a)) && isFinite(a);
+ var isBNumber = !isNaN(parseFloat(b)) && isFinite(b);
+
+ // 如果兩個值都是數字，直接比較大小
+ if (isANumber && isBNumber) return parseFloat(a) - parseFloat(b);
+
+ // 如果其中一個值是數字，將數字視為最小，排在前面
+ if (isANumber) return -1;
+ if (isBNumber) return 1;
+
+ // 其他情況下，使用 localeCompare 方法進行中文排序
+ return a.localeCompare(b, 'zh-Hant-TW', { sensitivity: 'accent' });
+ });
+}
diff --git a/src/stores/conformance.js b/src/stores/conformance.js
index ae579e1..b89a153 100644
--- a/src/stores/conformance.js
+++ b/src/stores/conformance.js
@@ -1,17 +1,53 @@
import { defineStore } from "pinia";
import loadingStore from "./loading";
import pinia from '@/stores/main.js';
+import {useToast} from 'vue-toast-notification';
+import 'vue-toast-notification/dist/theme-sugar.css';
const loading = loadingStore(pinia);
+const $toast = useToast();
+// Delay loading and toast 待模組化
+let delay = (s = 0) => new Promise((resolve, reject) => setTimeout(resolve, s));
export default defineStore('conformanceStore', {
state: () => ({
- selectedRuleType: 'Have activity',
- selectedActivitySequence: 'Start & End',
- selectedMode: 'Directly follows',
- selectedProcessScope: 'End to end',
- selectedActSeqMore: 'All',
+ logId: null,
+ filterId: null,
+ allConformanceTask: [],
+ selectedRuleType: 'Have activity', // radio
+ selectedActivitySequence: 'Start & End', // radio
+ selectedMode: 'Directly follows', // radio
+ selectedProcessScope: 'End to end', // radio
+ selectedActSeqMore: 'All', // radio
+ selectedActSeqFromTo: 'From', // radio
}),
- getters: {},
- actions: {},
+ getters: {
+ conformanceTask: state => {
+ return state.allConformanceTask;
+ }
+ },
+ actions: {
+ /**
+ * fetch Log Conformance Parameters api for Rule Settings.
+ */
+ async getLogConformanceParams() {
+ let logId = this.logId;
+ const api = `/api/log-checkers/params?log_id=${logId}`;
+
+ try {
+ const response = await this.$axios.get(api);
+ console.log(response);
+ this.allConformanceTask = response.data.tasks;
+
+ } catch(error) {
+ console.log(error);
+ await delay();
+ loading.isLoading = true;
+ await delay(1000);
+ loading.isLoading = false;
+ await delay(500);
+ $toast.default('Failed to load the Conformance Parameters.',{position: 'bottom'});
+ }
+ }
+ },
})
diff --git a/src/views/Discover/Conformance/index.vue b/src/views/Discover/Conformance/index.vue
index f6f4051..1f1cdda 100644
--- a/src/views/Discover/Conformance/index.vue
+++ b/src/views/Discover/Conformance/index.vue
@@ -1,16 +1,17 @@
-
-
+
+
-
+