From 690c3f7f0fe2c511a5815f693be8a9a799f4bb02 Mon Sep 17 00:00:00 2001
From: dawnwinterLiu <1737801684@qq.com>
Date: Fri, 23 Sep 2022 16:32:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(dashboard):=20feat(dashboard):=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.EN.md                                    | 6 +++++-
 CHANGELOG.ZH.md                                    | 6 +++++-
 CHANGELOG.md                                       | 6 +++++-
 src/views/DeviceCloud/manage/platform_overview.vue | 6 ++++--
 src/views/MultiTenant/user/login/index.vue         | 4 ++--
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.EN.md b/CHANGELOG.EN.md
index 183bdc5431..011e2fa1c3 100644
--- a/CHANGELOG.EN.md
+++ b/CHANGELOG.EN.md
@@ -1,8 +1,9 @@
-# [4.6.0](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.9...v4.6.0) (2022-09-09)
+# [4.6.0](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.9...v4.6.0) (2022-09-22)
 
 
 ### Bug Fixes
 
+* 工单发布管理 ([e30d25b](https://github.com/dgiot/dgiot-dashboard/commit/e30d25beb2571a5c2a6abcbf6019f6bc4a4c57ba))
 * 应用管理修复 ([6a48bdc](https://github.com/dgiot/dgiot-dashboard/commit/6a48bdc6a65d790f0c775fdc2a6aeb07cf750d31))
 * amis interface manage ([747db00](https://github.com/dgiot/dgiot-dashboard/commit/747db00eb6df5a947004d5978fa3328bbcc6928c))
 * Configuration picture is missing ([72efcfc](https://github.com/dgiot/dgiot-dashboard/commit/72efcfca5e1b828f61ff758e7d1b151e4dc8e17f))
@@ -13,7 +14,10 @@
 * Add Login Index ([b156bca](https://github.com/dgiot/dgiot-dashboard/commit/b156bcacb937a8dfb43ddec65a116ec9854a7fb7))
 * add ScrollList and Pie ([f7234d3](https://github.com/dgiot/dgiot-dashboard/commit/f7234d3e0e4b89a4390c8e8a59b5ec7e7b140348))
 * **cloudOperations:** 告警联动低代码 ([25feb81](https://github.com/dgiot/dgiot-dashboard/commit/25feb814003608caede037c20b81270217be91bb))
+* **cloudOperations:** 工单巡检动态数据 ([071750b](https://github.com/dgiot/dgiot-dashboard/commit/071750b8d75ee559319f76eefb8908252e3d0625))
 * **equipmentCloud:** parse_objectid关联productid ([1a33b89](https://github.com/dgiot/dgiot-dashboard/commit/1a33b894b667ae4b44982e5db5216066c096e2d8))
+* index ([15ef1a5](https://github.com/dgiot/dgiot-dashboard/commit/15ef1a5868c8e04745b1b2261e2e28723d6d6c38))
+* login ([a6d033e](https://github.com/dgiot/dgiot-dashboard/commit/a6d033e7b3b0ff5d9d1f1372372560b8a3f9fa41))
 * update 4.6.0 ([f4e9edb](https://github.com/dgiot/dgiot-dashboard/commit/f4e9edbd78b9d2c148b2486a18d62f74aa64a373))
 
 
diff --git a/CHANGELOG.ZH.md b/CHANGELOG.ZH.md
index 183bdc5431..011e2fa1c3 100644
--- a/CHANGELOG.ZH.md
+++ b/CHANGELOG.ZH.md
@@ -1,8 +1,9 @@
-# [4.6.0](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.9...v4.6.0) (2022-09-09)
+# [4.6.0](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.9...v4.6.0) (2022-09-22)
 
 
 ### Bug Fixes
 
+* 工单发布管理 ([e30d25b](https://github.com/dgiot/dgiot-dashboard/commit/e30d25beb2571a5c2a6abcbf6019f6bc4a4c57ba))
 * 应用管理修复 ([6a48bdc](https://github.com/dgiot/dgiot-dashboard/commit/6a48bdc6a65d790f0c775fdc2a6aeb07cf750d31))
 * amis interface manage ([747db00](https://github.com/dgiot/dgiot-dashboard/commit/747db00eb6df5a947004d5978fa3328bbcc6928c))
 * Configuration picture is missing ([72efcfc](https://github.com/dgiot/dgiot-dashboard/commit/72efcfca5e1b828f61ff758e7d1b151e4dc8e17f))
@@ -13,7 +14,10 @@
 * Add Login Index ([b156bca](https://github.com/dgiot/dgiot-dashboard/commit/b156bcacb937a8dfb43ddec65a116ec9854a7fb7))
 * add ScrollList and Pie ([f7234d3](https://github.com/dgiot/dgiot-dashboard/commit/f7234d3e0e4b89a4390c8e8a59b5ec7e7b140348))
 * **cloudOperations:** 告警联动低代码 ([25feb81](https://github.com/dgiot/dgiot-dashboard/commit/25feb814003608caede037c20b81270217be91bb))
+* **cloudOperations:** 工单巡检动态数据 ([071750b](https://github.com/dgiot/dgiot-dashboard/commit/071750b8d75ee559319f76eefb8908252e3d0625))
 * **equipmentCloud:** parse_objectid关联productid ([1a33b89](https://github.com/dgiot/dgiot-dashboard/commit/1a33b894b667ae4b44982e5db5216066c096e2d8))
+* index ([15ef1a5](https://github.com/dgiot/dgiot-dashboard/commit/15ef1a5868c8e04745b1b2261e2e28723d6d6c38))
+* login ([a6d033e](https://github.com/dgiot/dgiot-dashboard/commit/a6d033e7b3b0ff5d9d1f1372372560b8a3f9fa41))
 * update 4.6.0 ([f4e9edb](https://github.com/dgiot/dgiot-dashboard/commit/f4e9edbd78b9d2c148b2486a18d62f74aa64a373))
 
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 183bdc5431..011e2fa1c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
-# [4.6.0](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.9...v4.6.0) (2022-09-09)
+# [4.6.0](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.9...v4.6.0) (2022-09-22)
 
 
 ### Bug Fixes
 
+* 工单发布管理 ([e30d25b](https://github.com/dgiot/dgiot-dashboard/commit/e30d25beb2571a5c2a6abcbf6019f6bc4a4c57ba))
 * 应用管理修复 ([6a48bdc](https://github.com/dgiot/dgiot-dashboard/commit/6a48bdc6a65d790f0c775fdc2a6aeb07cf750d31))
 * amis interface manage ([747db00](https://github.com/dgiot/dgiot-dashboard/commit/747db00eb6df5a947004d5978fa3328bbcc6928c))
 * Configuration picture is missing ([72efcfc](https://github.com/dgiot/dgiot-dashboard/commit/72efcfca5e1b828f61ff758e7d1b151e4dc8e17f))
@@ -13,7 +14,10 @@
 * Add Login Index ([b156bca](https://github.com/dgiot/dgiot-dashboard/commit/b156bcacb937a8dfb43ddec65a116ec9854a7fb7))
 * add ScrollList and Pie ([f7234d3](https://github.com/dgiot/dgiot-dashboard/commit/f7234d3e0e4b89a4390c8e8a59b5ec7e7b140348))
 * **cloudOperations:** 告警联动低代码 ([25feb81](https://github.com/dgiot/dgiot-dashboard/commit/25feb814003608caede037c20b81270217be91bb))
+* **cloudOperations:** 工单巡检动态数据 ([071750b](https://github.com/dgiot/dgiot-dashboard/commit/071750b8d75ee559319f76eefb8908252e3d0625))
 * **equipmentCloud:** parse_objectid关联productid ([1a33b89](https://github.com/dgiot/dgiot-dashboard/commit/1a33b894b667ae4b44982e5db5216066c096e2d8))
+* index ([15ef1a5](https://github.com/dgiot/dgiot-dashboard/commit/15ef1a5868c8e04745b1b2261e2e28723d6d6c38))
+* login ([a6d033e](https://github.com/dgiot/dgiot-dashboard/commit/a6d033e7b3b0ff5d9d1f1372372560b8a3f9fa41))
 * update 4.6.0 ([f4e9edb](https://github.com/dgiot/dgiot-dashboard/commit/f4e9edbd78b9d2c148b2486a18d62f74aa64a373))
 
 
diff --git a/src/views/DeviceCloud/manage/platform_overview.vue b/src/views/DeviceCloud/manage/platform_overview.vue
index 4bed2863e5..a54a3b5a7e 100644
--- a/src/views/DeviceCloud/manage/platform_overview.vue
+++ b/src/views/DeviceCloud/manage/platform_overview.vue
@@ -341,8 +341,10 @@
                       </div>
                     </div>
                     <div class="screen_bottom">
-                      <div class="screen_bottom_title">设备告警</div>
-                      <topo-caltable :comp="comp" />
+                      <div class="screen_bottom_title">
+                        {{ $translateTitle('equipment.list') }}
+                      </div>
+                      <screen-device :comp="comp" />
                     </div>
                     <div class="screen_right_center">
                       <div class="screen_right_center_top">工单列表</div>
diff --git a/src/views/MultiTenant/user/login/index.vue b/src/views/MultiTenant/user/login/index.vue
index d62b60924d..1a98279fe4 100644
--- a/src/views/MultiTenant/user/login/index.vue
+++ b/src/views/MultiTenant/user/login/index.vue
@@ -440,10 +440,10 @@
         try {
           this.interval = setInterval(async () => {
             if (Cookies.get('handleRoute') != '') {
-              console.log('handleRoute 存在，跳转页面')
+              // console.log('handleRoute 存在，跳转页面')
+              await this.$router.push(this.handleRoute())
               const { results: Tree = [] } = await Roletree()
               this.setRoleTree(Tree)
-              await this.$router.push(this.handleRoute())
               clearInterval(this.interval)
               window.clearInterval(this.interval)
             }