Browse Source

兼容iframe嵌入

shibei_master
dai 4 years ago
parent
commit
ed370aa041
  1. 2
      src/App.vue
  2. 2
      src/components/ren-process-detail/src/ren-process-detail.vue
  3. 2
      src/i18n/index.js
  4. 6
      src/js/ajax.js
  5. 4
      src/main.js
  6. 2
      src/mixins/view-module.js
  7. 6
      src/utils/request.js
  8. 4
      src/views/modules/activiti/model.vue
  9. 2
      src/views/modules/activiti/process-deploy.vue
  10. 2
      src/views/modules/activiti/process-initiation.vue
  11. 2
      src/views/modules/activiti/process.vue
  12. 2
      src/views/modules/message/mail-template-add-or-update.vue
  13. 2
      src/views/modules/oss/oss-upload.vue
  14. 2
      src/views/modules/sys/news-add-or-update.vue
  15. 2
      src/views/pages/index.vue
  16. 2
      src/views/pages/login copy.vue
  17. 4
      src/views/pages/login.vue

2
src/App.vue

@ -19,7 +19,7 @@ export default {
methods: {
i18nHandle (val, oldVal) {
Cookies.set('language', val)
localStorage.setItem('language', val)
document.querySelector('html').setAttribute('lang', val)
document.title = messages[val].brand.lg
//

2
src/components/ren-process-detail/src/ren-process-detail.vue

@ -69,7 +69,7 @@ export default {
// (xml/image)url
getResourceURL () {
var params = qs.stringify({
'token': Cookies.get('token'),
'token': localStorage.getItem('token'),
'processInstanceId': this.dataForm.processInstanceId
})
return `${window.SITE_CONFIG['apiURL']}/activiti/his/getInstImage?${params}`

2
src/i18n/index.js

@ -29,6 +29,6 @@ export const messages = {
}
export default new VueI18n({
locale: Cookies.get('language') || 'zh-CN',
locale: localStorage.getItem('language') || 'zh-CN',
messages
})

6
src/js/ajax.js

@ -45,9 +45,9 @@ function endLoading () {
*/
axios.interceptors.request.use(
(config) => {
config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN'
config.headers['token'] = Cookies.get('token') || ''
config.headers['Authorization'] = Cookies.get('token') || ''
config.headers['Accept-Language'] = localStorage.getItem('language') || 'zh-CN'
config.headers['token'] = localStorage.getItem('token') || ''
config.headers['Authorization'] = localStorage.getItem('token') || ''
// 默认参数
var defaults = {}
// 防止缓存,GET请求默认带_t参数

4
src/main.js

@ -33,7 +33,9 @@ import getQueryPara from "dai-js/modules/getQueryPara";
// 兼容token传参登录
if (getQueryPara("token")) {
console.log('token', getQueryPara("token"));
Cookies.set("token", getQueryPara("token"));
localStorage.setItem("token", getQueryPara("token"));
console.log('token222222', localStorage.getItem('token'));
}
window.app = Object.assign(

2
src/mixins/view-module.js

@ -142,7 +142,7 @@ export default {
// 导出
exportHandle () {
var params = qs.stringify({
'token': Cookies.get('token'),
'token': localStorage.getItem('token'),
...this.dataForm
})
window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`

6
src/utils/request.js

@ -15,9 +15,9 @@ const http = axios.create({
* 请求拦截
*/
http.interceptors.request.use(config => {
config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN'
config.headers['token'] = Cookies.get('token') || ''
config.headers['Authorization'] = Cookies.get('token') || ''
config.headers['Accept-Language'] = localStorage.getItem('language') || 'zh-CN'
config.headers['token'] = localStorage.getItem('token') || ''
config.headers['Authorization'] = localStorage.getItem('token') || ''
// 默认参数
var defaults = {}
// 防止缓存,GET请求默认带_t参数

4
src/views/modules/activiti/model.vue

@ -83,7 +83,7 @@ export default {
// 线url
getModelerURL (id) {
var params = qs.stringify({
'token': Cookies.get('token'),
'token': localStorage.getItem('token'),
'modelId': id
})
return `${window.SITE_CONFIG['apiURL']}/activiti/modeler.html?${params}`
@ -91,7 +91,7 @@ export default {
// url
getExportURL (id) {
var params = qs.stringify({
'token': Cookies.get('token')
'token': localStorage.getItem('token')
})
return `${window.SITE_CONFIG['apiURL']}/activiti/model/export/${id}?${params}`
},

2
src/views/modules/activiti/process-deploy.vue

@ -28,7 +28,7 @@ export default {
methods: {
init () {
this.visible = true
this.url = `${window.SITE_CONFIG['apiURL']}/activiti/process/deploy?token=${Cookies.get('token')}`
this.url = `${window.SITE_CONFIG['apiURL']}/activiti/process/deploy?token=${localStorage.getItem('token')}`
this.fileList = []
},
//

2
src/views/modules/activiti/process-initiation.vue

@ -85,7 +85,7 @@ export default {
// (xml/image)url
getResourceURL (id, name) {
var params = qs.stringify({
'token': Cookies.get('token'),
'token': localStorage.getItem('token'),
'deploymentId': id,
'resourceName': name
})

2
src/views/modules/activiti/process.vue

@ -101,7 +101,7 @@ export default {
// (xml/image)url
getResourceURL (id, name) {
var params = qs.stringify({
'token': Cookies.get('token'),
'token': localStorage.getItem('token'),
'deploymentId': id,
'resourceName': name
})

2
src/views/modules/message/mail-template-add-or-update.vue

@ -108,7 +108,7 @@ export default {
theme: 'snow'
})
// (使element upload)
this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${localStorage.getItem('token')}`
this.quillEditor.getModule('toolbar').addHandler('image', () => {
this.$refs.uploadBtn.$el.click()
})

2
src/views/modules/oss/oss-upload.vue

@ -29,7 +29,7 @@ export default {
methods: {
init () {
this.visible = true
this.url = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
this.url = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${localStorage.getItem('token')}`
this.num = 0
this.fileList = []
},

2
src/views/modules/sys/news-add-or-update.vue

@ -108,7 +108,7 @@ export default {
theme: 'snow'
})
// (使element upload)
this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/sys/oss/upload?token=${Cookies.get('token')}`
this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/sys/oss/upload?token=${localStorage.getItem('token')}`
this.quillEditor.getModule('toolbar').addHandler('image', () => {
this.$refs.uploadBtn.$el.click()
})

2
src/views/pages/index.vue

@ -73,7 +73,7 @@ export default {
localStorage.setItem('customerId', res.data.customerId)
localStorage.setItem('userType', 'work')
localStorage.setItem('showHeader', '0')
Cookies.set('token', res.data.token)
localStorage.setItem('token', res.data.token)
this.$router.replace({ name: 'home' })
})
.catch(() => {})

2
src/views/pages/login copy.vue

@ -145,7 +145,7 @@ export default {
return this.$message.error(res.msg)
}
localStorage.setItem('userType', 'oper')
Cookies.set('token', res.data.token)
localStorage.setItem('token', res.data.token)
this.$router.replace({ name: 'home' }).catch(() => { })
}).catch(() => { })
})

4
src/views/pages/login.vue

@ -243,7 +243,7 @@ export default {
localStorage.setItem('customerId', res.data.customerId)
localStorage.setItem('userType', 'work')
localStorage.setItem('showHeader', '0')
Cookies.set('token', res.data.token)
localStorage.setItem('token', res.data.token)
this.$router.replace({ name: 'home' })
})
.catch(() => { })
@ -271,7 +271,7 @@ export default {
localStorage.setItem('userType', 'work')
Cookies.set('token', res.data.token)
localStorage.setItem('token', res.data.token)
this.$router.replace({ name: 'indexWork' }).catch(() => { })
})
.catch(() => { })

Loading…
Cancel
Save