Skip to content

M
mes-ui
Commit dfc25896 authored by chicheng's avatar chicheng
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 135de3ee 730ca5cb
Expand all Show whitespace changes
Inline Side-by-side
Showing with 136 additions and 5 deletions
vue.config.js
View file @ dfc25896
...@@ -35,8 +35,8 @@ module.exports = { ...@@ -35,8 +35,8 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:8080`, target: `http://localhost:8088`,
target: `http://192.168.222.60:9092/mesApi`, // target: `http://192.168.222.60:9092/mesApi`,
// target: `http://192.168.222.60:8088`, // target: `http://192.168.222.60:8088`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
...@@ -44,7 +44,7 @@ module.exports = { ...@@ -44,7 +44,7 @@ module.exports = {
} }
}, },
'/ureport': { '/ureport': {
target: 'http://localhost:8080', target: 'http://localhost:8088',
ws:false, ws:false,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
yarn.lock
View file @ dfc25896
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment