mirror of
http://112.124.100.131/ebiz-ai/ebiz-ai-knowledge-manage.git
synced 2025-12-10 19:36:50 +08:00
refactor(track): 上传用户字段
- 将上传用户字段从 form.uploadUser 改为 form.createdUserLike - 更新上传用户列表的获取方式和显示逻辑 - 移除多余的 console.log 语句
This commit is contained in:
@@ -3,13 +3,10 @@ import store from '@/store'
|
|||||||
import NProgress from 'nprogress' // progress bar
|
import NProgress from 'nprogress' // progress bar
|
||||||
import 'nprogress/nprogress.css' // progress bar style
|
import 'nprogress/nprogress.css' // progress bar style
|
||||||
import { getToken, removeToken } from '@/assets/js/utils/auth' // get token from cookie
|
import { getToken, removeToken } from '@/assets/js/utils/auth' // get token from cookie
|
||||||
import getPageTitle from '@/assets/js/utils/get-page-title'
|
|
||||||
import { Message } from 'element-ui'
|
import { Message } from 'element-ui'
|
||||||
NProgress.configure({ showSpinner: false }) // NProgress Configuration
|
NProgress.configure({ showSpinner: false }) // NProgress Configuration
|
||||||
const whiteList = ['/login', '/authentication', '/404'] // no redirect whitelist
|
const whiteList = ['/login', '/authentication', '/404'] // no redirect whitelist
|
||||||
|
|
||||||
console.log('token:' + getToken())
|
|
||||||
|
|
||||||
router.beforeEach((to, from, next) => {
|
router.beforeEach((to, from, next) => {
|
||||||
NProgress.start()
|
NProgress.start()
|
||||||
if (getToken()) {
|
if (getToken()) {
|
||||||
@@ -23,7 +20,7 @@ router.beforeEach((to, from, next) => {
|
|||||||
store
|
store
|
||||||
.dispatch('user/getInfo')
|
.dispatch('user/getInfo')
|
||||||
.then(() => {
|
.then(() => {
|
||||||
store.dispatch('app/GenerateRoutes').then(accessRoutes => {
|
store.dispatch('app/GenerateRoutes').then(() => {
|
||||||
next()
|
next()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import { login, logout, getInfo, getRouters } from '@/api/app/user'
|
import { login, logout, getInfo } from '@/api/app/user'
|
||||||
import { getToken, setToken, removeToken } from '@/assets/js/utils/auth'
|
import { getToken, setToken, removeToken } from '@/assets/js/utils/auth'
|
||||||
import router from '@/router'
|
|
||||||
|
|
||||||
const state = {
|
const state = {
|
||||||
token: getToken(),
|
token: getToken(),
|
||||||
@@ -55,7 +54,6 @@ const actions = {
|
|||||||
if (!res) {
|
if (!res) {
|
||||||
reject('Verification failed, please Login again.')
|
reject('Verification failed, please Login again.')
|
||||||
}
|
}
|
||||||
console.log(res)
|
|
||||||
|
|
||||||
commit('SET_NAME', res.content.content.userName)
|
commit('SET_NAME', res.content.content.userName)
|
||||||
// commit('SET_AVATAR', res.avatar)
|
// commit('SET_AVATAR', res.avatar)
|
||||||
|
|||||||
@@ -246,16 +246,15 @@ export default {
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="上传用户">
|
<el-form-item label="上传用户">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.uploadUser"
|
v-model="form.createdUserLike"
|
||||||
placeholder="请选择上传用户"
|
placeholder="请选择上传用户"
|
||||||
size="medium"
|
|
||||||
>
|
>
|
||||||
<el-option label="全部上传用户" value="">全部上传用户</el-option>
|
<el-option label="全部" value=""></el-option>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in getUploadUserList"
|
v-for="item in createdUserOptions"
|
||||||
:key="item"
|
:label="item.label"
|
||||||
:label="item"
|
:value="item.value"
|
||||||
:value="item"
|
:key="item.value"
|
||||||
></el-option>
|
></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -341,7 +340,6 @@ export default {
|
|||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
@import '@/assets/sass/renderSass/theme.scss';
|
@import '@/assets/sass/renderSass/theme.scss';
|
||||||
.segment-content {
|
.segment-content {
|
||||||
font-family: AppleSystemUIFont;
|
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
background: #f6f8fa;
|
background: #f6f8fa;
|
||||||
color: #4e5969;
|
color: #4e5969;
|
||||||
|
|||||||
Reference in New Issue
Block a user