From b8099bc49f3b0074f16ef9ebdbce2b9d7148bbdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Thu, 24 Oct 2024 18:42:10 +0800
Subject: [PATCH] Merge branch 'dev' of
 http://120.46.222.128:10021/elink-star/epmet-work-pc-chengyang into
 xiaowang-featrue

# Conflicts:
#	.env.development
#	src/views/modules/home/index.vue
#	vue.config.js
---
 vue.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index d41987792..6d44b19b2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -29,7 +29,7 @@ module.exports = {
   assetsDir: "static",
   devServer: {
     proxy: {
-      // 如果请求地址以/api打头,就出触发代理机制
+      // 如果请求地址以/api打头,就出触发代理机制·
       // http://localhost:9588/api/login -> http://localhost:3000/api/login
       "/linkdata/linkdata-gateway/route": {
         target: "http://bipaas.elinkservice.cn", // 我们要代理的真实接口地址
@@ -37,7 +37,7 @@ module.exports = {
       "/api": {
           target: "http://192.168.1.140", // 测试地址
         // target: "http://219.146.91.110:30801", // 测试地址
-        target: "http://192.168.1.140", // 测试地址
+        // target: "http://192.168.1.140", // 测试地址
         // target: "http://219.146.91.110:30801", // 测试地址
         // target: "http://192.168.1.60:8080", // 本地地址
         // target: "https://epmet-preview.elinkservice.cn", // 演示地址