NEZ-1205 fix: 开启两个窗口 一个中文一个英文 v-select组件 显示不对的问题
This commit is contained in:
@@ -298,7 +298,7 @@ export default {
|
|||||||
data () {
|
data () {
|
||||||
const termFontSize = parseInt(localStorage.getItem('termFontSize'))
|
const termFontSize = parseInt(localStorage.getItem('termFontSize'))
|
||||||
return {
|
return {
|
||||||
language: localStorage.getItem('nz-language'),
|
language: this.$store.getters.language,
|
||||||
authProtocol: [
|
authProtocol: [
|
||||||
{
|
{
|
||||||
value: 1,
|
value: 1,
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
:style="{top: `${moreBtnTop(data.type)}px`}"
|
:style="{top: `${moreBtnTop(data.type)}px`}"
|
||||||
class="search-more"
|
class="search-more"
|
||||||
@click="changShowMore(type)">
|
@click="changShowMore(type)">
|
||||||
More <i :class="data.showMore ? 'arrow-up' : ''" class="el-icon-arrow-down arrow-down"/>
|
{{$t('overall.more')}} <i :class="data.showMore ? 'arrow-up' : ''" class="el-icon-arrow-down arrow-down"/>
|
||||||
</span>
|
</span>
|
||||||
</el-skeleton>
|
</el-skeleton>
|
||||||
<el-skeleton v-else-if="data.type === 'dropdownCheckBox'" :loading="!data.show" :rows="1" class="search-items">
|
<el-skeleton v-else-if="data.type === 'dropdownCheckBox'" :loading="!data.show" :rows="1" class="search-items">
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
:style="{top: `${moreBtnTop(data.type)}px`}"
|
:style="{top: `${moreBtnTop(data.type)}px`}"
|
||||||
class="search-more"
|
class="search-more"
|
||||||
@click="changShowMore(type)">
|
@click="changShowMore(type)">
|
||||||
More <i :class="data.showMore ? 'arrow-up' : ''" class="el-icon-arrow-down arrow-down"/>
|
{{$t('overall.more')}} <i :class="data.showMore ? 'arrow-up' : ''" class="el-icon-arrow-down arrow-down"/>
|
||||||
</span>
|
</span>
|
||||||
</el-skeleton>
|
</el-skeleton>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ export default {
|
|||||||
importResult: null,
|
importResult: null,
|
||||||
exportShow: false,
|
exportShow: false,
|
||||||
panelLock: true,
|
panelLock: true,
|
||||||
language: localStorage.getItem('nz-language'),
|
language: this.$store.getters.language,
|
||||||
recordArr: [
|
recordArr: [
|
||||||
{ name: this.$t('overall.allData'), value: 'all' },
|
{ name: this.$t('overall.allData'), value: 'all' },
|
||||||
{ name: this.$t('overall.selectRecords'), value: 'records' },
|
{ name: this.$t('overall.selectRecords'), value: 'records' },
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ export default {
|
|||||||
mixins: [editRigthBox],
|
mixins: [editRigthBox],
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
language: localStorage.getItem('nz-language'),
|
language: this.$store.getters.language,
|
||||||
editModel: {},
|
editModel: {},
|
||||||
brandList: [], // brand 列表数据
|
brandList: [], // brand 列表数据
|
||||||
editModule: {},
|
editModule: {},
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ export default {
|
|||||||
},
|
},
|
||||||
assetDataList: [],
|
assetDataList: [],
|
||||||
moduleList: [],
|
moduleList: [],
|
||||||
language: localStorage.getItem('nz-language'),
|
language: this.$store.getters.language,
|
||||||
ChartSearchShowFields: [ // ChartSearch 下拉搜索表头
|
ChartSearchShowFields: [ // ChartSearch 下拉搜索表头
|
||||||
{ title: 'ID', data: 'id' },
|
{ title: 'ID', data: 'id' },
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -622,7 +622,7 @@ export default {
|
|||||||
activeNameLogs: ['Basic'],
|
activeNameLogs: ['Basic'],
|
||||||
expandedWalkData: [],
|
expandedWalkData: [],
|
||||||
editEndpointReset: {},
|
editEndpointReset: {},
|
||||||
language: localStorage.getItem('nz-language'),
|
language: this.$store.getters.language,
|
||||||
radio: 'password',
|
radio: 'password',
|
||||||
editEndpoint: {},
|
editEndpoint: {},
|
||||||
restaurants: [
|
restaurants: [
|
||||||
|
|||||||
@@ -616,7 +616,7 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
language: localStorage.getItem('nz-language'),
|
language: this.$store.getters.language,
|
||||||
showAllBasicOption: false,
|
showAllBasicOption: false,
|
||||||
rules: {
|
rules: {
|
||||||
name: [
|
name: [
|
||||||
|
|||||||
@@ -138,6 +138,7 @@ export default {
|
|||||||
},
|
},
|
||||||
changeLocal (lang) {
|
changeLocal (lang) {
|
||||||
localStorage.setItem('nz-language', lang)
|
localStorage.setItem('nz-language', lang)
|
||||||
|
this.$store.commit('setLanguage', lang)
|
||||||
this.$i18n.locale = lang
|
this.$i18n.locale = lang
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
window.location.reload()
|
window.location.reload()
|
||||||
|
|||||||
@@ -573,7 +573,7 @@ export default {
|
|||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
fromRoute,
|
fromRoute,
|
||||||
language: localStorage.getItem('nz-language'),
|
language: 3,
|
||||||
optionBtn: {
|
optionBtn: {
|
||||||
save: false
|
save: false
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -8,9 +8,13 @@ const user = {
|
|||||||
state: {
|
state: {
|
||||||
menuList: [],
|
menuList: [],
|
||||||
buttonList: [],
|
buttonList: [],
|
||||||
roleList: []
|
roleList: [],
|
||||||
|
language: 'en'
|
||||||
},
|
},
|
||||||
mutations: {
|
mutations: {
|
||||||
|
setLanguage (state, language) {
|
||||||
|
state.language = language
|
||||||
|
},
|
||||||
setMenuList (state, menuList) {
|
setMenuList (state, menuList) {
|
||||||
state.menuList = [...menuList]
|
state.menuList = [...menuList]
|
||||||
},
|
},
|
||||||
@@ -30,6 +34,9 @@ const user = {
|
|||||||
menuList (state) {
|
menuList (state) {
|
||||||
return state.menuList
|
return state.menuList
|
||||||
},
|
},
|
||||||
|
language (state) {
|
||||||
|
return state.language
|
||||||
|
},
|
||||||
buttonList (state) {
|
buttonList (state) {
|
||||||
return state.buttonList
|
return state.buttonList
|
||||||
},
|
},
|
||||||
@@ -51,12 +58,12 @@ const user = {
|
|||||||
localStorage.setItem('nz-sys-asset-ping-switch', res.data.assetPingSwitch)
|
localStorage.setItem('nz-sys-asset-ping-switch', res.data.assetPingSwitch)
|
||||||
localStorage.setItem('nz-unnsaved-change', res.data.unsavedChange)
|
localStorage.setItem('nz-unnsaved-change', res.data.unsavedChange)
|
||||||
localStorage.setItem('nz-mfa-enable', Number(res.data.mfaAuthEnable) ? 1 : 0)
|
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 => {
|
post('/sys/user/permissions', { token: res.data.token }).then(res => {
|
||||||
const menuList = sortByOrderNum(res.data.menus)
|
const menuList = sortByOrderNum(res.data.menus)
|
||||||
store.commit('setMenuList', menuList)
|
store.commit('setMenuList', menuList)
|
||||||
store.commit('setButtonList', res.data.buttons)
|
store.commit('setButtonList', res.data.buttons)
|
||||||
store.commit('setRoleList', res.data.roles)
|
store.commit('setRoleList', res.data.roles)
|
||||||
|
|
||||||
bus.$emit('login')
|
bus.$emit('login')
|
||||||
router.push({
|
router.push({
|
||||||
path: 'overview',
|
path: 'overview',
|
||||||
|
|||||||
Reference in New Issue
Block a user