Commit 8ad32a7d authored by 李苏's avatar 李苏 💬

gavel erp 调整

parent 1193ac74
......@@ -5,7 +5,7 @@ VUE_APP_TITLE = 格物软件
ENV = 'http://demo.ruoyi.vip/'
# 格物管理系统/开发环境
VUE_APP_BASE_API = '/dev-api'
VUE_APP_BASE_API = '/wmsappServie'
VUE_APP_BASE_Print = 'http://192.168.30.254:18080/dmg'
# 路由懒加载
......
......@@ -5,7 +5,7 @@ VUE_APP_TITLE = 格物软件
ENV = 'production'
# gavelErp/生产环境
VUE_APP_BASE_API = 'test'
VUE_APP_BASE_API = 'wmsappServie'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
const clearArrow = require('./tools/babel-clearArrow.js');
const tryCatchAuto = require('common/src/babelPlugin/tryCatchAuto.js');
const proPlugins = ['dynamic-import-node', [tryCatchAuto]];
if (process.env.NODE_ENV === 'production') {
proPlugins.push('transform-remove-console');
proPlugins.push('transform-remove-debugger');
}
// if (process.env.NODE_ENV === 'production') {
// proPlugins.push('transform-remove-console');
// proPlugins.push('transform-remove-debugger');
// }
module.exports = {
presets: [
// https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
......
This diff is collapsed.
<template>
<div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
<div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
<sidebar v-if="!sidebar.hide" class="sidebar-container" />
<sidebar v-if="!sidebar.hide" class="sidebar-container" />
<div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
<div :class="{'fixed-header':fixedHeader}">
<navbar />
......
......@@ -140,6 +140,7 @@ const permission = {
res.data=[...newCommonList,...newErpList,...newPowerRoutes]
const sdata = JSON.parse(JSON.stringify(res.data))
const rdata = JSON.parse(JSON.stringify(res.data))
console.log(sdata,'加载的全部路由')
const sidebarRoutes = filterAsyncRouter(sdata)
const rewriteRoutes = filterAsyncRouter(rdata, false, true)
const asyncRoutes = filterDynamicRoutes(dynamicRoutes);
......
......@@ -24,6 +24,9 @@ const service = axios.create({
service.interceptors.request.use(
config => {
config.headers.Gtoken = sessionStorage.getItem('Gtoken')|| store.state.user.token
if( config.headers.Gtoken==undefined){
config.headers.Gtoken=''
}
return config;
},
error => {
......
......@@ -28,7 +28,6 @@
</div>
</template>
<script>
import PanelGroup from './dashboard/PanelGroup'
import LineChart from './dashboard/LineChart'
......
This diff is collapsed.
......@@ -31,7 +31,7 @@ module.exports = {
devServer: {
host: '0.0.0.0',
port: port,
open: true,
open: false,
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
......@@ -40,8 +40,9 @@ module.exports = {
// target: `http://192.168.30.254:18080/dmg`,
// target: `http://192.168.30.254:28084/erp`,
target: `http://localhost:9080/erp`,
// target:'http://192.168.30.105:9081/erp',
// target:'http://clouderp.gavelinfo.com/erp',
changeOrigin: true,
logLevel: 'debug',
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment