From b6bc27020cf028c4390d7262c4d2f08eaa51b2f0 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 27 六月 2023 21:35:06 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS-WEB/vue.config.js | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 81cc09c..59e2f02 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -25,17 +25,27 @@
port: 38000,
proxy: {
'/api': {
+<<<<<<< HEAD
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- // target: 'http://localhost:37000',
+ target: 'http://localhost:37000',
+=======
+ // target: 'http://localhost:37000',
+ // target: 'http://localhost:37000',
+>>>>>>> ec1d5f8469e9fbc9acea80b2c4a8ea8a1eb4f6f8
// target: 'http://192.168.1.51:37000',
- // target: 'http://192.168.1.46:37000',
+ target: 'http://192.168.1.46:37000',
// target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
- // target: 'http://192.168.1.104:37000',
+ // target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
+<<<<<<< HEAD
+ // target: 'http://192.168.3.7:37000',
+=======
//target: 'http://192.168.3.7:37000',
- target: 'http://dev.vci-tech.com:37000',
- //target: 'http://192.168.1.51:37000/',
+>>>>>>> ec1d5f8469e9fbc9acea80b2c4a8ea8a1eb4f6f8
+ // target: 'http://dev.vci-tech.com:37000',
+ // target: 'http://192.168.1.51:37000/',
+ // target:'http://192.168.1.104:37000',
//杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
// target: 'https://saber.bladex.vip/api',
ws: true,
--
Gitblit v1.9.3