wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
a0049873 2022-11-11 19:47:52 +08:00
parent b756c7f17f 7a14485775
commit f8ff6805c1
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
back/src/App.vue
View File

@ -1,3 +1,10 @@
<!--
* @Author: hisense.wuhongjian
* @Date: 2022-06-14 09:30:22
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-11-11 11:06:48
* @Description: 告诉大家这是什么
-->
<template> <template>
<transition name="el-fade-in-linear"> <transition name="el-fade-in-linear">
<router-view /> <router-view />

4
back/src/utils/request.js
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2022-05-11 20:03:41 * @Date: 2022-05-11 20:03:41
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-06-06 13:08:06 * @LastEditTime: 2022-11-11 11:07:09
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
*/ */
import axios from 'axios' import axios from 'axios'
@ -102,7 +102,7 @@ http.interceptors.response.use(
response['Access-Control-Expose-Headers'] = 'redirect' response['Access-Control-Expose-Headers'] = 'redirect'
const { code, message } = response.data const { code, message } = response.data
if (response.headers.token) { if (response.headers.token) {
Cookies.set('ucsToken', response.headers.token) Cookies.set('ucsToken', response.headers.token, { expires: 'session' })
} }
if (response.headers.redirect) { if (response.headers.redirect) {
window.location.href = response.headers.redirect window.location.href = response.headers.redirect

2
back/src/views/pages/login.vue
View File

@ -115,7 +115,7 @@ export default {
this.getCaptcha() this.getCaptcha()
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
Cookies.set('ucsToken', res.data.token) Cookies.set('ucsToken', res.data.token, { expires: 'session' })
this.$router.replace({ path: '/home' }) this.$router.replace({ path: '/home' })
}).catch(() => {}) }).catch(() => {})
}) })

2
front/public/static/config/basicConfig.js
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23 * @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-10-27 16:04:46 * @LastEditTime: 2022-11-11 19:21:42
* @Description: 系统静态参数配置 * @Description: 系统静态参数配置
*/ */
var _global = {} var _global = {}

20
front/src/views/personalCenter/components/MyApply.vue
View File

@ -719,18 +719,16 @@
} }
) )
} else if (typeName.value == '云资源申请') { } else if (typeName.value == '云资源申请') {
getResourceBusinessList({ userAccount: 'qdsdzzwbgsxtaqglc' }).then( getResourceBusinessList({ userAccount: userName.value }).then((res) => {
(res) => { console.log('数据资源申请===============>', res.data.data)
console.log('数据资源申请===============>', res.data.data) contentList.data = res.data.data
contentList.data = res.data.data contentList2.data = res.data.data
contentList2.data = res.data.data num.value = []
num.value = [] total.value = 0
total.value = 0 showType.value = '云资源'
showType.value = '云资源' })
}
)
} else if (typeName.value == '云视频申请') { } else if (typeName.value == '云视频申请') {
getVideoBusinessList({ userAccount: 'zfcxjsjkjc' }).then((res) => { getVideoBusinessList({ userAccount: userName.value }).then((res) => {
console.log('数据资源申请===============>', res.data.data) console.log('数据资源申请===============>', res.data.data)
contentList.data = res.data.data contentList.data = res.data.data
contentList2.data = res.data.data contentList2.data = res.data.data