diff --git a/package.json b/package.json index 326b60a..5cc34c3 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,8 @@ "version": "5.0.0", "private": true, "scripts": { - "serve": "vue-cli-service serve", + "serve": "vue-cli-service serve --mode production", + "serve:dev": "vue-cli-service serve --mode development", "build": "vue-cli-service build", "build:prod": "vue-cli-service build --mode production", "build:sit": "vue-cli-service build --mode production.sit", diff --git a/public/index.html b/public/index.html index c67afdf..5bad048 100644 --- a/public/index.html +++ b/public/index.html @@ -10,7 +10,7 @@ window.SITE_CONFIG['version'] = 'v5.0.0'; window.SITE_CONFIG['nodeEnv'] = '<%= process.env.VUE_APP_NODE_ENV %>'; window.SITE_CONFIG['apiURL'] = ''; // api请求地址 - window.SITE_CONFIG['projURL'] = '/yd-monitor'; // api请求地址 + window.SITE_CONFIG['projURL'] = ''; // api请求地址 window.SITE_CONFIG['storeState'] = {}; // vuex本地储存初始化状态（用于不刷新页面的情况下，也能重置初始化项目中所有状态） window.SITE_CONFIG['contentTabDefault'] = { // 内容标签页默认属性对象 'name': '', // 名称, 由 this.$route.name 自动赋值（默认，名称 === 路由名称 === 路由路径） @@ -31,25 +31,25 @@ <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> <% } %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %> <% } %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %> <% } %> <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %> <% } %> diff --git a/src/utils/request.js b/src/utils/request.js index f885819..134bf99 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,7 +7,9 @@ import isPlainObject from 'lodash/isPlainObject' import merge from 'lodash/merge' const http = axios.create({ - baseURL: window.SITE_CONFIG['apiURL'], + // baseURL: window.SITE_CONFIG['apiURL'], + // baseURL: '/api', + baseURL: process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor', timeout: 1000 * 180, withCredentials: true }) @@ -71,7 +73,9 @@ http.interceptors.response.use(response => { */ http.adornUrl = (actionName) => { // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截! - return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.projURL) + actionName + // return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? window.SITE_CONFIG.projURL : '') + actionName + // return (process.env.NODE_ENV !== 'production' ? '/yd-monitor' : '/api') + actionName + return actionName } /** diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue index 6b6cf48..703e644 100644 --- a/src/views/main-sidebar.vue +++ b/src/views/main-sidebar.vue @@ -28,6 +28,7 @@ export default { mounted() { // this.$store.state.sidebarMenuList = window.SITE_CONFIG['menuList'] this.$nextTick(() => { + console.log(`window.SITE_CONFIG['menuList']`, window.SITE_CONFIG['menuList']) this.unhiddenMenuList = this.getUnhiddenRoutesListFrom(window.SITE_CONFIG['menuList']) /** 本地保存一份，store保存一份，感觉 store 都不需要保存... */ this.$store.state.sidebarMenuList = this.unhiddenMenuList diff --git a/src/views/modules/home.vue b/src/views/modules/home.vue index a59d8d2..056926e 100644 --- a/src/views/modules/home.vue +++ b/src/views/modules/home.vue @@ -20,7 +20,6 @@

官方微信群

diff --git a/src/views/modules/monitoring/reportDesign.vue b/src/views/modules/monitoring/reportDesign.vue index b48a117..2dd7bc7 100644 --- a/src/views/modules/monitoring/reportDesign.vue +++ b/src/views/modules/monitoring/reportDesign.vue @@ -11,8 +11,9 @@ export default { return { loading: true, // url: process.env.VUE_APP_REPORT_DESIGN_URL - url: window.SITE_CONFIG['apiURL'] + '/yd-monitor/ureport/designer' + // url: window.SITE_CONFIG['apiURL'] + this.$http.adornUrl('/ureport/designer') // url: this.$http.adornUrl('/ureport/designer') + url: (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + '/ureport/designer' } }, mounted() { diff --git a/src/views/modules/monitoring/reportPreview.vue b/src/views/modules/monitoring/reportPreview.vue index 7f18ab2..33ad626 100644 --- a/src/views/modules/monitoring/reportPreview.vue +++ b/src/views/modules/monitoring/reportPreview.vue @@ -22,7 +22,8 @@ export default { return { loading: true, // url: process.env.VUE_APP_REPORT_VIEW_URL - url: window.SITE_CONFIG['apiURL'] + '/yd-monitor/ureport/preview' + // url: window.SITE_CONFIG['apiURL'] + this.$http.adornUrl('/ureport/preview') + url: (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + '/ureport/preview' } }, mounted() { diff --git a/src/views/modules/monitoring/workshopSectionDialog.vue b/src/views/modules/monitoring/workshopSectionDialog.vue index 4494099..c82df8e 100644 --- a/src/views/modules/monitoring/workshopSectionDialog.vue +++ b/src/views/modules/monitoring/workshopSectionDialog.vue @@ -230,7 +230,7 @@ export default { type: 'warning' }).then(() => { this.$http({ - url: '/yd-monitor/monitoring/workshopSectionEquipment', + url: this.$http.adornUrl('/monitoring/workshopSectionEquipment'), method: 'delete', data: [id] }).then(({ data }) => { @@ -274,7 +274,7 @@ export default { }, handleCreateOrUpdate() { this.$http({ - url: '/yd-monitor/monitoring/workshopSection', + url: this.$http.adornUrl('/monitoring/workshopSection'), method: this.dataForm.id ? 'put' : 'post', data: { ...this.dataForm diff --git a/src/views/modules/monitoring/workshopSectionDialogAttrForm.vue b/src/views/modules/monitoring/workshopSectionDialogAttrForm.vue index efd7492..a8b0e67 100644 --- a/src/views/modules/monitoring/workshopSectionDialogAttrForm.vue +++ b/src/views/modules/monitoring/workshopSectionDialogAttrForm.vue @@ -66,7 +66,7 @@ export default { this.edit = true // 获取信息，让用户修改排序 this.$http({ - url: '/yd-monitor/monitoring/workshopSectionEquipment/' + id, + url: this.$http.adornUrl('/monitoring/workshopSectionEquipment/') + id, method: 'get' }).then(({ data: res }) => { if (res.data) { @@ -102,7 +102,7 @@ export default { }, handleSave() { this.$http({ - url: '/yd-monitor/monitoring/workshopSectionEquipment', + url: this.$http.adornUrl('/monitoring/workshopSectionEquipment'), method: this.edit ? 'put' : 'post', data: { ...this.dataForm, diff --git a/src/views/modules/oss/oss-upload.vue b/src/views/modules/oss/oss-upload.vue index adae0fc..6b4bd0d 100644 --- a/src/views/modules/oss/oss-upload.vue +++ b/src/views/modules/oss/oss-upload.vue @@ -22,7 +22,8 @@ export default { methods: { init() { this.visible = true - this.url = `${window.SITE_CONFIG['apiURL']}/sys/oss/upload?token=${Cookies.get('token')}` + // this.url = `${window.SITE_CONFIG['apiURL']}/sys/oss/upload?token=${Cookies.get('token')}` + this.url = (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + `/sys/oss/upload?token=${Cookies.get('token')}` this.num = 0 this.fileList = [] }, diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index ed917c7..f5c166a 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -102,7 +102,8 @@ export default { // 获取验证码 getCaptcha() { this.dataForm.uuid = getUUID() - this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}` + // this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}` + this.captchaPath = (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + `/captcha?uuid=${this.dataForm.uuid}` }, // 表单提交 dataFormSubmitHandle: debounce( @@ -114,7 +115,9 @@ export default { this.$http .post(this.$http.adornUrl('/login'), this.dataForm) .then(({ data: res }) => { + console.log('res', res) if (res.code !== 0) { + console.log('res', res) // this.getCaptcha() return this.$message.error(res.msg) } diff --git a/vue.config.js b/vue.config.js index 2c785d5..ddeec80 100644 --- a/vue.config.js +++ b/vue.config.js @@ -12,12 +12,31 @@ module.exports = { .loader('svg-sprite-loader') }, productionSourceMap: false, + configureWebpack: config => { + if (process.env.NODE_ENV === 'production') { + config.performance = { + maxEntrypointSize: 2097152, // 大小改为2mb + maxAssetSize: 1572864 + } + } + }, devServer: { open: true, port: 8001, overlay: { errors: true, warnings: true + }, + proxy: { + '/api': { + target: 'http://india.mes.picaiba.com/' + }, + '/yd-monitor': { + target: 'http://192.168.1.20:8080/' // 开发地址 + }, + '/ureport': { + target: 'http://india.mes.picaiba.com/' // ureporter + } } } }