wulin/management_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0

Browse Source 
* 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui:
  update 配置优化
  update 配置优化
  update 系统优化
This commit is contained in:
leave 2020-10-21 18:54:35 +08:00
commit db1b770b61
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
config/index.js
View File

@ -3,10 +3,10 @@
// see http://vuejs-templates.github.io/webpack for documentation. // see http://vuejs-templates.github.io/webpack for documentation.
const path = require('path') const path = require('path')
const IP = require('ip').address()
module.exports = { module.exports = {
dev: { dev: {
// Paths // Paths
assetsSubDirectory: 'static', assetsSubDirectory: 'static',
assetsPublicPath: '/', assetsPublicPath: '/',
@ -15,14 +15,13 @@ module.exports = {
target: `https://tlzmanagement.ldxinyong.com`, target: `https://tlzmanagement.ldxinyong.com`,
changeOrigin: true, changeOrigin: true,
secure: false , secure: false ,
pathRewrite: { // pathRewrite: {
'^/lz_management': '/' // '^/lz_management': '/'
} // }
} }
}, },
// Various Dev Server settings // 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 port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false, autoOpenBrowser: false,
errorOverlay: true, errorOverlay: true,
@ -54,13 +53,11 @@ module.exports = {
build: { build: {
// Template for index.html // Template for index.html
index: path.resolve(__dirname, '../dist/index.html'), index: path.resolve(__dirname, '../dist/digitization/index.html'),
// Paths // Paths
assetsRoot: path.resolve(__dirname, '../dist'), assetsRoot: path.resolve(__dirname, '../dist/digitization/'),
assetsSubDirectory: 'static', assetsSubDirectory: 'static',
assetsPublicPath: '/', assetsPublicPath: '/digitization/',
/** /**
* Source Maps * Source Maps
*/ */

2
index.html
View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>linzi_kpi</title> <title>绩效系统</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

1
package.json
View File

@ -60,6 +60,7 @@
"file-loader": "^1.1.4", "file-loader": "^1.1.4",
"friendly-errors-webpack-plugin": "^1.6.1", "friendly-errors-webpack-plugin": "^1.6.1",
"html-webpack-plugin": "^2.30.1", "html-webpack-plugin": "^2.30.1",
"ip": "^1.1.5",
"jest": "^22.0.4", "jest": "^22.0.4",
"jest-serializer-vue": "^0.3.0", "jest-serializer-vue": "^0.3.0",
"nightwatch": "^0.9.12", "nightwatch": "^0.9.12",

5
src/api/data.js
View File

@ -1,8 +1,9 @@
import request from '@/utils/request' import request from '@/utils/request'
const baseUrl = process.env.APP_BASE_API // const baseUrl = process.env.APP_BASE_API
export function getCaseCollectorListPage (query) { export function getCaseCollectorListPage (query) {
return request({ return request({
url: baseUrl + '/caseCollector/caseCollectorListPage', url: '/caseCollector/caseCollectorListPage',
method: 'get', method: 'get',
params: query params: query
}) })

9
src/api/workbench.js
View File

@ -1,12 +1,11 @@
import request from '@/utils/request' import request from '@/utils/request'
import URL from '@/api/config' // import URL from '@/api/config'
const baseUrl = process.env.PROXY ? URL.baseUrl : '/lz_management' // const baseUrl = process.env.PROXY ? URL.baseUrl : '/lz_management'
console.log('baseUrl: ', baseUrl)
// 获取考核组列表 // 获取考核组列表
export function getWorkList (query) { export function getWorkList (query) {
return request({ return request({
url: baseUrl + '/lz_management/evaluationGroup/getGroups', url: '/lz_management/evaluationGroup/getGroups',
method: 'POST', method: 'POST',
data: query data: query
}) })
@ -15,7 +14,7 @@ export function getWorkList (query) {
// 保存基础设置 // 保存基础设置
export function saveBaseSet (query) { export function saveBaseSet (query) {
return request({ return request({
url: baseUrl + '/lz_management/evaluationGroup/save', url: '/lz_management/evaluationGroup/save',
method: 'POST', method: 'POST',
data: query data: query
}) })

3
src/router/index.js
View File

@ -9,6 +9,9 @@ const routes = [
redirect: kpiRouter.length > 0 ? kpiRouter[0].redirect : '/' redirect: kpiRouter.length > 0 ? kpiRouter[0].redirect : '/'
} }
].concat(kpiRouter) ].concat(kpiRouter)
export default new Router({ export default new Router({
base: '/digitization/',
mode: 'history',
routes routes
}) })