Parcourir la source

[Feat 0000] 过渡页添加对全局矿联动矿端、公司端页面的功能

houzekong il y a 1 mois
Parent
commit
6605d29467

+ 2 - 2
src/layouts/default/feature/SimpleMap.vue

@@ -208,7 +208,7 @@
       node,
       callback() {
         // 切换显示CAD图
-        toggleCADMap(true, node).then(() => {
+        toggleCADMap(true).then(() => {
           mineStore.setDepartById(node.id);
           // historyStack.value.push(node);
         });
@@ -310,7 +310,7 @@
       if (props.slience) return toggleCADMap(mineStore.getRoot?.isLeaf || false);
 
       // 先判断显示什么图纸,若是矿端显示CAD图纸
-      await toggleCADMap(mineStore.getDepart?.isLeaf || false, mineStore.getDepart);
+      await toggleCADMap(mineStore.getDepart?.isLeaf || false);
 
       // 不论是不是矿端,历史记录都是一样的,用户点击返回上一级都能正常返回
       historyStack.value = findPath(markerCollection, (n) => n.id === id) as any[];

+ 17 - 7
src/views/dashboard/Overhaul/index.vue

@@ -3,16 +3,26 @@
   <component :is="pageComponent"></component>
 </template>
 <script setup lang="ts">
-  import { computed, defineAsyncComponent } from 'vue';
+  import { Component, ref, watch } from 'vue';
   import { useMineDepartmentStore } from '/@/store/modules/mine';
+  import LeafPage from './components/LeafPage.vue';
+  import RootPage from './components/RootPage.vue';
+  import { Empty } from 'ant-design-vue';
 
   const mineStore = useMineDepartmentStore();
 
-  const pageComponent = computed(() => {
-    if (mineStore.getRoot?.isLeaf) {
-      return defineAsyncComponent(() => import('./components/LeafPage.vue'));
-    } else {
-      return defineAsyncComponent(() => import('./components/RootPage.vue'));
+  const pageComponent = ref<Component>(Empty);
+
+  watch(
+    () => mineStore.getDepart,
+    (n, o) => {
+      if (n?.isLeaf === o?.isLeaf) return;
+
+      if (n?.isLeaf) {
+        pageComponent.value = LeafPage;
+      } else {
+        pageComponent.value = RootPage;
+      }
     }
-  });
+  );
 </script>