Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1
# Conflicts: # nezha-fronted/src/components/common/labelFilter/clickSearch.vue
This commit is contained in:
@@ -298,7 +298,7 @@ export default {
|
||||
data () {
|
||||
const termFontSize = parseInt(localStorage.getItem('termFontSize'))
|
||||
return {
|
||||
language: localStorage.getItem('nz-language'),
|
||||
language: this.$store.getters.language,
|
||||
authProtocol: [
|
||||
{
|
||||
value: 1,
|
||||
|
||||
@@ -163,7 +163,7 @@ export default {
|
||||
importResult: null,
|
||||
exportShow: false,
|
||||
panelLock: true,
|
||||
language: localStorage.getItem('nz-language'),
|
||||
language: this.$store.getters.language,
|
||||
recordArr: [
|
||||
{ name: this.$t('overall.allData'), value: 'all' },
|
||||
{ name: this.$t('overall.selectRecords'), value: 'records' },
|
||||
|
||||
@@ -83,7 +83,7 @@ export default {
|
||||
mixins: [editRigthBox],
|
||||
data () {
|
||||
return {
|
||||
language: localStorage.getItem('nz-language'),
|
||||
language: this.$store.getters.language,
|
||||
editModel: {},
|
||||
brandList: [], // brand 列表数据
|
||||
editModule: {},
|
||||
|
||||
@@ -181,7 +181,7 @@ export default {
|
||||
},
|
||||
assetDataList: [],
|
||||
moduleList: [],
|
||||
language: localStorage.getItem('nz-language'),
|
||||
language: this.$store.getters.language,
|
||||
ChartSearchShowFields: [ // ChartSearch 下拉搜索表头
|
||||
{ title: 'ID', data: 'id' },
|
||||
{
|
||||
|
||||
@@ -622,7 +622,7 @@ export default {
|
||||
activeNameLogs: ['Basic'],
|
||||
expandedWalkData: [],
|
||||
editEndpointReset: {},
|
||||
language: localStorage.getItem('nz-language'),
|
||||
language: this.$store.getters.language,
|
||||
radio: 'password',
|
||||
editEndpoint: {},
|
||||
restaurants: [
|
||||
|
||||
@@ -616,7 +616,7 @@ export default {
|
||||
}
|
||||
}
|
||||
],
|
||||
language: localStorage.getItem('nz-language'),
|
||||
language: this.$store.getters.language,
|
||||
showAllBasicOption: false,
|
||||
rules: {
|
||||
name: [
|
||||
|
||||
@@ -138,6 +138,7 @@ export default {
|
||||
},
|
||||
changeLocal (lang) {
|
||||
localStorage.setItem('nz-language', lang)
|
||||
this.$store.commit('setLanguage', lang)
|
||||
this.$i18n.locale = lang
|
||||
setTimeout(() => {
|
||||
window.location.reload()
|
||||
|
||||
@@ -573,7 +573,7 @@ export default {
|
||||
data () {
|
||||
return {
|
||||
fromRoute,
|
||||
language: localStorage.getItem('nz-language'),
|
||||
language: 3,
|
||||
optionBtn: {
|
||||
save: false
|
||||
},
|
||||
|
||||
@@ -8,9 +8,13 @@ const user = {
|
||||
state: {
|
||||
menuList: [],
|
||||
buttonList: [],
|
||||
roleList: []
|
||||
roleList: [],
|
||||
language: 'en'
|
||||
},
|
||||
mutations: {
|
||||
setLanguage (state, language) {
|
||||
state.language = language
|
||||
},
|
||||
setMenuList (state, menuList) {
|
||||
state.menuList = [...menuList]
|
||||
},
|
||||
@@ -30,6 +34,9 @@ const user = {
|
||||
menuList (state) {
|
||||
return state.menuList
|
||||
},
|
||||
language (state) {
|
||||
return state.language
|
||||
},
|
||||
buttonList (state) {
|
||||
return state.buttonList
|
||||
},
|
||||
@@ -51,12 +58,12 @@ const user = {
|
||||
localStorage.setItem('nz-sys-asset-ping-switch', res.data.assetPingSwitch)
|
||||
localStorage.setItem('nz-unnsaved-change', res.data.unsavedChange)
|
||||
localStorage.setItem('nz-mfa-enable', Number(res.data.mfaAuthEnable) ? 1 : 0)
|
||||
store.commit('setLanguage', res.data.user.lang)
|
||||
post('/sys/user/permissions', { token: res.data.token }).then(res => {
|
||||
const menuList = sortByOrderNum(res.data.menus)
|
||||
store.commit('setMenuList', menuList)
|
||||
store.commit('setButtonList', res.data.buttons)
|
||||
store.commit('setRoleList', res.data.roles)
|
||||
|
||||
bus.$emit('login')
|
||||
router.push({
|
||||
path: 'overview',
|
||||
|
||||
Reference in New Issue
Block a user