Merge branch 'dev' into build

# Conflicts: # package.json # vue.config.js
2022-08-18 17:33:48 +08:00
parent 84299df63e 5dac5a8829
commit 392ffee1ea
30 changed files with 4801 additions and 700 deletions
--- a/vue.config.js
+++ b/vue.config.js
@@ -64,6 +64,14 @@ module.exports = {
          '^/lan': '/'
        }
      },
+      '/test': {
+        target: 'http://192.168.1.105:9000',
+        changeOrigin: true,
+        pathRewrite: {
+          //地址重写
+          '^/test': '/'
+        }
+      },
      '/saas': {
        target: 'http://192.168.1.34:19898',
        changeOrigin: true,