diff --git a/acupuncture-前台/针灸-前台5.zip b/acupuncture-前台/针灸-前台6.zip similarity index 95% rename from acupuncture-前台/针灸-前台5.zip rename to acupuncture-前台/针灸-前台6.zip index f55bf345..3b16fbce 100644 Binary files a/acupuncture-前台/针灸-前台5.zip and b/acupuncture-前台/针灸-前台6.zip differ diff --git a/acupuncture-后台/.env.development b/acupuncture-后台/.env.development index 8b988891..59be52c7 100644 --- a/acupuncture-后台/.env.development +++ b/acupuncture-后台/.env.development @@ -6,8 +6,8 @@ ENV = 'development' # 大唐会议管理系统/开发环境 VUE_APP_BASE_API = '/dev-api' -VUE_APP_IMG_URL = 'https://test.tall.wiki/acupuncture' -VUE_APP_API_QZURL = 'https://test.tall.wiki/' +VUE_APP_IMG_URL = 'https://test.tall.wiki/acupuncture/api/' +VUE_APP_API_QZURL = 'https://test.tall.wiki/acupuncture/api/' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true # 访问路径 diff --git a/acupuncture-后台/.env.production b/acupuncture-后台/.env.production index 16933567..957cfc4e 100644 --- a/acupuncture-后台/.env.production +++ b/acupuncture-后台/.env.production @@ -4,8 +4,9 @@ VUE_APP_TITLE = 朱琏针灸联盟数据系统 # 生产环境配置 NODE_ENV = 'production' # 因孚生产 -VUE_APP_BASE_API = 'https://test.tall.wiki/acupuncture' -VUE_APP_API_QZURL = 'https://test.tall.wiki/' - +VUE_APP_BASE_API = 'http://113.45.159.249:40010/acupuncture/api/' +VUE_APP_API_QZURL = 'http://113.45.159.249:40010/acupuncture/api/' +# 筛查访问地址 +VUE_APP_H5_URL = 'http://113.45.159.249:40010/acupuncture/admin/screening/h5' # 访问路径 -VUE_APP_PUBLIC_PATH = '/acupunctureAdmin/' +VUE_APP_PUBLIC_PATH = '/acupuncture/admin/' diff --git a/acupuncture-后台/.env.staging b/acupuncture-后台/.env.staging index f9b9ae8a..9a38ef4f 100644 --- a/acupuncture-后台/.env.staging +++ b/acupuncture-后台/.env.staging @@ -1,12 +1,12 @@ # 页面标题 VUE_APP_TITLE = 朱琏针灸联盟数据系统 -BABEL_ENV = production - -NODE_ENV = production - -# 测试环境配置 -ENV = 'staging' - -# 朱琏针灸联盟数据系统/测试环境 -VUE_APP_BASE_API = '/stage-api' +# 生产环境配置 +NODE_ENV = 'production' +# 因孚生产 +VUE_APP_BASE_API = 'https://test.tall.wiki/acupuncture/api/' +VUE_APP_API_QZURL = 'https://test.tall.wiki/acupuncture/api/' +# 筛查访问地址 +VUE_APP_H5_URL = 'https://test.tall.wiki/acupuncture/admin/screening/h5' +# 访问路径 +VUE_APP_PUBLIC_PATH = '/acupuncture/admin/' diff --git a/acupuncture-后台/src/views/medicalFile/details.vue b/acupuncture-后台/src/views/medicalFile/details.vue index 3144fbdc..44700583 100644 --- a/acupuncture-后台/src/views/medicalFile/details.vue +++ b/acupuncture-后台/src/views/medicalFile/details.vue @@ -1226,7 +1226,7 @@ export default { return; } this.humanBodyOpen = true; - this.selectReportUrl = `${this.qzUrl}acupuncture${res.data.fileName}`; + this.selectReportUrl = `${this.qzUrl}${res.data.fileName}`; }); }, // 查询人体成分 diff --git a/acupuncture-后台/src/views/medicalFile/index.vue b/acupuncture-后台/src/views/medicalFile/index.vue index aa8fce88..bbed14e9 100644 --- a/acupuncture-后台/src/views/medicalFile/index.vue +++ b/acupuncture-后台/src/views/medicalFile/index.vue @@ -744,8 +744,7 @@ export default { deptId: localStorage.getItem("hospitalId"), }, uploadFileUrl1: - process.env.VUE_APP_API_QZURL + - "/acupuncture/treatment/importTreatment", // 上传的图片服务器地址 + process.env.VUE_APP_API_QZURL + "/treatment/importTreatment", // 上传的图片服务器地址 fileList: [], followupList: [], queueOpen: false, @@ -1502,7 +1501,7 @@ export default { // 评估报告单 handleReport(row) { exportTreatmentPg({ treatmentId: row.id }).then((res) => { - window.open(`${process.env.VUE_APP_API_QZURL}acupuncture${res.data}`); + window.open(`${process.env.VUE_APP_API_QZURL}${res.data}`); }); }, /** 提交审核 */ @@ -1687,7 +1686,7 @@ export default { /** 下载按钮操作 */ handleDownload() { window.open( - `${process.env.VUE_APP_API_QZURL}/acupuncture/profile/TreamentTemplate.xlsx` + `${process.env.VUE_APP_API_QZURL}/profile/TreamentTemplate.xlsx` ); // this.download1( // "/patient/export", {}, diff --git a/acupuncture-后台/src/views/member/account.vue b/acupuncture-后台/src/views/member/account.vue index 157c93c0..0f6abe9d 100644 --- a/acupuncture-后台/src/views/member/account.vue +++ b/acupuncture-后台/src/views/member/account.vue @@ -421,7 +421,7 @@ export default { /** 下载按钮操作 */ handleDownload() { window.open( - `${process.env.VUE_APP_API_QZURL}/acupuncture/profile/TreamentTemplate.xlsx` + `${process.env.VUE_APP_API_QZURL}/profile/TreamentTemplate.xlsx` ); // this.download1( // "/patient/export", {}, diff --git a/acupuncture-后台/src/views/patientFile/index.vue b/acupuncture-后台/src/views/patientFile/index.vue index d12b3dde..f8aa5aff 100644 --- a/acupuncture-后台/src/views/patientFile/index.vue +++ b/acupuncture-后台/src/views/patientFile/index.vue @@ -413,7 +413,7 @@ export default { deptId: localStorage.getItem("hospitalId"), }, uploadFileUrl1: - process.env.VUE_APP_API_QZURL + "/acupuncture/patient/import", // 上传的图片服务器地址 + process.env.VUE_APP_API_QZURL + "/patient/import", // 上传的图片服务器地址 fileList: [], // 通过年限对象获取学历 educationYearsValue: { @@ -758,7 +758,7 @@ export default { /** 下载按钮操作 */ handleDownload() { window.open( - `${process.env.VUE_APP_API_QZURL}/acupuncture/profile/PatientTemplate.xlsx` + `${process.env.VUE_APP_API_QZURL}/profile/PatientTemplate.xlsx` ); // this.download1( // "/patient/export", {}, diff --git a/acupuncture-后台/src/views/screening/qrCode.vue b/acupuncture-后台/src/views/screening/qrCode.vue index 4788a3f5..2fb560b2 100644 --- a/acupuncture-后台/src/views/screening/qrCode.vue +++ b/acupuncture-后台/src/views/screening/qrCode.vue @@ -90,7 +90,7 @@ >