diff --git a/.env.development b/.env.development index b040716..a2b6e98 100644 --- a/.env.development +++ b/.env.development @@ -10,5 +10,5 @@ VUE_APP_CITY_TYPE = '' # base api # VUE_APP_API_PREFIX = '/portal' # VUE_APP_BASE_API = '/portal' -VUE_APP_BASE_API = 'http://192.168.98.115:9012' +VUE_APP_BASE_API = 'http://172.29.69.38:19012' # VUE_APP_GATEWAY = '/proxy-ah' diff --git a/public/index.html b/public/index.html index 2c59fe3..0ce3ad7 100644 --- a/public/index.html +++ b/public/index.html @@ -18,12 +18,12 @@ content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no"> - + diff --git a/src/api/config.js b/src/api/config.js index 770f6ea..e4e666c 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -3,9 +3,9 @@ let baseURL = '' if (process.env.NODE_ENV === 'development') { // 测试环境 - // baseURL = 'http://192.168.98.115:28083/' //后端ip和端口 + // baseURL = 'http://172.29.69.38:28083/' //后端ip和端口 // baseURL = 'http://192.168.1.116:28083/' //南京国网测试后端ip和端口 - baseURL = 'http://192.168.98.115:9012/' //南京国网测试后端ip和端口 + baseURL = 'http://172.29.69.38:19012/' //南京国网测试后端ip和端口 // baseURL = 'https://portal.xt.nfjbill.ren:30004/proxy-ah/' //后端ip和端口 // baseURL = 'https://www.greensgcc.com/proxy-ah/effcicency/' //安徽本地测试 diff --git a/src/settings.js b/src/settings.js index f6e2b4a..dcdbca2 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,4 +1,4 @@ -// const baseUrl = process.env.NODE_ENV == 'development' ? 'http://192.168.98.115:9012' : '' +// const baseUrl = process.env.NODE_ENV == 'development' ? 'http://172.29.69.38:19012' : '' module.exports = { title: '智慧能源云', @@ -14,7 +14,7 @@ module.exports = { // https://portal.xt.nfjbill.ren:30004 downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-nx/file/minio/download/`, // downloadUrl: `https://www.greensgcc.com/proxy-xj/file/minio/download/`, - // downloadUrl: `http://192.168.98.115:9012/proxy-sx/file/minio/download/`, + // downloadUrl: `http://172.29.69.38:19012/proxy-sx/file/minio/download/`, uploadUrl: `${process.env.VUE_APP_BASE_API}/file/minio/upload/`, statusCode: { SUCCESS: 0 diff --git a/src/views/comment/components/energyReport-quota.vue b/src/views/comment/components/energyReport-quota.vue index 71fd72f..0700135 100644 --- a/src/views/comment/components/energyReport-quota.vue +++ b/src/views/comment/components/energyReport-quota.vue @@ -119,8 +119,7 @@