diff --git a/src/api/data.js b/src/api/data.js index 4de4277..1b843fd 100755 --- a/src/api/data.js +++ b/src/api/data.js @@ -888,7 +888,7 @@ export const getPositionRequest = () => { export const getProcess = (p) => { return axios.request({ - url: 'api/form/open/api/process/next/flow/node?processDefinitionId=HuiYuanRuHuiLiuCheng', + url: 'api/form/open/api/process/next/flow/node?flowKey=HuiYuanRuHuiLiuCheng', method: 'post', data: p }) diff --git a/src/config/index.js b/src/config/index.js index 9487d17..9f45341 100755 --- a/src/config/index.js +++ b/src/config/index.js @@ -1,4 +1,13 @@ -export default { +var path = require('path') + +module.exports = { + // build: { + // index: path.resolve(__dirname, '../dist/index.html'), + // assetsRoot: path.resolve(__dirname, '../dist'), + // assetsSubDirectory: 'static', + // assetsPublicPath: '../', + // productionSourceMap: true + // }, /** * @description token在Cookie中存储的天数,默认1天 */ @@ -31,7 +40,7 @@ export default { * @description api请求基础路径 */ baseUrl: { - dev: 'http://183.162.252.100:9012', - pro: 'https://oss.console.ingenuity.top' + dev: 'http://47.100.188.195:7006', + pro: 'http://47.100.188.195:7006' } } diff --git a/src/libs/api.request.js b/src/libs/api.request.js index 5dcd91e..3c1b9c8 100755 --- a/src/libs/api.request.js +++ b/src/libs/api.request.js @@ -1,7 +1,7 @@ import HttpRequest from '@/libs/axios' import config from '@/config' -// const baseUrl = process.env.NODE_ENV === 'development' ? config.baseUrl.dev : config.baseUrl.pro -const baseUrl = '/api' +const baseUrl = process.env.NODE_ENV === 'development' ? config.baseUrl.dev : config.baseUrl.pro +// const baseUrl = '/api' const axios = new HttpRequest(baseUrl) export default axios diff --git a/src/router/index.js b/src/router/index.js index b695a6a..ea1e2bb 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,7 +12,7 @@ import config from '@/config' Vue.use(Router) const router = new Router({ routes, - mode: 'history' + mode: 'hash' }) const LOGIN_PAGE_NAME = process.env.NODE_ENV === 'development' ? config.sso.dev : config.sso.pro diff --git a/src/view/main/main.vue b/src/view/main/main.vue index 1390594..3698389 100755 --- a/src/view/main/main.vue +++ b/src/view/main/main.vue @@ -169,6 +169,12 @@ export default { watch: { '$route' (newRoute) { console.log(newRoute) + this.menuLists.map((item, index) => { + if(newRoute.path.indexOf(item.path) > -1){ + this.activeIndex = index+1 + } + }) + this.setBreadCrumb(newRoute) } }, diff --git a/src/view/overview.vue b/src/view/overview.vue index 7708f23..6452e1b 100755 --- a/src/view/overview.vue +++ b/src/view/overview.vue @@ -22,7 +22,7 @@ - 2021中国国际汽车电子高峰论坛将于11月25日在上海举行 + {{imgObj.title}} @@ -30,7 +30,7 @@ 新闻资讯 - 更多>> + 更多>> {{index+1}}、{{item.title}} @@ -44,7 +44,7 @@ 行业动态 - 更多>> + 更多>> {{hangDamic.title}} @@ -55,7 +55,7 @@ 产业政策 - 更多>> + 更多>> @@ -74,7 +74,7 @@ 合作交流 - 更多>> + 更多>> 知识产权 - 更多>> + 更多>>