Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

3 years ago · d408a0cda1
3 changed files with 5 additions and 5 deletions
--- a/src/components/360View/commonForm/optometryForm-copy.vue
+++ b/src/components/360View/commonForm/optometryForm-copy.vue
@ -350,7 +350,7 @@
            />
          </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个月</p>
      </div>
    </div>
  </div>
--- a/src/components/360View/index1.vue
+++ b/src/components/360View/index1.vue
@ -406,8 +406,8 @@ 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 = 'http://10.80.5.32:8026'
+      // const baseUrl = 'http://192.168.0.85:8001'
      const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=`
      window.open(href, '_blank')
      // const { href } = this.$router.resolve({
--- a/src/components/360View/special/index.vue
+++ b/src/components/360View/special/index.vue
@ -206,8 +206,8 @@ export default {
      //   }
      // })
      // 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 = 'http://10.80.5.32:8026'
+      // const baseUrl = 'http://192.168.0.85:8001'
      const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=`
      window.open(href, '_blank')
    },