update filter 67

wevisdemo · Aug 30, 2023 · c158ddf · c158ddf
1 parent 6da6378
commit c158ddf
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 21 deletions.
diff --git a/components/budget/charts/DropDownYearList.vue b/components/budget/charts/DropDownYearList.vue
@@ -39,13 +39,14 @@ export default {
   data() {
     return {
       yearList: [
-        { label: "2561-2566", value: "" },
+        { label: "2561-2567", value: "" },
         { label: "2561", value: 61 },
         { label: "2562", value: 62 },
         { label: "2563", value: 63 },
         { label: "2564", value: 64 },
         { label: "2565", value: 65 },
         { label: "2566", value: 66 },
+        { label: "2567", value: 67 },
       ],
     };
   },

diff --git a/components/budget/charts/HorizontalBarChart.vue b/components/budget/charts/HorizontalBarChart.vue
@@ -18,10 +18,7 @@
           class="bg-black flex text-white w-fit wv-b6 px-[10px] py-[6px] rounded-[5px] cursor-pointer"
           @click="handleModal"
         >
-        <img
-                src="~/assets/icons/seemore.svg"
-                class=" mr-2"
-              />
+          <img src="~/assets/icons/seemore.svg" class="mr-2" />
           ดูรายการใช้งบ
         </div>
       </ModalDetails>
@@ -309,7 +306,7 @@ export default {
           ).length,
         };
       } else {
-        this.updateSelectYearStrategy({ label: "2561-2566", value: "" });
+        this.updateSelectYearStrategy({ label: "2561-2567", value: "" });
         this.filterYears = this.isModalDetails;
       }
     },

diff --git a/components/budget/charts/ModalDetails.vue b/components/budget/charts/ModalDetails.vue
@@ -143,15 +143,16 @@ export default {
       filterYears: [],
       defaultByFilter: [],
       isProject: false,
-      selectFilter: "2561-2566",
+      selectFilter: "2561-2567",
       yearList: [
-        { label: "2561-2566", value: "" },
+        { label: "2561-2567", value: "" },
         { label: "2561", value: 61 },
         { label: "2562", value: 62 },
         { label: "2563", value: 63 },
         { label: "2564", value: 64 },
         { label: "2565", value: 65 },
         { label: "2566", value: 66 },
+        { label: "2567", value: 67 },
       ],
     };
   },
@@ -213,11 +214,11 @@ export default {
         });
       } else {
         if (this.page === "organize")
-          this.updateSelectYearOrganize({ label: "2561-2566", value: "" });
+          this.updateSelectYearOrganize({ label: "2561-2567", value: "" });
         if (this.page === "strategy")
-          this.updateSelectYearStrategy({ label: "2561-2566", value: "" });
+          this.updateSelectYearStrategy({ label: "2561-2567", value: "" });
         if (this.page === "keyword")
-          this.updateSelectKeywordStrategy({ label: "2561-2566", value: "" });
+          this.updateSelectKeywordStrategy({ label: "2561-2567", value: "" });
         this.filterYears = this.isModalDetails;
       }
     },

diff --git a/components/expore/SurveyByKeyword.vue b/components/expore/SurveyByKeyword.vue
@@ -427,7 +427,7 @@ export default {
       const groupOrganize = Object.keys(_.groupBy(response.items, "nameOrganization"));
       this.filterOrganize = [`${groupOrganize.length} หน่วยงาน`, ...groupOrganize];
       this.selectFilter = this.filterOrganize[0];
-      this.updateSelectKeywordStrategy({ label: "2561-2566", value: "" });
+      this.updateSelectKeywordStrategy({ label: "2561-2567", value: "" });
       this.updateIsModalDetails(response);
       this.updateSubTitleModal(
         `ที่มีคำว่า “${this.selectedKey.Word}” ในชื่อ ซึ่งของบโดย “${this.filterOrganize.length} หน่วยงาน”`,

diff --git a/components/expore/SurveyByOrganize.vue b/components/expore/SurveyByOrganize.vue
@@ -3,7 +3,7 @@
     id="byYears"
     class="mt-7 md:w-[80%] mx-auto lg:w-full flex lg:space-x-[35px] min-h-screen flex-col lg:flex-row justify-center relative"
   >
-    <div class="fixed w-full bottom-0 ">
+    <div class="fixed w-full bottom-0">
       <div
         id="scrollTopTop"
         @click="scrollToTop"
@@ -39,7 +39,9 @@
     </div>
     <div class="lg:max-w-[685px] mt-3 flex-1 flex flex-col justify-between">
       <div class="flex items-center">
-        <p class="wv-h8 font-bold mr-2 wv-kondolar" id="topic-pointer">หน่วยงานที่ได้รับงบในปี</p>
+        <p class="wv-h8 font-bold mr-2 wv-kondolar" id="topic-pointer">
+          หน่วยงานที่ได้รับงบในปี
+        </p>
         <el-select
           v-model="selectFilterYear"
           placeholder="Select"
@@ -163,15 +165,16 @@ export default {
       ],
       selectedFilter: "งบมากไปน้อย",
       isFilterModal: false,
-      selectFilterYear: "2561-2566",
+      selectFilterYear: "2561-2567",
       yearList: [
-        { label: "2561-2566", value: "" },
+        { label: "2561-2567", value: "" },
         { label: "2561", value: 61 },
         { label: "2562", value: 62 },
         { label: "2563", value: 63 },
         { label: "2564", value: 64 },
         { label: "2565", value: 65 },
         { label: "2566", value: 66 },
+        { label: "2567", value: 67 },
       ],
     };
   },
@@ -250,7 +253,7 @@ export default {
             .length,
         };
       } else {
-        this.updateSelectYearOrganize({ label: "2561-2566", value: "" });
+        this.updateSelectYearOrganize({ label: "2561-2567", value: "" });
         this.filterYears = this.isModalDetails;
       }
       this.fetchByOrganizeYear(year);

diff --git a/pages/about/index.vue b/pages/about/index.vue
@@ -244,7 +244,7 @@ export default Vue.extend({
           names: [
             "<a href='https://www.linkedin.com/mwlite/in/pimpatipan-angkharuengrattana-560898209' target='_blank'>พิมพ์ปฏิภาณ อังคเรืองรัตนา<a/>,&nbsp;",
             "<a href='https://github.com/palminister' target='_blank'>ธนภัทร จำนงรัตน์ </a>,&nbsp;",
-            "ณัฐกิตติ์ แซ่ตัน",
+            "ณัฐกิตติ์ แซ่ตัน,&nbsp",
             "<a href='https://github.com/napatswift' target='_blank'>ณภัทร ดลภาวิจิต</a>,&nbsp;",
             "<a href='https://github.com/mixth' target='_blank'>ณรัฐ สุชาติสุนทร</a>,&nbsp;",
             "<a href='https://github.com/MEEP00H' target='_blank'>โสภณ จำปาซ่อนกลิ่น</a>",

diff --git a/store/index.ts b/store/index.ts
@@ -36,9 +36,9 @@ export const state = (): State => ({
     project_type: "",
     project_id: "",
   },
-  selectYearOrganize: { label: "2561-2566", value: "" },
-  selectYearStrategy: { label: "2561-2566", value: "" },
-  selectKeywordStrategy: { label: "2561-2566", value: "" },
+  selectYearOrganize: { label: "2561-2567", value: "" },
+  selectYearStrategy: { label: "2561-2567", value: "" },
+  selectKeywordStrategy: { label: "2561-2567", value: "" },
   selectedSurvey: [],
 });