diff --git a/.env.development b/.env.development index aa72728..f2222dc 100644 --- a/.env.development +++ b/.env.development @@ -1,2 +1,8 @@ NODE_ENV=development -VUE_APP_NODE_ENV=dev \ No newline at end of file +VUE_APP_NODE_ENV=dev + +VUE_APP_LOGIN_URL='http://47.110.224.240:8036/xiangan-crf' + +# pacs浏览器 +VUE_APP_PACS_URL='http://192.168.0.85:8001' +# VUE_APP_PACS_URL='http://z1.huimucloud.com:8085' diff --git a/.env.production b/.env.production index e5254a5..d784641 100644 --- a/.env.production +++ b/.env.production @@ -1,2 +1,9 @@ NODE_ENV=production -VUE_APP_NODE_ENV=prod \ No newline at end of file +VUE_APP_NODE_ENV=prod + +# 苏州正式环境 +VUE_APP_LOGIN_URL='http://10.80.5.32:8031/xiangan-crf' + +# pacs浏览器 +VUE_APP_PACS_URL='http://10.80.5.32:8026' +# VUE_APP_PACS_URL='http://z1.huimucloud.com:8085' diff --git a/.env.staging b/.env.staging index 2261c93..e0347dc 100644 --- a/.env.staging +++ b/.env.staging @@ -1,2 +1,8 @@ -NODE_ENV=production -VUE_APP_NODE_ENV=staging \ No newline at end of file +NODE_ENV=staging +VUE_APP_NODE_ENV=staging + +VUE_APP_LOGIN_URL='http://47.110.224.240:8036/xiangan-crf' + +# pacs浏览器 +VUE_APP_PACS_URL='http://192.168.0.85:8001' +# VUE_APP_PACS_URL='http://z1.huimucloud.com:8085' diff --git a/dist.zip b/dist.zip deleted file mode 100644 index ace3b67..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/public/index.html b/public/index.html index 6f4ade2..ca031d4 100644 --- a/public/index.html +++ b/public/index.html @@ -29,35 +29,6 @@ window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false; // 动态(菜单)路由是否已经添加的状态标示（用于判断是否需要重新拉取数据并进行动态添加操作） - - <% if (process.env.VUE_APP_NODE_ENV === 'local') { %> - - <% } %> - <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> - - <% } %> - - <% if (process.env.VUE_APP_NODE_ENV === 'staging') { %> - - <% } %> - - <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %> - - <% } %> -
diff --git a/src/components/360View/commonForm/optometryForm.vue b/src/components/360View/commonForm/optometryForm.vue index 47c40b5..be63a1a 100644 --- a/src/components/360View/commonForm/optometryForm.vue +++ b/src/components/360View/commonForm/optometryForm.vue @@ -374,7 +374,9 @@ /> -

说明：1.持本报告单配镜仅供参考。 2.本报告单有效期3个月

+

说明：1.验光结果以此报告为准。 + 2.此报告仅供配镜参考，配镜参数以实际测量和试镜结果为准。 + 3.本报告有效期3个月。

diff --git a/src/components/360View/index.vue b/src/components/360View/index.vue index eae0c92..95cf3aa 100644 --- a/src/components/360View/index.vue +++ b/src/components/360View/index.vue @@ -424,15 +424,9 @@ export default { }, // 360浏览器 handlePacs() { - // const baseUrl = 'http://z1.huimucloud.com:8085' - const baseUrl = 'http://10.80.5.32:8026' - // const baseUrl = 'http://192.168.0.85:8001' + const baseUrl = process.env.VUE_APP_PACS_URL const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=` window.open(href, '_blank') - // const { href } = this.$router.resolve({ - // name: 'pacsManage' - // }) - // window.open(href, '_blank') }, // 关闭360弹框 closePacs() { diff --git a/src/components/360View/special/index.vue b/src/components/360View/special/index.vue index fa52ea8..2b4dd3b 100644 --- a/src/components/360View/special/index.vue +++ b/src/components/360View/special/index.vue @@ -204,9 +204,7 @@ export default { this.getItemData() }, handleRecord() { - // const baseUrl = 'http://z1.huimucloud.com:8085' - const baseUrl = 'http://10.80.5.32:8026' - // const baseUrl = 'http://192.168.0.85:8001' + const baseUrl = process.env.VUE_APP_PACS_URL const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=` window.open(href, '_blank') }, diff --git a/src/page-subspecialty/utils/request.js b/src/page-subspecialty/utils/request.js index b8bd3a0..ff8f0cd 100644 --- a/src/page-subspecialty/utils/request.js +++ b/src/page-subspecialty/utils/request.js @@ -15,7 +15,7 @@ export function clearLoginInfo() { } const http = axios.create({ - baseURL: window.SITE_CONFIG['apiURL'], + baseURL: process.env.VUE_APP_LOGIN_URL, timeout: 1000 * 180, withCredentials: true }) diff --git a/src/page-subspecialty/views/modules/dataVisualization/index.vue b/src/page-subspecialty/views/modules/dataVisualization/index.vue deleted file mode 100644 index e7fdc90..0000000 --- a/src/page-subspecialty/views/modules/dataVisualization/index.vue +++ /dev/null @@ -1,19 +0,0 @@ - - -