3.12

src/App.vue

@@ -6,12 +6,11 @@
     <router-view v-if="!$route.meta.keepAlive"></router-view> -->
   <!-- //<router-view></router-view> -->
   <router-view v-slot="{ Component }">
-	<keep-alive>
-		<component :is="Component" v-if="$route.meta.keepAlive" :key="$route.name" />
-	</keep-alive>
-    <component :is="Component" v-if="$route.meta.keepAlive"
-							:key="$route.name" />
-</router-view>
+	   <keep-alive>
+	     <component :is="Component"  v-if="$route.meta.keepAlive"/>
+	   </keep-alive>
+	   <component :is="Component"  v-if="!$route.meta.keepAlive"/>
+	 </router-view> 
 </template>
 
 <script setup>

src/router/index.js

@@ -12,9 +12,11 @@ const router = createRouter({
         {
             path: '/configurator',
             component: configurator,// 这是路由的籁加载，也可以其他方式
-            meta:{
-                keepAlive:true // 需要缓存
-            }
+            beforeEnter: (to, from,next) => {
+                console.log(to, from);
+                next()
+            },
+           
         },
         {
             path: '/',

src/view/InfoDialoges.vue

@@ -25,7 +25,7 @@
                         <div class="borderimg"><el-button @click="dialogVisible = false">取消</el-button></div>
                     </div>
                     <div class="footerbtn">
-                        <div class="borderimg"><el-button @click="classclick();dialogVisible= false;">
+                        <div class="borderimg"><el-button @click="classclick(); dialogVisible= false;">
                                 确定
                             </el-button></div>
                     </div>
@@ -365,7 +365,7 @@ let firesid = ref("");
 const currentPage4 = ref(1);
 const pageSize4 = ref(3)
 let total = ref(1);
-const dialogVisible = ref(false);
+const dialogVisible = ref(true);
 const classradio = ref();
 let classradio1 = ref('Fire');
 const leftcoll = ref({
@@ -478,10 +478,13 @@ const handleCurrentChange = ({ row, rowIndex }) => {
 
 // 类型选择
 const classclick = () => {
+
+        console.log( dialogVisible.value);
     dialog.value.dialogVisible_fire = true;
     classradio.value = classradio1.value;
     props.addselect();
     getdata();
+ 
 }
 // 事故确定列表
 const accident = () => {
@@ -834,7 +837,7 @@ onBeforeUnmount(() => {
 });
 
 onMounted(() => {
-    dialogVisible.value=true;
+   // dialogVisible.value=true;
 });
 
 defineExpose({ monitor, accident2, leftcoll, classradio, aid, dialogVisible });

src/view/appmian.vue

@@ -129,7 +129,6 @@ const headerclick = (data) => {
 }
 const handleSelect = (key) => {
     activeIndex.value='';
-    console.log(key)
     switch (key) {
         case '1':
             sourcedis.value.accident3(key);
@@ -155,7 +154,7 @@ const handleSelect = (key) => {
         case '4':
             boundary.value.accident4(key);
             tanimation.value.accident5(aid.value);
-            sourcedis.value.accident3(key);
+             sourcedis.value.accident3(key);
             lliudialog.value.accident2(key);
             activeIndex.value='4'
         default:

src/view/components/InfoDisaster.vue

@@ -444,7 +444,6 @@ let tableobj=ref({});
   const tableData4=ref([]);
   const  accident3=(key)=>{
     if (key == '1') {
-      console.log(props.classradio);
       if(props.classradio=="Fire"){
           sour.value.collfire=true;
           sour.value.collwater=false;

src/view/configurator.vue

@@ -60,7 +60,7 @@
   </template>
   
   <script setup>
-import { ref, onMounted,watch,reactive,nextTick } from "vue";
+import { ref, onMounted,watch,reactive,nextTick} from "vue";
 import {RouterView,RouterLink,useRouter,createRouter } from "vue-router"
 import MenuMine  from "./components/MenuMine.vue"
 import MenuSensor  from "./components/MenuSensor.vue"
@@ -74,6 +74,14 @@ const title = "灾情推演软件";
 const activeIndex = ref('')
   onMounted(() => {
   });
+//   beforeRouteLeave((to,from,next)=>{
+//    to.meta.keepAlive = true
+//    next(0)
+//  })
+// beforeRouteLeave(to, from, next){
+//     to.meta.keepAlive = true;
+//     next(0);
+//   }
   let router=useRouter();
   let menumine=ref();
 let menusen=ref();
@@ -81,7 +89,9 @@ let menucheck =ref();
 let menuphysics=ref();
 const clickreture=()=>{
 // router.push("/");
-router.back()
+//router.back()
+
+router.go(-1)
 }
 const handleSelect = (key,keyPath) => {
     switch (key) {