From 144a741189e31a0ef397526449751763a9dbd989 Mon Sep 17 00:00:00 2001 From: yoe Date: Wed, 21 Oct 2020 15:18:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20=E7=B3=BB=E7=BB=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 8 ++++---- index.html | 2 +- package.json | 1 + src/router/index.js | 3 +++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/config/index.js b/config/index.js index caeb687..2047d26 100644 --- a/config/index.js +++ b/config/index.js @@ -3,6 +3,7 @@ // see http://vuejs-templates.github.io/webpack for documentation. const path = require('path') +const IP = require('ip').address() module.exports = { dev: { @@ -16,13 +17,12 @@ module.exports = { changeOrigin: true, secure: false , pathRewrite: { - '^/lz_management': '/' - } + '^/lz_management': '/' + } } }, - // Various Dev Server settings - host: 'localhost', // can be overwritten by process.env.HOST + host: IP, // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/index.html b/index.html index bdff4c1..4fbe269 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - linzi_kpi + 绩效系统
diff --git a/package.json b/package.json index 9672647..ef7708b 100644 --- a/package.json +++ b/package.json @@ -60,6 +60,7 @@ "file-loader": "^1.1.4", "friendly-errors-webpack-plugin": "^1.6.1", "html-webpack-plugin": "^2.30.1", + "ip": "^1.1.5", "jest": "^22.0.4", "jest-serializer-vue": "^0.3.0", "nightwatch": "^0.9.12", diff --git a/src/router/index.js b/src/router/index.js index 2d0a1cc..0303ac8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,6 +9,9 @@ const routes = [ redirect: kpiRouter.length > 0 ? kpiRouter[0].redirect : '/' } ].concat(kpiRouter) + export default new Router({ + base: '/digitization/', + mode: 'history', routes }) From 5a231987728446eb2cb0411574e67de7152fe73e Mon Sep 17 00:00:00 2001 From: yoe Date: Wed, 21 Oct 2020 15:33:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update=20=E9=85=8D=E7=BD=AE=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 9 +++------ src/api/data.js | 5 +++-- src/api/workbench.js | 9 ++++----- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/config/index.js b/config/index.js index 2047d26..379e913 100644 --- a/config/index.js +++ b/config/index.js @@ -7,7 +7,6 @@ const IP = require('ip').address() module.exports = { dev: { - // Paths assetsSubDirectory: 'static', assetsPublicPath: '/', @@ -54,13 +53,11 @@ module.exports = { build: { // Template for index.html - index: path.resolve(__dirname, '../dist/index.html'), - + index: path.resolve(__dirname, '../dist/digitization/index.html'), // Paths - assetsRoot: path.resolve(__dirname, '../dist'), + assetsRoot: path.resolve(__dirname, '../dist/digitization/'), assetsSubDirectory: 'static', - assetsPublicPath: '/', - + assetsPublicPath: '/digitization/', /** * Source Maps */ diff --git a/src/api/data.js b/src/api/data.js index 023ca98..a107b70 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -1,8 +1,9 @@ import request from '@/utils/request' -const baseUrl = process.env.APP_BASE_API +// const baseUrl = process.env.APP_BASE_API + export function getCaseCollectorListPage (query) { return request({ - url: baseUrl + '/caseCollector/caseCollectorListPage', + url: '/caseCollector/caseCollectorListPage', method: 'get', params: query }) diff --git a/src/api/workbench.js b/src/api/workbench.js index 757fb60..27b78e3 100644 --- a/src/api/workbench.js +++ b/src/api/workbench.js @@ -1,12 +1,11 @@ import request from '@/utils/request' -import URL from '@/api/config' -const baseUrl = process.env.PROXY ? URL.baseUrl : '/lz_management' -console.log('baseUrl: ', baseUrl) +// import URL from '@/api/config' +// const baseUrl = process.env.PROXY ? URL.baseUrl : '/lz_management' // 获取考核组列表 export function getWorkList (query) { return request({ - url: baseUrl + '/lz_management/evaluationGroup/getGroups', + url: '/lz_management/evaluationGroup/getGroups', method: 'POST', data: query }) @@ -15,7 +14,7 @@ export function getWorkList (query) { // 保存基础设置 export function saveBaseSet (query) { return request({ - url: baseUrl + '/lz_management/evaluationGroup/save', + url: '/lz_management/evaluationGroup/save', method: 'POST', data: query }) From c562fd3c7aec897836e85f78619431bcd37e67d1 Mon Sep 17 00:00:00 2001 From: yoe Date: Wed, 21 Oct 2020 15:36:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update=20=E9=85=8D=E7=BD=AE=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/index.js b/config/index.js index 379e913..70523c2 100644 --- a/config/index.js +++ b/config/index.js @@ -15,9 +15,9 @@ module.exports = { target: `https://tlzmanagement.ldxinyong.com`, changeOrigin: true, secure: false , - pathRewrite: { - '^/lz_management': '/' - } + // pathRewrite: { + // '^/lz_management': '/' + // } } }, // Various Dev Server settings