fix(router): fix the problem that the home device list cannot jump

dgiot · Apr 22, 2022 · 1c16b44 · 1c16b44
1 parent b00af1c
commit 1c16b44
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 7 deletions.
diff --git a/src/dgiot/components/DgiotBaiduMap/index.vue b/src/dgiot/components/DgiotBaiduMap/index.vue
@@ -339,7 +339,7 @@
       },
       markerClustererShow: {
         type: Boolean,
-        default: false,
+        default: true,
       },
       busShow: {
         type: Boolean,
@@ -423,7 +423,7 @@
       },
       scrollWheelZoom: {
         type: Boolean,
-        default: false,
+        default: true,
       },
       center: {
         type: Object,

diff --git a/src/dgiot/plugins/permissions.js b/src/dgiot/plugins/permissions.js
@@ -29,11 +29,13 @@ DgiotProgress.configure({
   showSpinner: false,
 })
 router.beforeEach(async (to, from, next) => {
+  window.errRoute = null
   store.dispatch('routes/setRoutesOpenTime', {
     router: to.meta.component,
     timestamp: moment(new Date()).valueOf(),
   })
   if (to.name == '404') {
+    window.errRoute = to
     console.log('dgiot router log---')
     console.log(to)
     return false

diff --git a/src/views/DeviceCloud/manage/devicelist.vue b/src/views/DeviceCloud/manage/devicelist.vue
@@ -172,6 +172,7 @@
             :map-center="mapLabel.position"
             :nav-show="true"
             :scale-show="true"
+            :scroll-wheel-zoom="true"
           />
         </el-card>
         <span slot="footer" class="dialog-footer">

diff --git a/src/views/DeviceCloud/manage/platform_overview.vue b/src/views/DeviceCloud/manage/platform_overview.vue
@@ -105,11 +105,14 @@
                 <el-col :span="12">
                   <dgiot-icon icon="device-recover-fill" />
                 </el-col>
-                <el-col class="card-right" :span="12">
-                  <router-link to="dashboard/device">
-                    <p>{{ $translateTitle('home.dev_count') }}</p>
-                    <p>{{ _dev_count }}</p>
-                  </router-link>
+                <el-col
+                  class="card-right"
+                  :span="12"
+                  style="cursor: pointer"
+                  @click.native="goDevice()"
+                >
+                  <p>{{ $translateTitle('home.dev_count') }}</p>
+                  <p>{{ _dev_count }}</p>
                 </el-col>
               </el-card>
             </el-col>
@@ -1286,6 +1289,14 @@
             product: name,
           },
         })
+        console.log(window.errRoute)
+        if (window?.errRoute?.name)
+          this.$router.push({
+            path: '/dashboard/devicelist',
+            query: {
+              product: name,
+            },
+          })
       },
       _goDevice(item) {
         this.$router.push({
@@ -1294,6 +1305,14 @@
             devicename: item.name,
           },
         })
+        console.log(window.errRoute)
+        if (window?.errRoute?.name)
+          this.$router.push({
+            path: '/dashboard/devicelist',
+            query: {
+              devicename: item.name,
+            },
+          })
       },
       goLink(type, item) {
         switch (type) {