From 99faf68c666ebde1537f8a27b477aeb8de4b0901 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 11 Apr 2024 16:26:54 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=20=20=3D>=20Tab=20=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B8=95=E0=B8=B4=E0=B8=94=E0=B8=95=E0=B8=B2=E0=B8=A1?= =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99?= =?UTF-8?q?=E0=B8=9C=E0=B8=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/FollowResult.vue | 677 +++++++++++++----- .../15_development/components/Other.vue | 6 - .../interface/request/FollowResult.ts | 21 + .../interface/response/FollowResult.ts | 20 + 4 files changed, 541 insertions(+), 183 deletions(-) create mode 100644 src/modules/15_development/interface/request/FollowResult.ts create mode 100644 src/modules/15_development/interface/response/FollowResult.ts diff --git a/src/modules/15_development/components/FollowResult.vue b/src/modules/15_development/components/FollowResult.vue index bbf6497b0..13e01396a 100644 --- a/src/modules/15_development/components/FollowResult.vue +++ b/src/modules/15_development/components/FollowResult.vue @@ -1,20 +1,92 @@ diff --git a/src/modules/15_development/components/Other.vue b/src/modules/15_development/components/Other.vue index 187ec895e..65f5620e3 100644 --- a/src/modules/15_development/components/Other.vue +++ b/src/modules/15_development/components/Other.vue @@ -2,7 +2,6 @@ import { onMounted, reactive, ref } from "vue"; import { useQuasar } from "quasar"; import { useRoute } from "vue-router"; - import http from "@/plugins/http"; import config from "@/app.config"; @@ -10,10 +9,8 @@ import type { DataOption } from "@/modules/15_development/interface/index/Main"; import type { FormData } from "@/modules/15_development/interface/request/Other"; import { useCounterMixin } from "@/stores/mixin"; -import { useDevelopmentDataStore } from "@/modules/15_development/store/developmentStore"; const $q = useQuasar(); -const store = useDevelopmentDataStore(); const { showLoader, hideLoader, @@ -102,9 +99,7 @@ function fetchData() { http .get(config.API.developmentMainTab("tab5", projectId.value)) .then((res) => { - console.log(res); const data = res.data.result; - formData.dateStart = data.dateStart; formData.dateEnd = data.dateEnd; formData.totalDate = data.totalDate; @@ -112,7 +107,6 @@ function fetchData() { address: e.address, provinceId: e.provinceId, })); - formData.budget = data.budget; formData.accept = data.accept; formData.receive = data.receive; diff --git a/src/modules/15_development/interface/request/FollowResult.ts b/src/modules/15_development/interface/request/FollowResult.ts new file mode 100644 index 000000000..72d97adec --- /dev/null +++ b/src/modules/15_development/interface/request/FollowResult.ts @@ -0,0 +1,21 @@ +interface FormIndicators { + indicators: string; + target: number | null; + metricType: string; + calculation: string; + measuRement: string; + results: string; + obstacles: string; + suggestions: string; +} + +interface FormProject { + isBudget: boolean; + isNoPass: boolean; + isOutBudget: boolean; + isPassAllocate: boolean; + isPassNoAllocate: boolean; + project: string; +} + +export type { FormIndicators, FormProject }; diff --git a/src/modules/15_development/interface/response/FollowResult.ts b/src/modules/15_development/interface/response/FollowResult.ts new file mode 100644 index 000000000..e6f4ef24f --- /dev/null +++ b/src/modules/15_development/interface/response/FollowResult.ts @@ -0,0 +1,20 @@ +interface DevelopmentEvaluations { + calculation: string; + createdAt: string; + createdFullName: string; + createdUserId: string; + developmentId: string; + id: string; + indicators: string; + lastUpdateFullName: string; + lastUpdateUserId: string; + lastUpdatedAt: string; + measuRement: string; + metricType: string; + obstacles: string; + results: string; + suggestions: string; + target: number | null; +} + +export type { DevelopmentEvaluations };