diff --git a/.env.production b/.env.production index df95cced..f466c296 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ VITE_API_URI_CONFIG=VITE_API_URI_CONFIG VITE_API_REPORT_URL=VITE_API_REPORT_URL VITE_MANUAL_URL=VITE_MANUAL_URL -VITE_URL_SSO: VITE_URL_SSO \ No newline at end of file +VITE_URL_SSO=VITE_URL_SSO \ No newline at end of file diff --git a/src/api/index.ts b/src/api/index.ts index 6d414f75..8a86b8aa 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -16,7 +16,6 @@ const config = ref({ API_URI_PROFILE_SERVICE: apiUrlConfig, API_REPORT_URI: apiUrlConfig, MEET_URI: "meet.frappet.com", - API_REPORT2_URI: "https://bma-ehr.frappet.synology.me/api/v2", API_REPORT_TEMPLATE_URI: "https://report-server.frappet.synology.me/api/v1/report-template", API_LOG: apiUrlConfig, @@ -35,7 +34,6 @@ const config = ref({ API_URI_PROFILE_SERVICE: apiUrlConfig, API_REPORT_URI: apiUrlConfig, MEET_URI: "meet.frappet.com", - API_REPORT2_URI: `${window.location.protocol}//${window.location.host}/api/v2`, API_REPORT_TEMPLATE_URI: apiUrlConfigReport, API_LOG: apiUrlConfig, }, @@ -53,7 +51,6 @@ const MEET_URI = ref(config.value[env.value].MEET_URI); const API_URI_PROFILE_SERVICE = ref( config.value[env.value].API_URI_PROFILE_SERVICE ); -const API_REPORT2_URI = ref(config.value[env.value].API_REPORT2_URI); const API_REPORT_TEMPLATE_URI = ref( config.value[env.value].API_REPORT_TEMPLATE_URI ); @@ -68,7 +65,6 @@ export default { API_URI_ORG_EMPLOYEE_SERVICE: API_URI_ORG_EMPLOYEE_SERVICE.value, API_URI_PROFILE_SERVICE: API_URI_PROFILE_SERVICE.value, MEET_URI: MEET_URI.value, - API_REPORT2_URI: API_REPORT2_URI.value, API_REPORT_TEMPLATE_URI: API_REPORT_TEMPLATE_URI.value, API_LOG: API_LOG.value, }; diff --git a/src/api/reports/api.report.ts b/src/api/reports/api.report.ts deleted file mode 100644 index 5508f22b..00000000 --- a/src/api/reports/api.report.ts +++ /dev/null @@ -1,49 +0,0 @@ -/** - * api รายงานทั้งหมด - */ -import env from "../index"; -const reportOrder = `${env.API_REPORT2_URI}/report/order`; -const reportRetire = `${env.API_REPORT2_URI}/report/retire`; -const reportProbation = `${env.API_REPORT2_URI}/report/probation`; -const reportResign = `${env.API_REPORT2_URI}/report/resign/33`; -const reportTransfer = `${env.API_REPORT2_URI}/report/transfer`; -const reportDeceased = `${env.API_REPORT2_URI}/report/deceased`; -const reportTemplate = `${env.API_REPORT_TEMPLATE_URI}`; - -export default { - reportOrderCover: (fileType: string, id: string, commandCode: string) => - `${reportOrder}/${commandCode}/cover/${fileType}/${id}`, - reportOrderAttachment: (fileType: string, id: string, commandCode: string) => - `${reportOrder}/${commandCode}/attachment/${fileType}/${id}`, - reportRetireList: (fileType: string, id: string) => - `${reportRetire}/${fileType}/${id}`, - reportResignList: (fileType: string, id: string) => - `${reportResign}/${fileType}/${id}`, - - fileCover: (format: string, fileType: string, id: string) => - `${reportOrder}/${format}/cover/${fileType}/${id}`, - fileAttachment: (format: string, fileType: string, id: string) => - `${reportOrder}/${format}/attachment/${fileType}/${id}`, - - //ระบบทดลองงาน - reportAssign: (type: string, id: string) => - `${reportProbation}/13/${type}/${id}`, - reportEvaluateRecord1: (type: string, id: string) => - `${reportProbation}/14/${type}/${id}`, - // reportEvaluateRecord2:(type:string, id:string) => `${reportProbation}/15/${type}/${id}`, - reportEvaluate: (type: string, id: string) => - `${reportProbation}/16/${type}/${id}`, - reportEvaluateChairman: (type: string, id: string) => - `${reportProbation}/17/${type}/${id}`, - reportEvaluateResult: (type: string, id: string) => - `${reportProbation}/19/${type}/${id}`, - // reportSurvey:(type:string, id:string) => `${reportProbation}/19/${type}/${id}`, - - //filetransfer - reportTransferFile: (no: number, type: string, id: string) => - `${reportTransfer}/${no}/${type}/${id}`, - - DeceasedReport: (type: string, id: string) => - `${reportDeceased}/36/${type}/${id}`, - reportTemplate, -}; diff --git a/src/app.config.ts b/src/app.config.ts index 25576725..2242b42e 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -21,9 +21,6 @@ import registry from "./api/registry/api.registry"; /** API dashboard */ import message from "./api/00_dashboard/api.message"; -/** API reports */ -import reports from "./api/reports/api.report"; - /** API โครงสร้างอัตรากำลัง*/ import organization from "./api/02_organizational/api.organization"; @@ -107,9 +104,6 @@ const API = { //dashboard ...message, - //reports - ...reports, - /*file*/ ...file,