From 7518dc7b954f88f546b50277419e798e65ca9dcd Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 05 六月 2023 18:20:48 +0800
Subject: [PATCH] 整合组件

---
 Source/UBCS-WEB/vue.config.js |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index fb16916..cf2a560 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,10 +26,23 @@
     proxy: {
       '/api': {
         //鏈湴鏈嶅姟鎺ュ彛鍦板潃
+<<<<<<< HEAD
         // target: 'http://localhost:37000',
+=======
+<<<<<<< HEAD
+        //  target: 'http://localhost:37000',
+        // target: 'http://192.168.1.63:37000',
+        //target: 'http://192.168.3.7:37000',
+        target: 'http://dev.vci-tech.com:37000',
+        // target: 'http://192.168.1.51:37000/',
+=======
+          target: 'http://localhost:37000',
+        // target: 'http://192.168.1.63:37000',
+>>>>>>> dc41a85c4eadeae567973157f64c549d414f49ec
         //target: 'http://192.168.3.7:37000',
         target: 'http://dev.vci-tech.com:37000',
         //target: 'http://192.168.1.51:37000/',
+>>>>>>> 9474fadca23df051af1789b2078aca9c3163a017
         //杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
         // target: 'https://saber.bladex.vip/api',
         ws: true,

--
Gitblit v1.9.3