From f20a554bdb24e9dfde9dc6a69d78595944f61d15 Mon Sep 17 00:00:00 2001
From: mark <mark18340872469@163.com>
Date: 星期二, 25 十月 2022 14:53:57 +0800
Subject: [PATCH] 设备管理 样式调整

---
 vue.config.js |   22 ----------------------
 1 files changed, 0 insertions(+), 22 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 9968aaa..b93cf4e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -13,32 +13,10 @@
     // hotOnly: false, // 鐑洿鏂�
     proxy: {
       "/api": {
-<<<<<<< HEAD
-        // target: "http://192.168.20.10:7004",
-<<<<<<< HEAD
-        // target: "http://192.168.20.174:7070",
         target: "http://192.168.20.115:7070",
-=======
-=======
-        //  target: "http://192.168.20.10:7009",
->>>>>>> gb18186
-        target: "http://192.168.20.115:7070",
-        // target: "http://192.168.20.235:7070",
->>>>>>> bug淇
-        //  target: "http://192.168.20.117:7080",
-        // secure: false,
-        changeOrigin: true,
       },
 
       "/httpImage": {
-        //target: "http://bsic.asuscomm.com:7003",
-        // target: "http://222.128.87.51:7003",
-        // target: "http://192.168.20.10:7009",
-        // target: "http://192.168.20.189:7009",
-<<<<<<< HEAD
-=======
-        // target: "http://192.168.20.235:7070",
->>>>>>> bug淇
         target: "http://192.168.20.115:7070",
 
         changeOrigin: true, //寮�鍚唬鐞�

--
Gitblit v1.8.0