单点登录参数优化；报警点位管理页面

2 years ago · 1a0977f0c7
parent fff86755a3
commit 1a0977f0c7
1 changed files with 0 additions and 4 deletions
--- a/vue.config.js
+++ b/vue.config.js
@ -40,11 +40,7 @@ module.exports = {
      "/api": {
        //本地服务接口地址
        // target: 'http://192.168.1.34:8008',
-<<<<<<< HEAD
        target: 'http://192.168.3.32:81',
-=======
-        target: "http://192.168.3.32:8008",
->>>>>>> 8485163d5bb04ed591fdacf36ede1af8f45e82a8
        ws: true,
        pathRewrite: {
          "^/api": "/",