From cdd399de614778acee8880ec133242c5500c3e03 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 12 八月 2026 09:56:22 +0800
Subject: [PATCH] 合并冲突
---
vue.config.js | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/vue.config.js b/vue.config.js
index d185d3b..d5c694b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -33,23 +33,23 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target:`http://localhost:8080`,
- target:`http://192.168.100.10:8080`,
- // target:`http://192.168.1.4:8086`,
+ target:`http://localhost:8080`,
+ // target:`http://192.168.100.10:8081`,
+ // target:`http://192.168.100.137:8080`,
// target: `https://slb.hospitalstar.com:9093`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
}
},
- //褰損df鍜屾暟鎹帴鍙ｄ笉鍦ㄥ悓涓�涓姹傚湴鍧�涓嬫椂,涓簆df棰勮杩藉姞涓�涓唬鐞�
- '/pdf': {
- target: 'http://192.168.1.4/pdf/data',
- changOrigin: true,
- pathRewrite: {
- '^/pdf': ''
- }
- }
+ // 褰損df鍜屾暟鎹帴鍙ｄ笉鍦ㄥ悓涓�涓姹傚湴鍧�涓嬫椂,涓簆df棰勮杩藉姞涓�涓唬鐞�
+ // '/pdf': {
+ // target: 'http://192.168.1.4/pdf/data',
+ // changOrigin: true,
+ // pathRewrite: {
+ // '^/pdf': ''
+ // }
+ // }
},
disableHostCheck: true
},
--
Gitblit v1.9.3