|
|
|
@ -46,12 +46,7 @@ module.exports = {
|
|
|
|
//before: require('./mock/mock-server.js')
|
|
|
|
//before: require('./mock/mock-server.js')
|
|
|
|
proxy: {
|
|
|
|
proxy: {
|
|
|
|
[process.env.VUE_APP_BASE_API]: {
|
|
|
|
[process.env.VUE_APP_BASE_API]: {
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
target: 'http://patrol.115.langye.net/',
|
|
|
|
target: 'http://patrol.115.langye.net/',
|
|
|
|
=======
|
|
|
|
|
|
|
|
target: 'http://192.168.60.100:9001/',
|
|
|
|
|
|
|
|
//target: 'http://patrol.115.langye.net/',
|
|
|
|
|
|
|
|
>>>>>>> 3910d951cf1c1c2d8475c69b7255c31704ab05b0
|
|
|
|
|
|
|
|
changeOrigin: true, //配置跨域
|
|
|
|
changeOrigin: true, //配置跨域
|
|
|
|
pathRewrite: {
|
|
|
|
pathRewrite: {
|
|
|
|
['^' + process.env.VUE_APP_BASE_API]: ''
|
|
|
|
['^' + process.env.VUE_APP_BASE_API]: ''
|
|
|
|
|
