diff --git a/src/store/modules/user.js b/src/store/modules/user.js index b345100..0602724 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -10,7 +10,8 @@ const useUserStore = defineStore( name: '', avatar: '', roles: [], - permissions: [] + permissions: [], + userId: null }), actions: { // 登录 @@ -22,7 +23,6 @@ const useUserStore = defineStore( return new Promise((resolve, reject) => { login(username, password, code, uuid).then(res => { let data = res.data - console.log(data); setToken(data.access_token) this.token = data.access_token resolve() @@ -46,6 +46,7 @@ const useUserStore = defineStore( } this.name = user.userName this.avatar = avatar; + this.userId = user.userId resolve(res) }).catch(error => { reject(error) diff --git a/src/views/big/device/index.vue b/src/views/big/device/index.vue index 6afa37f..86bac97 100644 --- a/src/views/big/device/index.vue +++ b/src/views/big/device/index.vue @@ -96,8 +96,10 @@ import { getDeptList } from '@/api/big/dept' import { getDeviceTypeList } from '@/api/big/deviceType' import useDeviceStore from '@/store/modules/device' import add_edit from './components/add_edit.vue' +import useUserStore from '@/store/modules/user' import assemblyVue from './components/assembly' const store = useDeviceStore() +const userStore = useUserStore() const { proxy } = getCurrentInstance(); const data = reactive({ form: {}, @@ -108,6 +110,7 @@ const data = reactive({ dept: '', type: '', label: '', + userId: userStore.userId, }, }); @@ -252,7 +255,7 @@ function remoteMethodDeptId() { let deptList = res.rows.map(item => { return { label: item.name, - value: item.id + value: item.id.toString() } }) store.setDeptList(deptList)