diff --git a/config/index.js b/config/index.js index 2ef8b4a..5e9542d 100644 --- a/config/index.js +++ b/config/index.js @@ -64,8 +64,8 @@ * In most cases please use '/' !!! */ //定义静态资源的公开路径,也就是真正的引用路径 - // assetsPublicPath: '/hxrq/', - assetsPublicPath: './', + assetsPublicPath: '/hxrq/', + // assetsPublicPath: './', //定义是否生成生产环境的SourceMap, sourcemap是用来debug编译后文件的,通过映射到编译前文件来实现 productionSourceMap: false, diff --git a/config/index.js b/config/index.js index 2ef8b4a..5e9542d 100644 --- a/config/index.js +++ b/config/index.js @@ -64,8 +64,8 @@ * In most cases please use '/' !!! */ //定义静态资源的公开路径,也就是真正的引用路径 - // assetsPublicPath: '/hxrq/', - assetsPublicPath: './', + assetsPublicPath: '/hxrq/', + // assetsPublicPath: './', //定义是否生成生产环境的SourceMap, sourcemap是用来debug编译后文件的,通过映射到编译前文件来实现 productionSourceMap: false, diff --git a/src/main.js b/src/main.js index 1d4dbc5..7568b6e 100644 --- a/src/main.js +++ b/src/main.js @@ -3,24 +3,18 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets import '../theme/index.css' // 引入自定义主题 import ElementUI from 'element-ui' -console.log('==============1111111===============') -// import 'element-ui/lib/theme-chalk/index.css' +import 'element-ui/lib/theme-chalk/index.css' import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n import '@/styles/index.scss' // global css import '@/assets/font/font.css' import App from './App' -console.log('==============22222===============') import store from './store' -console.log('==============33333===============') import router from './router' -console.log('==============44444===============') import '@/icons' // icon -console.log('==============555555===============') import '@/permission' // permission control -console.log('==============66666===============') /** * This project originally used easy-mock to simulate data, diff --git a/config/index.js b/config/index.js index 2ef8b4a..5e9542d 100644 --- a/config/index.js +++ b/config/index.js @@ -64,8 +64,8 @@ * In most cases please use '/' !!! */ //定义静态资源的公开路径,也就是真正的引用路径 - // assetsPublicPath: '/hxrq/', - assetsPublicPath: './', + assetsPublicPath: '/hxrq/', + // assetsPublicPath: './', //定义是否生成生产环境的SourceMap, sourcemap是用来debug编译后文件的,通过映射到编译前文件来实现 productionSourceMap: false, diff --git a/src/main.js b/src/main.js index 1d4dbc5..7568b6e 100644 --- a/src/main.js +++ b/src/main.js @@ -3,24 +3,18 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets import '../theme/index.css' // 引入自定义主题 import ElementUI from 'element-ui' -console.log('==============1111111===============') -// import 'element-ui/lib/theme-chalk/index.css' +import 'element-ui/lib/theme-chalk/index.css' import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n import '@/styles/index.scss' // global css import '@/assets/font/font.css' import App from './App' -console.log('==============22222===============') import store from './store' -console.log('==============33333===============') import router from './router' -console.log('==============44444===============') import '@/icons' // icon -console.log('==============555555===============') import '@/permission' // permission control -console.log('==============66666===============') /** * This project originally used easy-mock to simulate data, diff --git a/src/permission.js b/src/permission.js index 8d3f41d..55bd751 100644 --- a/src/permission.js +++ b/src/permission.js @@ -113,8 +113,8 @@ fetchToken(sendParams).then((resToken) => { if (resToken.code === 200) { axios.get('./static/project.config.json').then((result) => { - const params = '?token=' + resToken.data.token + '&url=' + result.data.singleSign - const loginUrl = result.data.biUrl + '/sso/integrationConfig/login' + const params = '?token=' + resToken.data.token + '&url=' + result.data.singleSignLastUrl + const loginUrl = result.data.singleSignFirstUrl + '/sso/integrationConfig/login' // next({ // path: '/appSubject', // query: { name: resToken.data.title, url: loginUrl + params } diff --git a/config/index.js b/config/index.js index 2ef8b4a..5e9542d 100644 --- a/config/index.js +++ b/config/index.js @@ -64,8 +64,8 @@ * In most cases please use '/' !!! */ //定义静态资源的公开路径,也就是真正的引用路径 - // assetsPublicPath: '/hxrq/', - assetsPublicPath: './', + assetsPublicPath: '/hxrq/', + // assetsPublicPath: './', //定义是否生成生产环境的SourceMap, sourcemap是用来debug编译后文件的,通过映射到编译前文件来实现 productionSourceMap: false, diff --git a/src/main.js b/src/main.js index 1d4dbc5..7568b6e 100644 --- a/src/main.js +++ b/src/main.js @@ -3,24 +3,18 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets import '../theme/index.css' // 引入自定义主题 import ElementUI from 'element-ui' -console.log('==============1111111===============') -// import 'element-ui/lib/theme-chalk/index.css' +import 'element-ui/lib/theme-chalk/index.css' import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n import '@/styles/index.scss' // global css import '@/assets/font/font.css' import App from './App' -console.log('==============22222===============') import store from './store' -console.log('==============33333===============') import router from './router' -console.log('==============44444===============') import '@/icons' // icon -console.log('==============555555===============') import '@/permission' // permission control -console.log('==============66666===============') /** * This project originally used easy-mock to simulate data, diff --git a/src/permission.js b/src/permission.js index 8d3f41d..55bd751 100644 --- a/src/permission.js +++ b/src/permission.js @@ -113,8 +113,8 @@ fetchToken(sendParams).then((resToken) => { if (resToken.code === 200) { axios.get('./static/project.config.json').then((result) => { - const params = '?token=' + resToken.data.token + '&url=' + result.data.singleSign - const loginUrl = result.data.biUrl + '/sso/integrationConfig/login' + const params = '?token=' + resToken.data.token + '&url=' + result.data.singleSignLastUrl + const loginUrl = result.data.singleSignFirstUrl + '/sso/integrationConfig/login' // next({ // path: '/appSubject', // query: { name: resToken.data.title, url: loginUrl + params } diff --git a/static/project.config.json b/static/project.config.json index f27b73c..20d345b 100644 --- a/static/project.config.json +++ b/static/project.config.json @@ -2,7 +2,8 @@ "title": "管理者驾驶舱", "baseUrl": "http://192.168.204.127:8080/cockpit/", "biUrl": "http://59.49.106.24:9001", - "singleSign": "http://10.100.252.13:9001/browse/2/BD1629B6396A40748E6E04D28B5B5EC1", + "singleSignFirstUrl": "http://59.49.106.24:9001", + "singleSignLastUrl": "http://10.100.252.13:9001/browse/2/BD1629B6396A40748E6E04D28B5B5EC1", "sameWindow": false, "toDashboard": false, "biLogin": "http://59.49.106.24:9001/sso/integrationConfig/login",