diff --git a/src/store/modules/counter.js b/src/store/modules/counter.js index 26b63e6..1bd1f32 100644 --- a/src/store/modules/counter.js +++ b/src/store/modules/counter.js @@ -1,6 +1,6 @@ const counter = { state: { - deviceID: '868575028779793', + deviceID: '', mapClick: false }, mutations: { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 1f9b441..a754e21 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -100,11 +100,12 @@ const user = { // }, // 登出 - LogOut({ commit, state }) { + LogOut({ commit, state, rootState }) { return new Promise((resolve, reject) => { logout(state.token).then(() => { commit('SET_TOKEN', '') commit('SET_ROLES', []) + commit('CHANGE_DEVICE_ID', '', { root: true }) removeToken() resolve() }).catch(error => { diff --git a/src/views/counter/detail.vue b/src/views/counter/detail.vue index e553490..feecfec 100644 --- a/src/views/counter/detail.vue +++ b/src/views/counter/detail.vue @@ -114,10 +114,17 @@ export default { }) }, getDevices(params) { + let device_id = params.device_id fetchDeviceList(params).then(response => { this.deviceList = response.data.results this.lastItem = this.deviceList[0] - console.log(typeof (this.lastItem.count)) + if (!device_id) { + device_id = this.lastItem.device_id + this.$store.dispatch('changeDeviceID', device_id) + console.log(device_id) + } + // console.log(this.lastItem) + this.getDeviceLogsHistory({ device_id }) if (typeof (this.lastItem.count) === 'number') { this.lastItem.count = this.lastItem.count.toString() } @@ -143,7 +150,6 @@ export default { }, created() { const device_id = this.$store.getters.deviceID - this.getDeviceLogsHistory({ device_id }) this.getDevices({ device_id }) } }