From 5ea268cc77d9ec0c28afcd9f298f2fd296b3e131 Mon Sep 17 00:00:00 2001
From: chiayin <chiayin.kuo@dsp.im>
Date: Thu, 28 Sep 2023 12:37:31 +0800
Subject: [PATCH] Issue #94: Second Done.

---
 .../Discover/Conformance/ConformanceResults.vue | 17 +++++++++++------
 .../Discover/Conformance/ConformanceSidebar.vue |  1 +
 src/components/Discover/Map/SidebarFilter.vue   |  1 +
 src/components/Discover/Map/SidebarState.vue    |  3 +--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/components/Discover/Conformance/ConformanceResults.vue b/src/components/Discover/Conformance/ConformanceResults.vue
index 194e821..1c26d1f 100644
--- a/src/components/Discover/Conformance/ConformanceResults.vue
+++ b/src/components/Discover/Conformance/ConformanceResults.vue
@@ -127,12 +127,17 @@
   </section>
   <!-- Issues group -->
   <section>
-    <div v-if="data.issues == null || data.issues.length == 0"></div>
-    <div v-else>
+    <div v-if="data.issues === 'reset'">
       <p class="h2 text-base">Non-conformance Issues</p>
-      <div class="flex gap-4 w-full">
+      <div class="border rounded border-neutral-300 p-2 bg-neutral-10 w-full">
+          <p class="h2 pl-2 mb-2">Issue List</p>
+      </div>
+    </div>
+    <div v-else>
+      <p v-if="data.loops === null" class="h2 text-base">Non-conformance Issues</p>
+      <div class="flex w-full" :class="data.issues === null || data.issues.length === 0 ? '' : 'gap-4'">
         <!-- Issues chart -->
-        <div v-if="data.timeTrend.chart != null" class="border rounded border-neutral-300 p-2 bg-neutral-10 w-1/2">
+        <div v-if="data.timeTrend.chart != null" class="border rounded border-neutral-300 p-2 bg-neutral-10" :class="data.issues === null || data.issues.length === 0 ? 'w-full' : 'w-1/2'">
           <p class="h2 p-2 flex justify-between items-center">
             <span>Time Trend<span class="material-symbols-outlined text-sm align-middle ml-2" v-tooltip.bottom="tooltip.timeTrend">info</span></span>
             <span class="text-2xl"><span class="text-cfm-secondary">{{ data.timeTrend.not_conforming }}</span>&nbsp/&nbsp{{ data.timeTrend.total }}</span>
@@ -140,10 +145,10 @@
           <Chart type="line" :data="timeChartData" :options="timeChartOptions" class="w-[99%]"/>
         </div>
         <!-- Issues list -->
-        <div v-if="data.issues.length === 0" class="w-1/2"></div>
+        <div v-if="data.issues === null || data.issues.length === 0"></div>
         <div v-else class="border rounded border-neutral-300 p-2 bg-neutral-10 " :class="data.timeTrend.chart !== null ? 'w-1/2' : 'w-full'">
           <p class="h2 pl-2 mb-2">Issue List</p>
-          <table class="text-sm min-w-full table-fixed" v-if="data.issues !== 'reset'">
+          <table class="text-sm min-w-full table-fixed">
             <tbody>
               <tr v-for="(trace, key) in data.issues" :key="key">
                 <td class="p-2 pl-6 truncate max-w-0 w-1/3">
diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue
index ccb2431..2b1e62b 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar.vue
@@ -900,6 +900,7 @@ export default {
         default:
           break;
       };
+      console.log(data);
       if(data.min > data.max) return this.$toast.error('Please check time range setting.');
       if(JSON.stringify(data) === JSON.stringify(this.isSubmitData)) return this.$toast.error('Please set the new rule.');
 
diff --git a/src/components/Discover/Map/SidebarFilter.vue b/src/components/Discover/Map/SidebarFilter.vue
index 3bfec02..03de148 100644
--- a/src/components/Discover/Map/SidebarFilter.vue
+++ b/src/components/Discover/Map/SidebarFilter.vue
@@ -476,6 +476,7 @@ export default {
         }
       }
       // 將資料指向 Vue data 雙向綁定
+      console.log(data);
       const postData = Array.isArray(data) ? data : [data];
 
       // 快速檢查每一 filter 規則是否為空集合
diff --git a/src/components/Discover/Map/SidebarState.vue b/src/components/Discover/Map/SidebarState.vue
index 77725e0..45aca4d 100644
--- a/src/components/Discover/Map/SidebarState.vue
+++ b/src/components/Discover/Map/SidebarState.vue
@@ -63,8 +63,7 @@
         <p class="h2">Case Duration</p>
         <ul class="space-y-1">
           <li><Tag value="MIN" class="!text-neutral-900 !bg-neutral-200 mr-2 !w-10"></Tag>{{ timeLabel(stats.case_duration.min) }}</li>
-          <li><Tag value="AVG" class="!text-neutral-900 !bg-neutral-200 mr-2 !w-10"></Tag>{{ timeLabel(stats.case_duration.average
-  ) }}</li>
+          <li><Tag value="AVG" class="!text-neutral-900 !bg-neutral-200 mr-2 !w-10"></Tag>{{ timeLabel(stats.case_duration.average) }}</li>
           <li><Tag value="MED" class="!text-neutral-900 !bg-neutral-200 mr-2 !w-10"></Tag>{{ timeLabel(stats.case_duration.median) }}</li>
           <li><Tag value="MAX" class="!text-neutral-900 !bg-neutral-200 mr-2 !w-10"></Tag>{{ timeLabel(stats.case_duration.max) }}</li>
         </ul>