Merge branch 'develop' into dev

src/modules/01_dashboard/views/Dashboard.vue

@@ -187,14 +187,8 @@ onMounted(async () => {
           <q-card
             v-else
             bordered
-            @click="
+            @click="goToPage(item.path)"
-              item.path === '/organization-chart' ? null : goToPage(item.path)
+            class="noactive col-12"
-            "
-            :class="
-              item.path === '/organization-chart'
-                ? 'disabledcard col-12'
-                : 'noactive col-12'
-            "
           >
             <div class="col-12">
               <q-avatar
@@ -218,9 +212,6 @@ onMounted(async () => {
             >
               {{ item.sub }}
             </div>
-            <q-tooltip v-if="item.path === '/organization-chart'">
-              อยู่ระหว่างปรับปรุง</q-tooltip
-            >
           </q-card>
         </div>
       </div>

src/stores/data.ts

@@ -161,8 +161,7 @@ export const useDataStore = defineStore("dataMain", () => {
       icon: "mdi-account-group-outline",
       title: "แผนผังองค์กร",
       sub: "ดูแผนผังองค์กร",
-      // color: "blue-3",
+      color: "blue-3",
-      color: "grey-3",
       path: "/organization-chart",
       active: false,
     },