fix(equipmentCloud): 修复设备列表状态查询

通道分页查询优化
dgiot · Jul 14, 2022 · 7488faa · 7488faa · vercel · Jul 14, 2022
1 parent 3fcab88
commit 7488faa
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.EN.md b/CHANGELOG.EN.md
@@ -1,4 +1,4 @@
-## [4.5.5](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.4...v4.5.5) (2022-07-07)
+## [4.5.5](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.4...v4.5.5) (2022-07-11)
 
 
 ### Bug Fixes
@@ -20,6 +20,7 @@
 * **components:** 修复topic 订阅不正常 ([640037d](https://github.com/dgiot/dgiot-dashboard/commit/640037d89dbf6b36fb4f5a6da4f7d17f930ce09d))
 * **components:** dgiot-amis ([85c8aba](https://github.com/dgiot/dgiot-dashboard/commit/85c8abae0b14d4ca8aa4e3f7542f1d6ca67d8883))
 * **dependencies:** 降低amis 依賴 ([5e0588b](https://github.com/dgiot/dgiot-dashboard/commit/5e0588b901b1143ffd117d197ebce1cc72fa6b48))
+* **equipmentCloud:** 设备location 字段不正确修复 ([7cb037b](https://github.com/dgiot/dgiot-dashboard/commit/7cb037b4a69eb11cf50c864f40b86f2d94036127))
 * **equipmentCloud:** 修复产品详情默认经纬度未赋值导致的报错 ([0e40544](https://github.com/dgiot/dgiot-dashboard/commit/0e405447e29df011bf2e96c34fd8b47c88264284))
 * **equipmentCloud:** 修复设备管理因存在默认值导致添加设备时，时序数据问题 ([71d7b87](https://github.com/dgiot/dgiot-dashboard/commit/71d7b8752f7c211d119f388f29908c0e2671ef01))
 * **equipmentCloud:** 组态 ([a52ecd2](https://github.com/dgiot/dgiot-dashboard/commit/a52ecd2c2717e016d1185e0f64d0f151121e93ae))

diff --git a/CHANGELOG.ZH.md b/CHANGELOG.ZH.md
@@ -1,4 +1,4 @@
-## [4.5.5](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.4...v4.5.5) (2022-07-07)
+## [4.5.5](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.4...v4.5.5) (2022-07-11)
 
 
 ### Bug Fixes
@@ -20,6 +20,7 @@
 * **components:** 修复topic 订阅不正常 ([640037d](https://github.com/dgiot/dgiot-dashboard/commit/640037d89dbf6b36fb4f5a6da4f7d17f930ce09d))
 * **components:** dgiot-amis ([85c8aba](https://github.com/dgiot/dgiot-dashboard/commit/85c8abae0b14d4ca8aa4e3f7542f1d6ca67d8883))
 * **dependencies:** 降低amis 依賴 ([5e0588b](https://github.com/dgiot/dgiot-dashboard/commit/5e0588b901b1143ffd117d197ebce1cc72fa6b48))
+* **equipmentCloud:** 设备location 字段不正确修复 ([7cb037b](https://github.com/dgiot/dgiot-dashboard/commit/7cb037b4a69eb11cf50c864f40b86f2d94036127))
 * **equipmentCloud:** 修复产品详情默认经纬度未赋值导致的报错 ([0e40544](https://github.com/dgiot/dgiot-dashboard/commit/0e405447e29df011bf2e96c34fd8b47c88264284))
 * **equipmentCloud:** 修复设备管理因存在默认值导致添加设备时，时序数据问题 ([71d7b87](https://github.com/dgiot/dgiot-dashboard/commit/71d7b8752f7c211d119f388f29908c0e2671ef01))
 * **equipmentCloud:** 组态 ([a52ecd2](https://github.com/dgiot/dgiot-dashboard/commit/a52ecd2c2717e016d1185e0f64d0f151121e93ae))

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## [4.5.5](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.4...v4.5.5) (2022-07-07)
+## [4.5.5](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.4...v4.5.5) (2022-07-11)
 
 
 ### Bug Fixes
@@ -20,6 +20,7 @@
 * **components:** 修复topic 订阅不正常 ([640037d](https://github.com/dgiot/dgiot-dashboard/commit/640037d89dbf6b36fb4f5a6da4f7d17f930ce09d))
 * **components:** dgiot-amis ([85c8aba](https://github.com/dgiot/dgiot-dashboard/commit/85c8abae0b14d4ca8aa4e3f7542f1d6ca67d8883))
 * **dependencies:** 降低amis 依賴 ([5e0588b](https://github.com/dgiot/dgiot-dashboard/commit/5e0588b901b1143ffd117d197ebce1cc72fa6b48))
+* **equipmentCloud:** 设备location 字段不正确修复 ([7cb037b](https://github.com/dgiot/dgiot-dashboard/commit/7cb037b4a69eb11cf50c864f40b86f2d94036127))
 * **equipmentCloud:** 修复产品详情默认经纬度未赋值导致的报错 ([0e40544](https://github.com/dgiot/dgiot-dashboard/commit/0e405447e29df011bf2e96c34fd8b47c88264284))
 * **equipmentCloud:** 修复设备管理因存在默认值导致添加设备时，时序数据问题 ([71d7b87](https://github.com/dgiot/dgiot-dashboard/commit/71d7b8752f7c211d119f388f29908c0e2671ef01))
 * **equipmentCloud:** 组态 ([a52ecd2](https://github.com/dgiot/dgiot-dashboard/commit/a52ecd2c2717e016d1185e0f64d0f151121e93ae))

diff --git a/public/dist/element-icons.ttf b/public/dist/element-icons.ttf
diff --git a/public/dist/element-icons.woff b/public/dist/element-icons.woff
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
@@ -134,10 +134,10 @@ import {
 } from '@/config'
 
 import { getUserInfo, login, logout, socialLogin, jwtlogin } from '@/api/User'
+import { departmentToken } from '@/api/Role'
 import { queryMenu } from '@/api/Menu/index'
 import { clearCookie, getToken, removeToken, setToken } from '@/utils/vue'
 import { resetRouter } from '@/router'
-
 import { license } from '@/api/License'
 import { isJson } from '@/utils/data/validate'
 import { tickTime } from '@/utils/time/index'
@@ -409,9 +409,10 @@ const actions = {
       },
       _userInfo
     )
-    const { sessionToken = '' } = data
+    const { sessionToken = '', roles = [] } = data
     if (sessionToken) {
       await queryAllMsg(commit, dispatch, data, 'ajax')
+      await departmentToken(roles[0].name)
       commit('setLoginInfo', userInfo)
     } else {
       Vue.prototype.$baseMessage(

diff --git a/src/views/DeviceCloud/manage/home_index.vue b/src/views/DeviceCloud/manage/home_index.vue
@@ -1324,7 +1324,7 @@
               $regex: this.queryForm.search,
             })
           : ''
-        _.isNumber(this.queryForm.status)
+        this.queryForm.status
           ? (params.where.status = this.queryForm.status)
           : ''
         this.queryForm.isEnable