Просмотр исходного кода

fix: 布局编辑返回按钮无法跳转

chauncey 1 год назад
Родитель
Сommit
7834a29a2e
2 измененных файлов с 6 добавлено и 8 удалено
  1. 6 6
      src/views/map-config/mini-map/MiniMapConfig.vue
  2. 0 2
      src/views/page-config/ConfigEdit.vue

+ 6 - 6
src/views/map-config/mini-map/MiniMapConfig.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="min-map">
   <div class="min-map">
     <header class="min-map__header">
     <header class="min-map__header">
-      <section class="min-map__btn" @click="router.back">
+      <section class="min-map__btn" @click="handleBack">
         <img :src="rollback">
         <img :src="rollback">
         <span>返回</span>
         <span>返回</span>
       </section>
       </section>
@@ -63,7 +63,7 @@ import { onMounted, onUnmounted, ref, computed, reactive, nextTick } from 'vue';
 import { updateMinMapViewLayoutApi, getCamerasByWorkShopId, getWorkshopMiniMapLayoutPCApi, getWorkshopMiniMapLayoutMobileApi } from '@/api/scene/scene';
 import { updateMinMapViewLayoutApi, getCamerasByWorkShopId, getWorkshopMiniMapLayoutPCApi, getWorkshopMiniMapLayoutMobileApi } from '@/api/scene/scene';
 import KonvaMap from './MapBase/KonvaMap.vue';
 import KonvaMap from './MapBase/KonvaMap.vue';
 import useCameraStatus from '@/views/cameras/preview/store/useCameraStatus';
 import useCameraStatus from '@/views/cameras/preview/store/useCameraStatus';
-import { onBeforeRouteLeave, useRoute } from 'vue-router';
+import { useRoute } from 'vue-router';
 import urlJoin from 'url-join';
 import urlJoin from 'url-join';
 import { useGlobSetting } from '@/hooks/setting';
 import { useGlobSetting } from '@/hooks/setting';
 import { getHeaders } from '@/utils/http/axios';
 import { getHeaders } from '@/utils/http/axios';
@@ -266,7 +266,7 @@ const changeMap = (val) => {
   isChange.value = val;
   isChange.value = val;
 };
 };
 
 
-onBeforeRouteLeave(async () => {
+const handleBack = async() =>{
   if (isChange.value) {
   if (isChange.value) {
     await ElMessageBox.confirm('是否保存当前修改?', '提示', {
     await ElMessageBox.confirm('是否保存当前修改?', '提示', {
       confirmButtonText: '是',
       confirmButtonText: '是',
@@ -277,12 +277,12 @@ onBeforeRouteLeave(async () => {
         handleSave();
         handleSave();
       })
       })
       .catch(() => {
       .catch(() => {
-        return true;
+        router.back();
       });
       });
   } else {
   } else {
-    return true;
+    router.back();
   }
   }
-});
+}
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">

+ 0 - 2
src/views/page-config/ConfigEdit.vue

@@ -373,8 +373,6 @@
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
-  .page {
-  }
 
 
   .page-head {
   .page-head {
     height: 54px;
     height: 54px;