From 22878cfc48c7200e0b01366fe1db3a532308a464 Mon Sep 17 00:00:00 2001
From: oat_dev <nattapon@frappet.com>
Date: Wed, 10 Jul 2024 15:10:12 +0700
Subject: [PATCH] merge UI

---
 src/modules/03_logs/router.ts       |  8 ----
 src/modules/03_logs/views/lists.vue | 58 +++++++++++++++++------------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/modules/03_logs/router.ts b/src/modules/03_logs/router.ts
index 4dd377a2..b24b492b 100644
--- a/src/modules/03_logs/router.ts
+++ b/src/modules/03_logs/router.ts
@@ -9,12 +9,4 @@ export default [
       Role: ["SUPER_ADMIN", "ADMIN"],
     },
   },
-  {
-    path: "/lists/:pathMatch(.*)*",
-    name: "viewLogs",
-    component: ListsPage,
-    meta: {
-      Role: ["SUPER_ADMIN", "ADMIN"],
-    },
-  },
 ];
diff --git a/src/modules/03_logs/views/lists.vue b/src/modules/03_logs/views/lists.vue
index 94551156..f57c8ab5 100644
--- a/src/modules/03_logs/views/lists.vue
+++ b/src/modules/03_logs/views/lists.vue
@@ -4,13 +4,14 @@
 /** importComponents*/
 import CardComponents from "@/modules/03_logs/components/CardComponents.vue";
 import LogTable from "@/modules/03_logs/components/LogTable.vue";
+import { useRoute } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
-import { link } from "fs";
-import { ref } from "vue";
+import { ref, onMounted } from "vue";
+import { useCurrencyInput } from "vue-currency-input";
 
 /** importStore*/
-
+const route = useRoute();
 /** use*/
 
 const menuList = ref<{ icon: string; label: string; path: string }[]>([
@@ -100,13 +101,40 @@ const menuList = ref<{ icon: string; label: string; path: string }[]>([
     path: "lists?system=sso",
   },
 ]);
+
+onMounted(async () => {
+  console.log("");
+});
 </script>
 
 <template>
   <div>
-    <div class="q-pl-lg q-pb-lg text-h6">ประวัติกิจกรรม (Logs)</div>
+    <div class="row q-mb-lg">
+      <q-btn
+        flat
+        v-if="route.query.system"
+        round
+        class="q-mr-sm"
+        color="primary"
+        icon="mdi-arrow-left"
+        dense
+        to="lists"
+      >
+      </q-btn>
+      <div class="row items-center">
+        <span class="toptitle text-dark items-center q-mr-md">
+          ประวัติกิจกรรม (Logs)
+        </span>
+        <div
+          v-if="route.query.system"
+          class="toptitle text-primary items-center"
+        >
+          ระบบทะเบียนประวัติ
+        </div>
+      </div>
+    </div>
 
-    <div class="row q-col-gutter-lg full-width">
+    <div v-if="!route.query.system" class="row q-col-gutter-lg full-width">
       <div class="col-3" :key="index" v-for="(item, index) in menuList">
         <CardComponents
           class="cursor-pointer"
@@ -119,25 +147,7 @@ const menuList = ref<{ icon: string; label: string; path: string }[]>([
     </div>
   </div>
 
-  <div class="row q-mb-lg">
-    <q-btn
-      flat
-      round
-      class="q-mr-sm"
-      color="primary"
-      icon="mdi-arrow-left"
-      dense
-      @click="console.log('test')"
-    >
-    </q-btn>
-    <div class="row items-center">
-      <span class="toptitle text-dark items-center q-mr-md">
-        ประวัติกิจกรรม (Logs)
-      </span>
-      <div class="toptitle text-primary items-center">ระบบทะเบียนประวัติ</div>
-    </div>
-  </div>
-  <div>
+  <div v-if="route.query.system">
     <LogTable />
   </div>
 </template>