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

Merge branch 'qingban' of http://maven.jgiot.com:7012/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

jiaxiaoqiang 10 месяцев назад
Родитель
Сommit
e669ba9401

+ 6 - 11
src/layout/components/AppMain/index.vue

@@ -1,17 +1,12 @@
 <template>
   <section class="app-main">
-    <router-view v-slot="{ Component, route }">
-      <transition
-        enter-active-class="animate__animated animate__fadeIn"
-        mode="out-in"
-      >
-        <keep-alive :include="cachedViews">
-          <div class="main-container">
-            <component :is="Component" :key="route.path" />
-          </div>
+    <div class="main-container">
+      <router-view v-slot="{ Component, route }">
+        <keep-alive>
+          <component :is="Component" :key="route.path" />
         </keep-alive>
-      </transition>
-    </router-view>
+      </router-view>
+    </div>
   </section>
 </template>
 

+ 3 - 7
src/views/base/craftManagement/route/bindProcess.vue

@@ -172,16 +172,13 @@ import {
   saveProcessInRoute,
   updateProcess,
 } from "@/api/craft/route/index";
-import { v4 as uuidv4 } from "uuid";
 import { formOption } from "./bindConfig";
 import { ElMessage } from "element-plus";
 import { useScreenshot } from "./screenshot.ts";
 defineOptions({
-  name: "BindProcess/:id?",
-});
-onBeforeUnmount(() => {
-  console.log("g");
+  name: "bindProcess/:id?",
 });
+
 const { capture } = useScreenshot();
 const instance = useVueFlow();
 const { onConnect, addEdges, vueFlowRef, onEdgeUpdateEnd, applyEdgeChanges } =
@@ -350,12 +347,11 @@ const editProComponent = async () => {
 // 全局=======
 
 onMounted(() => {
+  console.log("mount");
   loadTreeData();
   loadProcessesFlow();
   flowBoxScreen();
   window.addEventListener("keydown", handleKeydown);
-  const route = useRoute();
-  console.log(route, "r");
 });
 onUnmounted(() => {
   window.removeEventListener("keydown", handleKeydown);