From 8a150642b5a33cd6a8327e423ea28635c3ba2cfe Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 14 Aug 2024 10:15:42 +0700
Subject: [PATCH] updated layout summary indicator

---
 .../01_masterdata/components/Indicators/Summary.vue    |  2 +-
 src/modules/01_masterdata/views/Assignment.vue         | 10 ++++------
 src/modules/01_masterdata/views/indicatorByPlan.vue    |  6 ++++--
 src/modules/01_masterdata/views/indicatorByRole.vue    |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/modules/01_masterdata/components/Indicators/Summary.vue b/src/modules/01_masterdata/components/Indicators/Summary.vue
index 856abde1b..e1f7d31b6 100644
--- a/src/modules/01_masterdata/components/Indicators/Summary.vue
+++ b/src/modules/01_masterdata/components/Indicators/Summary.vue
@@ -54,7 +54,7 @@ onMounted(() => {
 });
 </script>
 <template>
-  <q-card bordered class="q-mb-sm q-pa-xs bg-grey-1">
+  <q-card bordered class="q-pa-xs bg-grey-1">
     <div class="row q-col-gutter-sm">
       <div
         v-for="i in indicatorTotal"
diff --git a/src/modules/01_masterdata/views/Assignment.vue b/src/modules/01_masterdata/views/Assignment.vue
index 4a570c312..c149e9ca9 100644
--- a/src/modules/01_masterdata/views/Assignment.vue
+++ b/src/modules/01_masterdata/views/Assignment.vue
@@ -13,7 +13,7 @@ import type {
 } from "@/modules/01_masterdata/interface/index/Main";
 import type { FormFilterAssignment } from "@/modules/01_masterdata/interface/request/Main";
 import type { ResAssignment } from "@/modules/01_masterdata/interface/response/Main";
-import IndicatorTotal from "@/modules/01_masterdata/components/Indicators/Summary.vue";
+import Summary from "@/modules/01_masterdata/components/Indicators/Summary.vue";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@@ -174,12 +174,10 @@ onMounted(() => {
   <div class="toptitle text-dark col-12 row items-center">
     รายการงานอื่นๆ ที่ได้รับมอบหมาย
   </div>
+
+  <Summary />
+
   <q-card flat bordered class="q-pa-md">
-    <div class="row">
-      <div class="col-12">
-        <IndicatorTotal />
-      </div>
-    </div>
     <div class="row q-col-gutter-sm q-pl-sm">
       <q-toolbar style="padding: 0">
         <div class="row q-gutter-sm">
diff --git a/src/modules/01_masterdata/views/indicatorByPlan.vue b/src/modules/01_masterdata/views/indicatorByPlan.vue
index 69cd271c1..c58689350 100644
--- a/src/modules/01_masterdata/views/indicatorByPlan.vue
+++ b/src/modules/01_masterdata/views/indicatorByPlan.vue
@@ -8,7 +8,7 @@ import config from "@/app.config";
 
 import type { DataOption } from "@/modules/01_masterdata/interface/index/Main";
 import DialogHistory from "@/modules/01_masterdata/components/Indicators/DialogHistory.vue";
-import IndicatorTotal from "@/modules/01_masterdata/components/Indicators/Summary.vue";
+import Summary from "@/modules/01_masterdata/components/Indicators/Summary.vue";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@@ -205,6 +205,9 @@ onMounted(() => {
   <div class="toptitle text-dark col-12 row items-center">
     รายการตัวชี้วัดตามแผนฯ
   </div>
+
+  <Summary />
+
   <q-card bordered class="col-12 row caedNone">
     <div class="col-xs-12 col-sm-3 row">
       <div class="col-12 row no-wrap">
@@ -268,7 +271,6 @@ onMounted(() => {
     </div>
     <div class="col-xs-12 col-sm-9 q-pa-md row">
       <div class="col-12">
-        <IndicatorTotal />
         <div class="row q-col-gutter-sm items-center q-mb-sm no-wrap">
           <datepicker
             menu-class-name="modalfix"
diff --git a/src/modules/01_masterdata/views/indicatorByRole.vue b/src/modules/01_masterdata/views/indicatorByRole.vue
index d844e9645..da61fc132 100644
--- a/src/modules/01_masterdata/views/indicatorByRole.vue
+++ b/src/modules/01_masterdata/views/indicatorByRole.vue
@@ -12,7 +12,7 @@ import type {
 } from "@/modules/01_masterdata/interface/index/Main";
 
 import DialogHistory from "@/modules/01_masterdata/components/Indicators/DialogHistory.vue";
-import IndicatorTotal from "@/modules/01_masterdata/components/Indicators/Summary.vue";
+import Summary from "@/modules/01_masterdata/components/Indicators/Summary.vue";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@@ -273,10 +273,10 @@ onMounted(async () => {
   <div class="toptitle text-dark col-12 row items-center">
     รายการตัวชี้วัดตามตำแหน่ง
   </div>
+
+  <Summary />
+
   <q-card flat bordered class="q-pa-md">
-    <div class="col-12">
-      <IndicatorTotal />
-    </div>
     <div class="row q-gutter-sm no-wrap q-mb-sm">
       <q-select
         dense