From 1a7b4bf41808945f429524cd85a274734cfa25c5 Mon Sep 17 00:00:00 2001 From: Thanit Konmek Date: Wed, 16 Aug 2023 12:55:07 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0?= =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94=E0=B8=A3=E0=B8=B1?= =?UTF-8?q?=E0=B8=9A=E0=B9=82=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/00_dashboard/api.message.ts | 11 + src/api/index.ts | 14 +- src/app.config.ts | 6 + src/interface/request/main/main.ts | 6 +- src/interface/response/dashboard/dashboard.ts | 27 + .../components/Receive/receiveDetail2.vue | 881 +++++++++++++++++- .../components/Receive/receiveMain.vue | 267 +++--- .../components/Transfer/transferRegistry.vue | 2 +- .../interface/response/Receive.ts | 53 +- src/views/Dashboard.vue | 102 +- src/views/MainLayout.vue | 56 +- 11 files changed, 1283 insertions(+), 142 deletions(-) create mode 100644 src/api/00_dashboard/api.message.ts create mode 100644 src/interface/response/dashboard/dashboard.ts diff --git a/src/api/00_dashboard/api.message.ts b/src/api/00_dashboard/api.message.ts new file mode 100644 index 000000000..85e0c7b86 --- /dev/null +++ b/src/api/00_dashboard/api.message.ts @@ -0,0 +1,11 @@ +/** + * API Structure + Org Chart + */ +import env from "../index"; + +const message = `${env.API_DASHBOARD_URI}/message`; + +export default { + msgNotificate: `${message}/my-notifications`, + msgInbox: `${message}/my-inboxes`, +}; diff --git a/src/api/index.ts b/src/api/index.ts index 51f162272..be3edd2bf 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -28,6 +28,7 @@ const config = ref({ API_RETIREMENT_URI: "https://bma-ehr.frappet.synology.me/api/v1", API_PROBATION_URI: "https://bmaehr.joolsoft.com/nodeapi/v1", // API_PROBATION_URI: "http://192.168.1.151:7776/v1", + API_DASHBOARD_URI: "http://192.168.1.9:6026/api/v1", }, test: { API_URI: "http://localhost:5010/api/v1", @@ -72,7 +73,13 @@ const API_RETIREMENT_URI = ref( config.value[env.value].API_RETIREMENT_URI ); const API_URI_ORG_TREE = ref(config.value[env.value].API_URI_ORG_TREE); -const API_PROBATION_URI = ref(config.value[env.value].API_PROBATION_URI); +const API_PROBATION_URI = ref( + config.value[env.value].API_PROBATION_URI +); + +const API_DASHBOARD_URI = ref( + config.value[env.value].API_DASHBOARD_URI +); export default { env: env.value, @@ -86,6 +93,7 @@ export default { API_PLACEMENT_URI: API_PLACEMENT_URI.value, API_URI_ORG_TREE: API_URI_ORG_TREE.value, MEET_URI: MEET_URI.value, - API_RETIREMENT_URI:API_RETIREMENT_URI.value, - API_PROBATION_URI: API_PROBATION_URI.value + API_RETIREMENT_URI: API_RETIREMENT_URI.value, + API_PROBATION_URI: API_PROBATION_URI.value, + API_DASHBOARD_URI: API_DASHBOARD_URI.value, }; diff --git a/src/app.config.ts b/src/app.config.ts index ef0aa5f39..b8bb88983 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -37,6 +37,9 @@ import retirement from "./api/06_retirement/api.retirement"; /** API ระบบงานเครื่องราชอิสริยาภรณ์ List */ import insignia from "./api/07_insignia/api.insignia"; +/** API dashboard */ +import message from "./api/00_dashboard/api.message"; + // environment variables export const compettitivePanel = import.meta.env.VITE_COMPETITIVE_EXAM_PANEL; export const qualifyDisableExamPanel = import.meta.env @@ -74,6 +77,9 @@ const API = { ...probation, ...retirement, ...insignia, + + //dashboard + ...message, }; export default { diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts index ad8f16e68..ff5bc5dfe 100644 --- a/src/interface/request/main/main.ts +++ b/src/interface/request/main/main.ts @@ -28,10 +28,10 @@ interface menuType { } interface notiType { - id: number; + id: string; sender: string; body: string; - timereceive: string; + timereceive: Date; } interface optionType { @@ -257,7 +257,7 @@ const menuList = readonly([ role: "placement", }, { - key: 6.10, + key: 6.1, label: "รายการอื่นๆ" /* */, path: "other", role: "placement", diff --git a/src/interface/response/dashboard/dashboard.ts b/src/interface/response/dashboard/dashboard.ts new file mode 100644 index 000000000..e6320ecfa --- /dev/null +++ b/src/interface/response/dashboard/dashboard.ts @@ -0,0 +1,27 @@ +interface ResponseInbox { + body: string; + createdAt: Date; + createdFullName: string; + createdUserId: string; + id: string; + isOpen: boolean; + lastUpdateFullName: string; + lastUpdateUserId: string; + lastUpdatedAt: Date; + openDate: Date | null; + payload: string; + receiveDate: Date; + receiverUserId: string; + subject: string; +} + +interface DataInbox { + no: string; + sender: string; + subject: string; + timereceive: Date; + body: string; + ratingModel: number; +} + +export type { ResponseInbox, DataInbox }; diff --git a/src/modules/05_placement/components/Receive/receiveDetail2.vue b/src/modules/05_placement/components/Receive/receiveDetail2.vue index 77c473d6d..258159c26 100644 --- a/src/modules/05_placement/components/Receive/receiveDetail2.vue +++ b/src/modules/05_placement/components/Receive/receiveDetail2.vue @@ -65,14 +65,525 @@ + + +
+
+ แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย +
+ +
+ +
+
+ + +
+
+
+ +
+
+
+
+
ข้อมูลส่วนตัว
+
+
+ + +
+
+ +
+ +
+ +
+
+ +
+
+ + + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ ตำแหน่งและหน่วยงานเดิม +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +