diff --git a/vue/src/router/index.js b/vue/src/router/index.js index 41a418f..a3122ab 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -64,10 +64,10 @@ export const constantRoutes = [ }, { path: '/login', - //component: () => import('@/views/login/index'), + component: () => import('@/views/login/index'), //component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one //component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one - component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'), + //component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'), hidden: true }, { diff --git a/vue/static/config.js b/vue/static/config.js index 4fa2e5e..994116a 100644 --- a/vue/static/config.js +++ b/vue/static/config.js @@ -2,23 +2,7 @@ let configJSON; if (process.env.NODE_ENV === "development") { configJSON = { base: { - // ip: 'http://localhost', - // auth_port: '44344', - // public_port: '44344', - // backend_port: '44344', - // ip: 'http://localhost', - // auth_port: '10100', - // public_port: '10130', - // backend_port: '10130' - - /* ip: 'http://localhost', - auth_port: '44378', - public_port: '44378', - backend_port: '44378', */ - - //ip: 'http://192.168.0.203', - //ip: 'http://192.168.0.140', ip: "http://localhost", auth_port: "44344", public_port: "44344", @@ -51,13 +35,14 @@ if (process.env.NODE_ENV === "development") { // 发布环境 configJSON = { base: { - //ip: 'http://192.168.0.203', - ip: "http://149.223.116.5", - //ip: 'http://114.116.225.148', - //ip: 'http://10.123.148.162', - auth_port: "8066", - public_port: "8092", - backend_port: "8092", + //ip: "http://192.168.0.140", + ip: "http://192.168.0.228", + // auth_port: "8066", + // public_port: "8092", + // backend_port: "8092", + auth_port: "7696", + public_port: "7692", + backend_port: "7692", }, basic: {}, upload: { @@ -82,42 +67,12 @@ if (process.env.NODE_ENV === "development") { grant_type: "password", }, }; - configJSON.base.ip = `${window.location.protocol}//${window.location.hostname}`; - configJSON.base.auth_port = - configJSON.base.backend_port = - configJSON.base.public_port = - window.location.port; + // configJSON.base.ip = `${window.location.protocol}//${window.location.hostname}`; + // configJSON.base.auth_port = + // configJSON.base.backend_port = + // configJSON.base.public_port = + // window.location.port; } -// 开发环境 -// export default { -// base: { -// ip: 'http://localhost', -// auth_port: '44323', -// public_port: '44350', -// backend_port: '44350' -// }, -// basic: {}, -// upload: { -// ip: 'http://localhost' -// }, -// authServer: { -// ip: 'http://localhost' -// }, -// crm: { -// ip: 'http://localhost' -// }, -// oms: { -// ip: 'http://localhost' -// }, -// wx: { -// ip: 'http://localhost', -// basicPort: '' -// }, -// client: { -// client_id: 'abpvnext_master_App', -// client_secret: '1q2w3e*', -// grant_type: 'password' -// } -// } + export default configJSON;