翔安相关修改

1 year ago · 9127b11a6c
10 changed files with 29 additions and 64 deletions
--- a/.env.development
+++ b/.env.development
@ -1,2 +1,8 @@
 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'
--- a/.env.production
+++ b/.env.production
@ -1,2 +1,9 @@
 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'
--- a/.env.staging
+++ b/.env.staging
@ -1,2 +1,8 @@
-NODE_ENV=production
-VUE_APP_NODE_ENV=staging
+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'
--- a/dist.zip
+++ b/dist.zip
--- a/public/index.html
+++ b/public/index.html
@ -29,35 +29,6 @@
    window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false; // 动态(菜单)路由是否已经添加的状态标示（用于判断是否需要重新拉取数据并进行动态添加操作）
  </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>
 <body style="line-height: 1.5;">
  <div id="app"></div>
--- a/src/components/360View/commonForm/optometryForm.vue
+++ b/src/components/360View/commonForm/optometryForm.vue
@ -374,7 +374,9 @@
            />
          </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>
--- 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() {
--- 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')
    },
--- 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
 })
--- a/src/page-subspecialty/views/modules/dataVisualization/index.vue
+++ b/src/page-subspecialty/views/modules/dataVisualization/index.vue
@ -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>