From 875e26a11e28c1cefc1667bc25985dbb049f91f3 Mon Sep 17 00:00:00 2001
From: zhangxp <zhangxp@chicecm.com>
Date: 星期五, 16 六月 2023 18:34:01 +0800
Subject: [PATCH] 修复

---
 Source/UBCS-WEB/vue.config.js |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

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

--
Gitblit v1.9.3