pengqiang
/
xiangan_pc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

翔安相关修改

master
bianyaqi 2 years ago
parent
ac4fe119e8
commit
9127b11a6c
10 changed files with 29 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      .env.development
  2. 7
      .env.production
  3. 8
      .env.staging
  4. BIN
      dist.zip
  5. 29
      public/index.html
  6. 4
      src/components/360View/commonForm/optometryForm.vue
  7. 8
      src/components/360View/index.vue
  8. 4
      src/components/360View/special/index.vue
  9. 2
      src/page-subspecialty/utils/request.js
  10. 19
      src/page-subspecialty/views/modules/dataVisualization/index.vue

6
.env.development
View File

@ -1,2 +1,8 @@
NODE_ENV=development NODE_ENV=development
VUE_APP_NODE_ENV=dev 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'

7
.env.production
View File

@ -1,2 +1,9 @@
NODE_ENV=production NODE_ENV=production
VUE_APP_NODE_ENV=prod 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'

8
.env.staging
View File

@ -1,2 +1,8 @@
NODE_ENV=production
NODE_ENV=staging
VUE_APP_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'

BIN
dist.zip
View File

Binary file not shown.

29
public/index.html
View File

@ -29,35 +29,6 @@
window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false; // 动态(菜单)路由是否已经添加的状态标示（用于判断是否需要重新拉取数据并进行动态添加操作） window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false; // 动态(菜单)路由是否已经添加的状态标示（用于判断是否需要重新拉取数据并进行动态添加操作）
</script> </script>
<!-- 开发环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'local') { %>
<script>
// http://192.168.0.146:9002/huimu-admin'
window.SITE_CONFIG['apiURL'] = 'http://192.168.4.24:8036/xiangan-crf';
</script>
<% } %>
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
<script>
//http://121.36.16.195:9002/huimu-admin/swagger-ui/index.html
window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
// window.SITE_CONFIG['apiURL'] = 'http://192.168.0.117:8036/xiangan-crf';
// window.SITE_CONFIG['apiURL'] = 'http://192.168.4.174:8036/xiangan-crf';
</script>
<% } %>
<!-- 测试环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'staging') { %>
<script>
window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8022/quguang';
</script>
<% } %>
<!-- 生产环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
<script>
// window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
window.SITE_CONFIG['apiURL'] = 'http://10.80.5.32:8031/xiangan-crf';
</script>
<% } %>
</head> </head>
<body style="line-height: 1.5;"> <body style="line-height: 1.5;">
<div id="app"></div> <div id="app"></div>

4
src/components/360View/commonForm/optometryForm.vue
View File

@ -374,7 +374,9 @@
/> />
</div> </div>
</div> </div>
<p style="text-align: left;margin-top: 12px;font-size: 14px">说明：1.持本报告单配镜仅供参考。 2.本报告单有效期3个月</p>
<p style="text-align: left;margin-top: 12px;font-size: 14px">说明：1.验光结果以此报告为准。
2.此报告仅供配镜参考，配镜参数以实际测量和试镜结果为准。
3.本报告有效期3个月。</p>
</div> </div>
</div> </div>
</div> </div>

8
src/components/360View/index.vue
View File

@ -424,15 +424,9 @@ export default {
}, },
// 360浏览器 // 360浏览器
handlePacs() { 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=` const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=`
window.open(href, '_blank') window.open(href, '_blank')
// const { href } = this.$router.resolve({
// name: 'pacsManage'
// })
// window.open(href, '_blank')
}, },
// 关闭360弹框 // 关闭360弹框
closePacs() { closePacs() {

4
src/components/360View/special/index.vue
View File

@ -204,9 +204,7 @@ export default {
this.getItemData() this.getItemData()
}, },
handleRecord() { 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=` const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=`
window.open(href, '_blank') window.open(href, '_blank')
}, },

2
src/page-subspecialty/utils/request.js
View File

@ -15,7 +15,7 @@ export function clearLoginInfo() {
} }
const http = axios.create({ const http = axios.create({
baseURL: window.SITE_CONFIG['apiURL'],
baseURL: process.env.VUE_APP_LOGIN_URL,
timeout: 1000 * 180, timeout: 1000 * 180,
withCredentials: true withCredentials: true
}) })

19
src/page-subspecialty/views/modules/dataVisualization/index.vue
View File

@ -1,19 +0,0 @@
<template>
<div class="data-visualization">123</div>
</template>
<script>
export default {
data() {
return {
}
},
created() {
},
methods: {
}
}
</script>
<style lang="scss" scoped>
.data-visualization {
}
</style>
Write Preview
Loading…
Cancel
Save