Browse Source

2023-07-25 2

master
杨奉源 3 years ago
parent
commit
2f273e6e14
  1. 4
      src/views/common/login.vue
  2. 2
      src/views/main-sidebar.vue
  3. 3
      src/views/main.vue
  4. 1
      src/views/modules/knifemold/tool-info.vue

4
src/views/common/login.vue

@ -48,7 +48,7 @@
password: '', password: '',
uuid: '', uuid: '',
captcha: '', captcha: '',
// site:''
site:''
}, },
siteList:[], siteList:[],
dataRule: { dataRule: {
@ -91,7 +91,7 @@
'username': this.dataForm.userName, 'username': this.dataForm.userName,
'password': this.dataForm.password, 'password': this.dataForm.password,
'uuid': this.dataForm.uuid, 'uuid': this.dataForm.uuid,
// 'site': this.dataForm.site,
'site': this.dataForm.site,
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {

2
src/views/main-sidebar.vue

@ -115,7 +115,7 @@
created () { created () {
this.menuList = JSON.parse(sessionStorage.getItem('menuList') || '[]').filter(item => item.menuId != 999) this.menuList = JSON.parse(sessionStorage.getItem('menuList') || '[]').filter(item => item.menuId != 999)
this.favoriteList = JSON.parse(sessionStorage.getItem('menuList') || '[]').filter(item => item.menuId == 999) this.favoriteList = JSON.parse(sessionStorage.getItem('menuList') || '[]').filter(item => item.menuId == 999)
this.userFavorites()
// this.userFavorites()
this.dynamicMenuRoutes = JSON.parse(sessionStorage.getItem('dynamicMenuRoutes') || '[]') this.dynamicMenuRoutes = JSON.parse(sessionStorage.getItem('dynamicMenuRoutes') || '[]')
this.routeHandle(this.$route) this.routeHandle(this.$route)
this.getFunctionButtonList() this.getFunctionButtonList()

3
src/views/main.vue

@ -97,8 +97,7 @@
this.userName = data.user.username this.userName = data.user.username
this.site = data.user.site this.site = data.user.site
this.languageDefault = data.user.languageDefault this.languageDefault = data.user.languageDefault
// this.site = data.user.site
this.site =localStorage.getItem("accessSite")
// this.site =localStorage.getItem("accessSite")
this.userDisplay = data.user.userDisplay this.userDisplay = data.user.userDisplay
} }
}) })

1
src/views/modules/knifemold/tool-info.vue

@ -2059,6 +2059,7 @@ export default {
} }
}, },
saveAndUpdateToolHeader() { saveAndUpdateToolHeader() {
console.log(this.$store.state.user.site)
if (!this.editHeaderData.toolId) { if (!this.editHeaderData.toolId) {
this.$message.warning('工具编号不能为空,请选择') this.$message.warning('工具编号不能为空,请选择')
return return

Loading…
Cancel
Save