From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
screen_standard/vite.config.js | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/screen_standard/vite.config.js b/screen_standard/vite.config.js
index 722a9a4..a1d9926 100644
--- a/screen_standard/vite.config.js
+++ b/screen_standard/vite.config.js
@@ -43,7 +43,7 @@
// 鏈湴杩愯閰嶇疆锛屽強鍙嶅悜浠ｇ悊閰嶇疆
server: {
host: '192.168.0.3',
- port: '8080',
+ port: '1801',
cors: true, // 榛樿鍚敤骞跺厑璁镐换浣曟簮
open: true, // 鍦ㄦ湇鍔″櫒鍚姩鏃惰嚜鍔ㄥ湪娴忚鍣ㄤ腑鎵撳紑搴旂敤绋嬪簭
//鍙嶅悜浠ｇ悊閰嶇疆锛屾敞鎰弐ewrite鍐欐硶锛屽紑濮嬫病鐪嬫枃妗ｅ湪杩欓噷韪╀簡鍧�
@@ -53,20 +53,8 @@
changeOrigin: true,
ws: false, // 鍏佽websocket浠ｇ悊
secure: false,
-<<<<<<< HEAD
rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/')
}
-=======
- rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/'),
- // rewrite: (path) => path.replace(/^\api/, ''), // 灏哸pi鏇挎崲涓虹┖
- },
- /*'/api' : {
- target: env.VITE_BASE_URL, // 閫氳繃浠ｇ悊鎺ュ彛璁块棶瀹為檯鍦板潃銆傝繖閲屾槸瀹為檯璁块棶鐨勫湴鍧�銆倂ue浼氶�氳繃浠ｇ悊鏈嶅姟鍣ㄦ潵浠ｇ悊璇锋眰
- changeOrigin: true,
- ws: false, // 鍏佽websocket浠ｇ悊
- rewrite: (path) => path.replace(/^\api/, ''), // 灏哸pi鏇挎崲涓虹┖
- }*/
->>>>>>> 7550fb636fec7a84dbdea55196d97ed635d7ab10
}
}
}
--
Gitblit v1.9.3